diff --git a/src/app/controllers/sidemenuCtrl.js b/src/app/controllers/sidemenuCtrl.js index 89d1b308428..4a10445afc5 100644 --- a/src/app/controllers/sidemenuCtrl.js +++ b/src/app/controllers/sidemenuCtrl.js @@ -20,7 +20,8 @@ function (angular, _, $) { { text: 'Settings', editview: 'settings', icon: "fa fa-cogs" }, { text: 'Templating', editview: 'templating', icon: "fa fa-cogs" }, { text: 'Annotations', editview: 'annotations', icon: "fa fa-bolt" }, - { text: 'More', href:"asd", icon: "fa fa-bolt" }, + { text: 'Export', href:"", icon: "fa fa-bolt" }, + { text: 'JSON', href:"", icon: "fa fa-bolt" }, ] }, { @@ -63,6 +64,7 @@ function (angular, _, $) { if (item.startsWith) { if (currentPath.indexOf(item.startsWith) === 0) { item.active = true; + item.href = currentPath; } } diff --git a/src/app/directives/dashEditLink.js b/src/app/directives/dashEditLink.js index 263982d3258..dbafebae35c 100644 --- a/src/app/directives/dashEditLink.js +++ b/src/app/directives/dashEditLink.js @@ -54,12 +54,8 @@ function (angular, $) { if (editorScope) { editorScope.dismiss(); } } - scope.onAppEvent('hide-dash-editor', hideEditorPane); - - scope.onAppEvent('show-dash-editor', function(evt, payload) { - if (payload.editview) { - payload.src = editViewMap[payload.editview]; - } + function showEditorPane(evt, payload, editview) { + if (editview) { payload.src = editViewMap[editview]; } if (lastEditor === payload.src) { hideEditorPane(); @@ -80,9 +76,9 @@ function (angular, $) { editorScope = null; hideScrollbars(false); - if (payload.editview) { + if (editview) { var urlParams = $location.search(); - if (payload.editview === urlParams.editview) { + if (editview === urlParams.editview) { delete urlParams.editview; $location.search(urlParams); } @@ -96,8 +92,18 @@ function (angular, $) { var view = $('
'); elem.append(view); $compile(elem.contents())(editorScope); + } + + scope.$watch("dashboardViewState.state.editview", function(newValue, oldValue) { + if (newValue) { + showEditorPane(null, {}, newValue); + } else if (oldValue) { + hideEditorPane(); + } }); + scope.onAppEvent('hide-dash-editor', hideEditorPane); + scope.onAppEvent('show-dash-editor', showEditorPane); } }; }); diff --git a/src/app/features/account/partials/account.html b/src/app/features/account/partials/account.html index e41c05584de..f45138b9736 100644 --- a/src/app/features/account/partials/account.html +++ b/src/app/features/account/partials/account.html @@ -1,3 +1,19 @@
+
+ +
+
+ + Account info +
+
+ +
+ +

TODO

+ +
+
+ diff --git a/src/app/features/dashboard/viewStateSrv.js b/src/app/features/dashboard/viewStateSrv.js index 2928e0800e9..6ebb5d05fab 100644 --- a/src/app/features/dashboard/viewStateSrv.js +++ b/src/app/features/dashboard/viewStateSrv.js @@ -53,12 +53,13 @@ function (angular, _, $) { state.panelId = parseInt(state.panelId) || null; state.fullscreen = state.fullscreen ? true : null; state.edit = (state.edit === "true" || state.edit === true) || null; + state.editview = state.editview || null; return state; }; DashboardViewState.prototype.serializeToUrl = function() { var urlState = _.clone(this.state); - urlState.fullscreen = this.state.fullscreen ? true : null, + urlState.fullscreen = this.state.fullscreen ? true : null; urlState.edit = this.state.edit ? true : null; return urlState; }; @@ -81,11 +82,6 @@ function (angular, _, $) { }; DashboardViewState.prototype.syncState = function() { - if (this.state.editview) { - this.$scope.appEvent('show-dash-editor', { scope: this.$scope, editview: this.state.editview }); - return; - } - if (this.panelScopes.length === 0) { return; } if (this.fullscreen) { diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index a0bba8c1a15..98261b1a94f 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -1,4 +1,4 @@ -
+
@@ -8,11 +8,15 @@ - {{dashboard.title}} + + {{dashboard.title}} + + + + -
    - +
    • Back to dashboard @@ -25,53 +29,12 @@
    • - + - -
      • -
    • - - - -
      • - -
      • - -
      • +
    • diff --git a/src/app/partials/navbar.html b/src/app/partials/navbar.html index 2e1db851b7a..7b349e944f5 100644 --- a/src/app/partials/navbar.html +++ b/src/app/partials/navbar.html @@ -1,10 +1,13 @@
      - - - + + + + + + {{pageTitle}}
      diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index 3983742497e..6c1bf140c3f 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -1,13 +1,16 @@
      -
      -
      - - Grafana - -
      -
      - -
      - - Admin - - -
      - - f - {{grafana.user.login}} - - -
      - - Sign out - -
      - -
      diff --git a/src/app/routes/backend/dashboard.js b/src/app/routes/backend/dashboard.js index 1ea3e8792cd..63e22cd7117 100644 --- a/src/app/routes/backend/dashboard.js +++ b/src/app/routes/backend/dashboard.js @@ -21,6 +21,7 @@ function (angular, store) { // do we have a previous dash if (prevDashPath) { $location.path(prevDashPath); + return; } var savedRoute = store.get('grafanaDashboardDefault'); diff --git a/src/css/less/p_pro.less b/src/css/less/p_pro.less index cd0e960a5d9..dec3bc33393 100644 --- a/src/css/less/p_pro.less +++ b/src/css/less/p_pro.less @@ -4,14 +4,14 @@ .sidemenu { list-style: none; - background: @bodyBackground; + background: @grafanaPanelBackground; margin: 0; padding: 0; } .sidemenu-links { margin: 0; - padding: 0; + padding: 5px 0; list-style: none; background: @grafanaTargetFuncBackground; li { @@ -20,19 +20,38 @@ } .sidemenu-link { + display: block; padding: 6px 0 6px 30px; font-size: 15px; - display: block; i { padding-right: 15px; } } +.sidemenu-user { + padding: 8px 10px 7px 15px; + display: block; + width: 170px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + .gravatar-missing { + display: none; + } + .gravatar-email { + padding-left: 4px; + } + img { + width: 35px; + padding-right: 10px; + } + border-bottom: 1px solid black; +} + .sidemenu-item { font-size: 17px; padding: 14px 10px 14px 20px; display: block; - background: @grafanaPanelBackground; i { padding-right: 15px; } @@ -66,46 +85,6 @@ } } -.pro-sidemenu-items { -} - -.pro-sidemenu-link { - font-size: 1.0rem; - padding: 14px 10px 14px 20px; - display: block; - background: @grafanaPanelBackground; - color: @grayLight; - i { - padding-right: 15px; - } - border-bottom: 1px solid black; -} - -.pro-sidemenu-link:first-child { - // border-top: 1px solid black; -} - -.pro-side-menu-user { - padding-left: 5px; - img { - width: 49px; - padding-right: 10px; - } -} - -.gravatar { - width: 170px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - .gravatar-missing { - display: none; - } - .gravatar-email { - padding-left: 4px; - } -} - .login-inner-box { background: @grafanaPanelBackground; h1 {