Просмотр исходного кода

move: moved styleguide to admin

Torkel Ödegaard 7 лет назад
Родитель
Сommit
e4d9620fc0

+ 1 - 3
public/app/features/styleguide/styleguide.ts → public/app/features/admin/StyleGuideCtrl.ts

@@ -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);

+ 2 - 2
public/app/features/admin/index.ts

@@ -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 - 0
public/app/features/styleguide/styleguide.html → public/app/features/admin/partials/styleguide.html


+ 0 - 1
public/app/features/all.ts

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

+ 2 - 2
public/app/routes/routes.ts

@@ -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',