Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
9e62a777
Commit
9e62a777
authored
Dec 08, 2017
by
Alexander Zobnin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor: user groups to teams, rename frontend files
parent
d8612380
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
10 additions
and
10 deletions
+10
-10
public/app/core/components/team_picker.ts
+0
-0
public/app/core/core.ts
+1
-1
public/app/core/routes/routes.ts
+2
-2
public/app/features/org/all.ts
+3
-3
public/app/features/org/create_team_modal.ts
+1
-1
public/app/features/org/partials/create_team.html
+0
-0
public/app/features/org/partials/team_details.html
+0
-0
public/app/features/org/partials/teams.html
+0
-0
public/app/features/org/specs/team_details_ctrl_specs.ts
+2
-2
public/app/features/org/team_details_ctrl.ts
+0
-0
public/app/features/org/teams_ctrl.ts
+0
-0
public/img/icons_dark_theme/icon_team.svg
+0
-0
public/img/icons_light_theme/icon_team.svg
+0
-0
public/sass/base/_icons.scss
+1
-1
No files found.
public/app/core/components/
user_group
_picker.ts
→
public/app/core/components/
team
_picker.ts
View file @
9e62a777
File moved
public/app/core/core.ts
View file @
9e62a777
...
...
@@ -47,7 +47,7 @@ import {helpModal} from './components/help/help';
import
{
JsonExplorer
}
from
'./components/json_explorer/json_explorer'
;
import
{
NavModelSrv
,
NavModel
}
from
'./nav_model_srv'
;
import
{
userPicker
}
from
'./components/user_picker'
;
import
{
teamPicker
}
from
'./components/
user_group
_picker'
;
import
{
teamPicker
}
from
'./components/
team
_picker'
;
import
{
geminiScrollbar
}
from
'./components/scroll/scroll'
;
import
{
gfPageDirective
}
from
'./components/gf_page'
;
import
{
orgSwitcher
}
from
'./components/org_switcher'
;
...
...
public/app/core/routes/routes.ts
View file @
9e62a777
...
...
@@ -110,13 +110,13 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
resolve
:
loadOrgBundle
,
})
.
when
(
'/org/teams'
,
{
templateUrl
:
'public/app/features/org/partials/
user_group
s.html'
,
templateUrl
:
'public/app/features/org/partials/
team
s.html'
,
controller
:
'TeamsCtrl'
,
controllerAs
:
'ctrl'
,
resolve
:
loadOrgBundle
,
})
.
when
(
'/org/teams/edit/:id'
,
{
templateUrl
:
'public/app/features/org/partials/
user_group
_details.html'
,
templateUrl
:
'public/app/features/org/partials/
team
_details.html'
,
controller
:
'TeamDetailsCtrl'
,
controllerAs
:
'ctrl'
,
resolve
:
loadOrgBundle
,
...
...
public/app/features/org/all.ts
View file @
9e62a777
...
...
@@ -5,9 +5,9 @@ import './select_org_ctrl';
import
'./change_password_ctrl'
;
import
'./new_org_ctrl'
;
import
'./user_invite_ctrl'
;
import
'./
user_group
s_ctrl'
;
import
'./
user_group
_details_ctrl'
;
import
'./create_
user_group
_modal'
;
import
'./
team
s_ctrl'
;
import
'./
team
_details_ctrl'
;
import
'./create_
team
_modal'
;
import
'./org_api_keys_ctrl'
;
import
'./org_details_ctrl'
;
import
'./prefs_control'
;
public/app/features/org/create_
user_group
_modal.ts
→
public/app/features/org/create_
team
_modal.ts
View file @
9e62a777
...
...
@@ -27,7 +27,7 @@ export class CreateTeamCtrl {
export
function
createTeamModal
()
{
return
{
restrict
:
'E'
,
templateUrl
:
'public/app/features/org/partials/create_
user_group
.html'
,
templateUrl
:
'public/app/features/org/partials/create_
team
.html'
,
controller
:
CreateTeamCtrl
,
bindToController
:
true
,
controllerAs
:
'ctrl'
,
...
...
public/app/features/org/partials/create_
user_group
.html
→
public/app/features/org/partials/create_
team
.html
View file @
9e62a777
File moved
public/app/features/org/partials/
user_group
_details.html
→
public/app/features/org/partials/
team
_details.html
View file @
9e62a777
File moved
public/app/features/org/partials/
user_group
s.html
→
public/app/features/org/partials/
team
s.html
View file @
9e62a777
File moved
public/app/features/org/specs/
user_group
_details_ctrl_specs.ts
→
public/app/features/org/specs/
team
_details_ctrl_specs.ts
View file @
9e62a777
import
'../
user_group
_details_ctrl'
;
import
'../
team
_details_ctrl'
;
import
{
describe
,
beforeEach
,
it
,
expect
,
sinon
,
angularMocks
}
from
'test/lib/common'
;
import
TeamDetailsCtrl
from
'../
user_group
_details_ctrl'
;
import
TeamDetailsCtrl
from
'../
team
_details_ctrl'
;
describe
(
'TeamDetailsCtrl'
,
()
=>
{
var
ctx
:
any
=
{};
...
...
public/app/features/org/
user_group
_details_ctrl.ts
→
public/app/features/org/
team
_details_ctrl.ts
View file @
9e62a777
File moved
public/app/features/org/
user_group
s_ctrl.ts
→
public/app/features/org/
team
s_ctrl.ts
View file @
9e62a777
File moved
public/img/icons_dark_theme/icon_
user_group
.svg
→
public/img/icons_dark_theme/icon_
team
.svg
View file @
9e62a777
File moved
public/img/icons_light_theme/icon_
user_group
.svg
→
public/img/icons_light_theme/icon_
team
.svg
View file @
9e62a777
File moved
public/sass/base/_icons.scss
View file @
9e62a777
...
...
@@ -52,7 +52,7 @@
}
.gicon-team
{
background-image
:
url('../img/icons_
#{
$theme-name
}
_theme/icon_
user_group
.svg')
;
background-image
:
url('../img/icons_
#{
$theme-name
}
_theme/icon_
team
.svg')
;
}
.gicon-org
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment