IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

move: moved styleguide to admin

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-09-10 13:38:45 +02:00
parent 0f98dcdef0
commit e4d9620fc0
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/styleguide/styleguide.ts → public/app/features/admin/StyleGuideCtrl.ts
View File

@@ -1,7 +1,6 @@
import coreModule from 'app/core/core_module';
import config from 'app/core/config';
class StyleGuideCtrl {
export default class StyleGuideCtrl {
theme: string;
buttonNames = ['primary', 'secondary', 'inverse', 'success', 'warning', 'danger'];
buttonSizes = ['btn-small', '', 'btn-large'];
@@ -27,4 +26,3 @@ class StyleGuideCtrl {
}
}
coreModule.controller('StyleGuideCtrl', StyleGuideCtrl);

4
public/app/features/admin/index.ts
View File

@@ -2,6 +2,7 @@ import AdminListUsersCtrl from './AdminListUsersCtrl';
import AdminEditUserCtrl from './AdminEditUserCtrl';
import AdminListOrgsCtrl from './AdminListOrgsCtrl';
import AdminEditOrgCtrl from './AdminEditOrgCtrl';
import StyleGuideCtrl from './StyleGuideCtrl';
import coreModule from 'app/core/core_module';
@@ -29,9 +30,8 @@ class AdminHomeCtrl {
coreModule.controller('AdminListUsersCtrl', AdminListUsersCtrl);
coreModule.controller('AdminEditUserCtrl', AdminEditUserCtrl);
coreModule.controller('AdminListOrgsCtrl', AdminListOrgsCtrl);
coreModule.controller('AdminEditOrgCtrl', AdminEditOrgCtrl);
coreModule.controller('AdminSettingsCtrl', AdminSettingsCtrl);
coreModule.controller('AdminHomeCtrl', AdminHomeCtrl);
coreModule.controller('StyleGuideCtrl', StyleGuideCtrl);

0
public/app/features/styleguide/styleguide.html → public/app/features/admin/partials/styleguide.html
View File

1
public/app/features/all.ts
View File

@@ -9,4 +9,3 @@ import './org/all';
import './admin';
import './alerting/NotificationsEditCtrl';
import './alerting/NotificationsListCtrl';
import './styleguide/styleguide';

4
public/app/routes/routes.ts
View File

@@ -3,8 +3,8 @@ import './ReactContainer';
import ServerStats from 'app/features/admin/ServerStats';
import AlertRuleList from 'app/features/alerting/AlertRuleList';
import FolderSettings from 'app/containers/ManageDashboards/FolderSettings';
import FolderPermissions from 'app/containers/ManageDashboards/FolderPermissions';
import FolderSettings from 'app/containers/ManageDashboards/FolderSettings';
import TeamPages from 'app/containers/Teams/TeamPages';
import TeamList from 'app/containers/Teams/TeamList';
@@ -262,7 +262,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
.when('/styleguide/:page?', {
controller: 'StyleGuideCtrl',
controllerAs: 'ctrl',
templateUrl: 'public/app/features/styleguide/styleguide.html',
templateUrl: 'public/app/features/admin/partials/styleguide.html',
})
.when('/alerting', {
redirectTo: '/alerting/list',