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(apps): moving things around

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-01-08 12:45:12 +01:00
parent 69d0e82453
commit f67563e9ee
10 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/core/routes/all.js
View File

@@ -10,6 +10,7 @@ define([
$locationProvider.html5Mode(true);
var loadOrgBundle = new BundleLoader.BundleLoader('app/features/org/all');
var loadAppsBundle = new BundleLoader.BundleLoader('app/features/apps/all');
$routeProvider
.when('/', {
@@ -131,17 +132,17 @@ define([
templateUrl: 'app/partials/reset_password.html',
controller : 'ResetPasswordCtrl',
})
.when('/org/apps', {
templateUrl: 'app/features/org/partials/app_list.html',
.when('/apps', {
templateUrl: 'app/features/apps/partials/list.html',
controller: 'AppListCtrl',
controllerAs: 'ctrl',
resolve: loadOrgBundle,
resolve: loadAppsBundle,
})
.when('/org/apps/edit/:type', {
templateUrl: 'app/features/org/partials/app_edit.html',
.when('/apps/edit/:type', {
templateUrl: 'app/features/apps/partials/edit.html',
controller: 'AppEditCtrl',
controllerAs: 'ctrl',
resolve: loadOrgBundle,
resolve: loadAppsBundle,
})
.when('/global-alerts', {
templateUrl: 'app/features/dashboard/partials/globalAlerts.html',