From b2add1977a328e9ef75ff2c68f53c50932d35d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 30 Nov 2017 16:35:27 +0100 Subject: [PATCH] ux: progress on new page header --- pkg/api/index.go | 4 - public/app/features/org/org_users_ctrl.ts | 5 +- .../app/features/org/partials/orgUsers.html | 92 +++++++++++-------- public/app/features/plugins/ds_edit_ctrl.ts | 8 +- .../features/plugins/partials/ds_edit.html | 60 ++++++------ .../plugins/partials/ds_http_settings.html | 4 +- public/sass/layout/_page.scss | 8 ++ 7 files changed, 103 insertions(+), 78 deletions(-) diff --git a/pkg/api/index.go b/pkg/api/index.go index 7f30dcf9f8a..36f20c82083 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -215,10 +215,6 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Description: "Add and configure data sources", Id: "datasources", Url: setting.AppSubUrl + "/datasources", - Children: []*dtos.NavLink{ - {Text: "List", Url: setting.AppSubUrl + "/datasources", Icon: "gicon gicon-datasources"}, - {Text: "New", Url: setting.AppSubUrl + "/datasources", Icon: "fa fa-fw fa-plus"}, - }, }, { Text: "Members", diff --git a/public/app/features/org/org_users_ctrl.ts b/public/app/features/org/org_users_ctrl.ts index 8127120e341..1686a1c3424 100644 --- a/public/app/features/org/org_users_ctrl.ts +++ b/public/app/features/org/org_users_ctrl.ts @@ -23,7 +23,7 @@ export class OrgUsersCtrl { role: 'Viewer', }; - this.navModel = navModelSrv.getNav('cfg', 'users'); + this.navModel = navModelSrv.getNav('cfg', 'users', 0); this.get(); this.editor = { index: 0 }; @@ -44,8 +44,7 @@ export class OrgUsersCtrl { if (this.externalUserMngLinkName) { return this.externalUserMngLinkName; } - - return "Add Members"; + return "Add Member"; } get() { diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index c612ab95271..5f98614b854 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -1,34 +1,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
- + +
+
+
+ - -
- - - - {{ctrl.addUsersBtnName}} - - - -
-
+ + + {{ctrl.addUsersBtnName}} + +
@@ -41,26 +59,26 @@ Login Email - - Seen - Time since user was seen using Grafana - + + Seen + Time since user was seen using Grafana + Role - - + + {{user.login}} {{user.email}} - {{user.lastSeenAtAge}} + {{user.lastSeenAtAge}} -
- -
+
+ +
diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts index 6ea230e054b..46e787738e5 100644 --- a/public/app/features/plugins/ds_edit_ctrl.ts +++ b/public/app/features/plugins/ds_edit_ctrl.ts @@ -41,7 +41,7 @@ export class DataSourceEditCtrl { navModelSrv, ) { - this.navModel = navModelSrv.getNav('cfg', 'datasources'); + this.navModel = navModelSrv.getNav('cfg', 'datasources', 0); this.datasources = []; this.tabIndex = 0; @@ -58,9 +58,7 @@ export class DataSourceEditCtrl { this.isNew = true; this.current = _.cloneDeep(defaults); - // 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); + this.navModel.breadcrumbs.push({text: 'New'}); // We are coming from getting started if (this.$location.search().gettingstarted) { @@ -87,7 +85,7 @@ export class DataSourceEditCtrl { this.backendSrv.get('/api/datasources/' + id).then(ds => { this.isNew = false; this.current = ds; - this.navModel.node = {text: ds.name, icon: 'icon-gf icon-gf-fw icon-gf-datasources'}; + this.navModel.node = {text: ds.name, icon: 'icon-gf icon-gf-fw icon-gf-datasources', id: 'ds-new'}; this.navModel.breadcrumbs.push(this.navModel.node); if (datasourceCreated) { diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index b15eb92602a..c879f74cfad 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -1,34 +1,40 @@ -
-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- - -
- -
-
-
-
+
-
-
+

Edit Data Source

+

New Data Source

+ +
+
Disclaimer. This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
diff --git a/public/app/features/plugins/partials/ds_http_settings.html b/public/app/features/plugins/partials/ds_http_settings.html index 39fc7296b32..0bc2e7dd1d9 100644 --- a/public/app/features/plugins/partials/ds_http_settings.html +++ b/public/app/features/plugins/partials/ds_http_settings.html @@ -1,7 +1,7 @@
-

HTTP settings

+

HTTP

@@ -38,7 +38,7 @@
-

HTTP Auth

+

Auth

diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 6ea39877311..bdb85d2a7ce 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -52,6 +52,10 @@ margin-bottom: $spacer * 2; display: flex; align-items: flex-start; + + > a, > button { + margin-left: $spacer; + } } .page-action-bar__spacer { @@ -70,6 +74,10 @@ } } +.page-sub-heading { + margin-bottom: $spacer; +} + .page-sidebar { color: $text-color-weak; h4 {