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

feat(alerting): changed name of root Alerts nav item and page from Alerts to Alerting

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-06-06 09:17:29 +02:00
parent f36a44c49a
commit 70cb8400c3
10 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/app/core/routes/routes.ts
View File

@@ -13,7 +13,7 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
var loadOrgBundle = new BundleLoader('app/features/org/all');
var loadPluginsBundle = new BundleLoader('app/features/plugins/all');
var loadAdminBundle = new BundleLoader('app/features/admin/admin');
var loadAlertsBundle = new BundleLoader('app/features/alerts/all');
var loadAlertingBundle = new BundleLoader('app/features/alerting/all');
$routeProvider
.when('/', {
@@ -190,25 +190,22 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
controllerAs: 'ctrl',
resolve: loadPluginsBundle,
})
.when('/global-alerts', {
templateUrl: 'public/app/features/dashboard/partials/globalAlerts.html',
})
.when('/styleguide/:page?', {
controller: 'StyleGuideCtrl',
controllerAs: 'ctrl',
templateUrl: 'public/app/features/styleguide/styleguide.html',
})
.when('/alerts', {
templateUrl: 'public/app/features/alerts/partials/alerts_page.html',
controller: 'AlertPageCtrl',
.when('/alerting', {
templateUrl: 'public/app/features/alerting/partials/alert_list.html',
controller: 'AlertListCtrl',
controllerAs: 'ctrl',
resolve: loadAlertsBundle,
resolve: loadAlertingBundle,
})
.when('/alerts/:alertId/states', {
templateUrl: 'public/app/features/alerts/partials/alert_log.html',
.when('/alerting/:alertId/states', {
templateUrl: 'public/app/features/alerting/partials/alert_log.html',
controller: 'AlertLogCtrl',
controllerAs: 'ctrl',
resolve: loadAlertsBundle,
resolve: loadAlertingBundle,
})
.otherwise({
templateUrl: 'public/app/partials/error.html',