From d659a5d79f2603c5e7f82d72de202f4ce1600a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 15 Aug 2017 20:53:31 +0200 Subject: [PATCH] ux: more nav work --- public/app/core/components/navbar/navbar.ts | 17 +++++++++++++++++ .../features/alerting/notification_edit_ctrl.ts | 4 +++- .../features/alerting/partials/alert_list.html | 6 ++---- .../alerting/partials/notification_edit.html | 3 +-- .../alerting/partials/notifications_list.html | 5 +---- public/app/features/org/orgDetailsCtrl.js | 2 +- .../features/org/partials/change_password.html | 5 +---- .../app/features/org/partials/orgApiKeys.html | 2 +- .../app/features/org/partials/orgDetails.html | 5 +---- public/app/features/org/partials/profile.html | 5 +---- public/app/features/plugins/ds_edit_ctrl.ts | 8 ++++++-- .../app/features/plugins/partials/ds_edit.html | 11 +---------- .../app/features/plugins/partials/ds_list.html | 6 ++---- .../features/plugins/partials/plugin_list.html | 1 + public/sass/layout/_page.scss | 1 - 15 files changed, 39 insertions(+), 42 deletions(-) diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts index 4b42bdaade0..59d3af10cb1 100644 --- a/public/app/core/components/navbar/navbar.ts +++ b/public/app/core/components/navbar/navbar.ts @@ -41,4 +41,21 @@ export function navbarDirective() { }; } +export function pageH1() { + return { + restrict: 'E', + template: ` +

+ + {{model.node.text}} +

+ `, + scope: { + model: "=", + } + }; +} + + +coreModule.directive('pageH1', pageH1); coreModule.directive('navbar', navbarDirective); diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts index 5f940a4359d..6e89558a5f1 100644 --- a/public/app/features/alerting/notification_edit_ctrl.ts +++ b/public/app/features/alerting/notification_edit_ctrl.ts @@ -36,12 +36,14 @@ export class AlertNotificationEditCtrl { } if (!this.$routeParams.id) { - this.navModel.breadcrumbs.push({text: 'New'}); + this.navModel.breadcrumbs.push({text: 'New channel'}); + this.navModel.node = {text: 'New channel'}; return _.defaults(this.model, this.defaults); } return this.backendSrv.get(`/api/alert-notifications/${this.$routeParams.id}`).then(result => { this.navModel.breadcrumbs.push({text: result.name}); + this.navModel.node = {text: result.name}; return result; }); }).then(model => { diff --git a/public/app/features/alerting/partials/alert_list.html b/public/app/features/alerting/partials/alert_list.html index c3586b1d9a6..447069bc8ee 100644 --- a/public/app/features/alerting/partials/alert_list.html +++ b/public/app/features/alerting/partials/alert_list.html @@ -2,10 +2,8 @@
-

- - {{ctrl.navModel.node.text}} -

+ + How to add an alert diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html index 9b716e02ce6..ec692586d7f 100644 --- a/public/app/features/alerting/partials/notification_edit.html +++ b/public/app/features/alerting/partials/notification_edit.html @@ -2,8 +2,7 @@
-

Edit Channel

-

New Channel

+
diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html index dd4d3957932..0ac2cfb105f 100644 --- a/public/app/features/alerting/partials/notifications_list.html +++ b/public/app/features/alerting/partials/notifications_list.html @@ -2,10 +2,7 @@
-

- - {{ctrl.navModel.node.text}} -

+ diff --git a/public/app/features/org/orgDetailsCtrl.js b/public/app/features/org/orgDetailsCtrl.js index 08c965fd333..7924d49fda2 100644 --- a/public/app/features/org/orgDetailsCtrl.js +++ b/public/app/features/org/orgDetailsCtrl.js @@ -10,7 +10,7 @@ function (angular) { $scope.init = function() { $scope.getOrgInfo(); - $scope.navModel = navModelSrv.getOrgNav(0); + $scope.navModel = navModelSrv.getNav('cfg', 'org'); }; $scope.getOrgInfo = function() { diff --git a/public/app/features/org/partials/change_password.html b/public/app/features/org/partials/change_password.html index 9ae42356b63..982c2fe16a8 100644 --- a/public/app/features/org/partials/change_password.html +++ b/public/app/features/org/partials/change_password.html @@ -2,10 +2,7 @@
-

- - {{navModel.node.text}} -

+
diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html index c4ec261cf64..d1c55f48f59 100644 --- a/public/app/features/org/partials/orgApiKeys.html +++ b/public/app/features/org/partials/orgApiKeys.html @@ -2,7 +2,7 @@
-

API Keys

+

Add new

diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html index ca6533a0b02..39f74cfb294 100644 --- a/public/app/features/org/partials/orgDetails.html +++ b/public/app/features/org/partials/orgDetails.html @@ -2,10 +2,7 @@
-

- - {{navModel.node.text}} -

+

General

diff --git a/public/app/features/org/partials/profile.html b/public/app/features/org/partials/profile.html index bf8bb336cf3..810e457c0fb 100644 --- a/public/app/features/org/partials/profile.html +++ b/public/app/features/org/partials/profile.html @@ -2,10 +2,7 @@
-

- - {{ctrl.navModel.node.text}} -

+
diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index 68f1c43df3d..7537631fbc0 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -59,7 +59,10 @@ export class DataSourceEditCtrl { initNewDatasourceModel() { this.isNew = true; this.current = angular.copy(defaults); - this.navModel.breadcrumbs.push({text: 'New data source'}); + + // add to nav & breadcrumbs + this.navModel.node = {text: 'New data source', icon: 'icon-gf icon-gf-fw icon-gf-datasources'}; + this.navModel.breadcrumbs.push(this.navModel.node); // We are coming from getting started if (this.$location.search().gettingstarted) { @@ -86,7 +89,8 @@ export class DataSourceEditCtrl { this.backendSrv.get('/api/datasources/' + id).then(ds => { this.isNew = false; this.current = ds; - this.navModel.breadcrumbs.push({text: ds.name}); + this.navModel.node = {text: ds.name, icon: 'icon-gf icon-gf-fw icon-gf-datasources'}; + this.navModel.breadcrumbs.push(this.navModel.node); if (datasourceCreated) { datasourceCreated = false; diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index 1646dc49a78..27015987616 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -3,16 +3,7 @@
-

- - New data source - {{ctrl.current.name}} -

- - - - Add data source - +