From 3be11b9861cf4aa43778062897bdcf0d9f110481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 17 Jan 2015 08:27:55 +0100 Subject: [PATCH 01/20] Small cosmetic change --- src/app/features/annotations/partials/editor.html | 4 ++-- src/app/partials/dashboard.html | 2 +- src/app/partials/dasheditor.html | 2 +- src/app/partials/roweditor.html | 2 +- src/app/partials/templating_editor.html | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/features/annotations/partials/editor.html b/src/app/features/annotations/partials/editor.html index 14208dc2ab2..ae2d624edd9 100644 --- a/src/app/features/annotations/partials/editor.html +++ b/src/app/features/annotations/partials/editor.html @@ -26,7 +26,7 @@ {{annotation.name}} - + Edit @@ -34,7 +34,7 @@ - + diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html index 5795c6e2c8f..d5118a3ee96 100644 --- a/src/app/partials/dashboard.html +++ b/src/app/partials/dashboard.html @@ -104,7 +104,7 @@
- + ADD ROW
diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html index f19c5701c38..fdeb3a4db24 100644 --- a/src/app/partials/dasheditor.html +++ b/src/app/partials/dasheditor.html @@ -54,7 +54,7 @@ - + diff --git a/src/app/partials/roweditor.html b/src/app/partials/roweditor.html index e15f765d2af..450d8a01a3e 100644 --- a/src/app/partials/roweditor.html +++ b/src/app/partials/roweditor.html @@ -41,7 +41,7 @@ - + diff --git a/src/app/partials/templating_editor.html b/src/app/partials/templating_editor.html index c17d0259b2b..1fd600a5701 100644 --- a/src/app/partials/templating_editor.html +++ b/src/app/partials/templating_editor.html @@ -31,7 +31,7 @@ {{variable.query}} - + Edit @@ -39,7 +39,7 @@ - + From e411b8e423f42aa9c151e46a280d9601dd2b7617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 19 Jan 2015 13:07:55 +0100 Subject: [PATCH 02/20] Fixed icons in graph tooltip, not updated after recent font awesome upgrade, Closes #1355 --- src/app/panels/graph/graph.tooltip.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/panels/graph/graph.tooltip.js b/src/app/panels/graph/graph.tooltip.js index 9e750cb6a9c..67d6c601104 100644 --- a/src/app/panels/graph/graph.tooltip.js +++ b/src/app/panels/graph/graph.tooltip.js @@ -163,7 +163,7 @@ function ($) { value = series.formatValue(hoverInfo.value); seriesHtml += '
'; - seriesHtml += ' ' + series.label + ':
'; + seriesHtml += ' ' + series.label + ':
'; seriesHtml += '
' + value + '
'; plot.highlight(i, hoverInfo.hoverIndex); } @@ -174,7 +174,7 @@ function ($) { else if (item) { series = seriesList[item.seriesIndex]; group = '
'; - group += ' ' + series.label + ':
'; + group += ' ' + series.label + ':
'; if (scope.panel.stack && scope.panel.tooltip.value_type === 'individual') { value = item.datapoint[1] - item.datapoint[2]; From 5cef73331c4de86b6036b5e19b7b2f7c5e5f49d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 21 Jan 2015 07:27:27 +0100 Subject: [PATCH 03/20] Fixed asteric icon in graphite metric path selector, broken after resent font awesome upgrade, #1361 --- src/app/features/graphite/queryCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/graphite/queryCtrl.js b/src/app/features/graphite/queryCtrl.js index 0654c474af5..d878386d461 100644 --- a/src/app/features/graphite/queryCtrl.js +++ b/src/app/features/graphite/queryCtrl.js @@ -293,7 +293,7 @@ function (angular, _, config, gfunc, Parser) { function MetricSegment(options) { if (options === '*' || options.value === '*') { this.value = '*'; - this.html = $sce.trustAsHtml(''); + this.html = $sce.trustAsHtml(''); this.expandable = true; return; } From 83899eb884f2e821436b53aefeb57eafa06f5b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 21 Jan 2015 13:05:55 +0100 Subject: [PATCH 04/20] added hamburger --- src/app/partials/dashboard_topnav.html | 9 ++++++--- src/app/partials/login.html | 2 +- src/css/less/grafana.less | 10 ++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index 0d3a8f30ee1..a0bba8c1a15 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -1,10 +1,13 @@
- - - + + + + + + {{dashboard.title}} diff --git a/src/app/partials/login.html b/src/app/partials/login.html index a6e5aa9634e..3ba55cb94be 100644 --- a/src/app/partials/login.html +++ b/src/app/partials/login.html @@ -28,7 +28,7 @@ Password
  • - +
    diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 0f1f1f0b084..14de7e5f47f 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -52,6 +52,16 @@ float: left; } +.navbar .brand { + margin-left: 0; +} + +.hamburger { + float: left; + padding: 15px 0 14px 0; + font-size: 1.4em; +} + .page-title { padding: 15px 0; display: block; From 4e6a04923a29bd0536ba51bc60f4c87566fce7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 21 Jan 2015 14:44:34 +0100 Subject: [PATCH 05/20] worked on new sidemenu design --- src/app/controllers/all.js | 1 + src/app/controllers/sidemenuCtrl.js | 71 ++++++++++++++++ .../features/account/partials/account.html | 3 + src/app/partials/sidemenu.html | 81 ++++++++++++------- src/app/routes/backend/all.js | 3 + src/css/less/p_pro.less | 37 +++++++++ 6 files changed, 167 insertions(+), 29 deletions(-) create mode 100644 src/app/controllers/sidemenuCtrl.js create mode 100644 src/app/features/account/partials/account.html diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js index ef6f473e34e..bf5c8164397 100644 --- a/src/app/controllers/all.js +++ b/src/app/controllers/all.js @@ -7,5 +7,6 @@ define([ './inspectCtrl', './jsonEditorCtrl', './loginCtrl', + './sidemenuCtrl', './errorCtrl', ], function () {}); diff --git a/src/app/controllers/sidemenuCtrl.js b/src/app/controllers/sidemenuCtrl.js new file mode 100644 index 00000000000..63edb5c5af9 --- /dev/null +++ b/src/app/controllers/sidemenuCtrl.js @@ -0,0 +1,71 @@ +define([ + 'angular', + 'lodash', +], +function (angular, _) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('SideMenuCtrl', function($scope, $location) { + + $scope.menu = [ + { + text: "Dashbord", + href: "/", + icon: "fa fa-th-large", + links: [ + { text: 'Settings', href:"asd", icon: "fa fa-cogs" }, + { text: 'Templating', href:"asd", icon: "fa fa-cogs" }, + { text: 'Annotations', href:"asd", icon: "fa fa-bolt" }, + { text: 'More', href:"asd", icon: "fa fa-bolt" }, + ] + }, + { + text: "Account", href: "/account", + icon: "fa fa-shield", + links: [ + { text: 'Data sources', href:"/account/datasources", icon: "fa fa-sitemap" }, + { text: 'Users', href:"/account/datasources", icon: "fa fa-users" }, + { text: 'API Keys', href:"/account/datasources", icon: "fa fa-key" }, + ] + }, + { + text: "Profile", href: "/profile", + icon: "fa fa-user", + links: [ + { text: 'Password', href:"asd", icon: "fa fa-lock" }, + ] + } + ]; + + $scope.onAppEvent('$routeChangeSuccess', function() { + $scope.updateState(); + }); + + $scope.updateState = function() { + var currentPath = $location.path(); + _.each($scope.menu, function(item) { + item.active = false; + + if (item.href === currentPath) { + item.active = true; + } + + _.each(item.links, function(link) { + link.active = false; + + if (link.href === currentPath) { + item.active = true; + link.active = true; + } + }); + }); + }; + + $scope.init = function() { + $scope.updateState(); + }; + }); + +}); diff --git a/src/app/features/account/partials/account.html b/src/app/features/account/partials/account.html new file mode 100644 index 00000000000..e41c05584de --- /dev/null +++ b/src/app/features/account/partials/account.html @@ -0,0 +1,3 @@ +
    + + diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index fb3b5206899..f45622cfa6f 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -1,4 +1,55 @@ +
    +
    +
    + + Grafana + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + Admin + +
    f @@ -8,35 +59,7 @@
  • Logout
    • - - - Dashboards - - - - Data - - - Users - - - API Keys - - - - Import - - - - - Profile - - - - Admin - - - + Sign out diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js index f3dea9a4b0e..e52abb47f41 100644 --- a/src/app/routes/backend/all.js +++ b/src/app/routes/backend/all.js @@ -30,6 +30,9 @@ define([ controller : 'DashFromImportCtrl', reloadOnSearch: false, }) + .when('/account', { + templateUrl: 'app/features/account/partials/account.html', + }) .when('/account/datasources', { templateUrl: 'app/features/account/partials/datasources.html', controller : 'DataSourcesCtrl', diff --git a/src/css/less/p_pro.less b/src/css/less/p_pro.less index 0565bdbde04..cd0e960a5d9 100644 --- a/src/css/less/p_pro.less +++ b/src/css/less/p_pro.less @@ -2,6 +2,43 @@ display: none; } +.sidemenu { + list-style: none; + background: @bodyBackground; + margin: 0; + padding: 0; +} + +.sidemenu-links { + margin: 0; + padding: 0; + list-style: none; + background: @grafanaTargetFuncBackground; + li { + display: block; + } +} + +.sidemenu-link { + padding: 6px 0 6px 30px; + font-size: 15px; + display: block; + i { + padding-right: 15px; + } +} + +.sidemenu-item { + font-size: 17px; + padding: 14px 10px 14px 20px; + display: block; + background: @grafanaPanelBackground; + i { + padding-right: 15px; + } + border-bottom: 1px solid black; +} + .pro-sidemenu-open { .pro-sidemenu { display: block; From cd4fc78aec101ff2b55db846ea6bc9456a1b6b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 21 Jan 2015 16:29:04 +0100 Subject: [PATCH 06/20] trying to get dashboard settings, annotations and templating views be opened via url parameters --- src/app/controllers/sidemenuCtrl.js | 36 +++++++++++++++---- src/app/directives/dashEditLink.js | 21 +++++++++-- .../features/account/partials/apikeys.html | 2 +- .../account/partials/datasources.html | 2 +- src/app/features/account/partials/users.html | 2 +- src/app/features/dashboard/viewStateSrv.js | 5 +++ src/app/partials/sidemenu.html | 29 ++------------- 7 files changed, 59 insertions(+), 38 deletions(-) diff --git a/src/app/controllers/sidemenuCtrl.js b/src/app/controllers/sidemenuCtrl.js index 63edb5c5af9..89d1b308428 100644 --- a/src/app/controllers/sidemenuCtrl.js +++ b/src/app/controllers/sidemenuCtrl.js @@ -1,8 +1,9 @@ define([ 'angular', 'lodash', + 'jquery', ], -function (angular, _) { +function (angular, _, $) { 'use strict'; var module = angular.module('grafana.controllers'); @@ -13,11 +14,12 @@ function (angular, _) { { text: "Dashbord", href: "/", + startsWith: '/dashboard/', icon: "fa fa-th-large", links: [ - { text: 'Settings', href:"asd", icon: "fa fa-cogs" }, - { text: 'Templating', href:"asd", icon: "fa fa-cogs" }, - { text: 'Annotations', href:"asd", icon: "fa fa-bolt" }, + { 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" }, ] }, @@ -26,8 +28,8 @@ function (angular, _) { icon: "fa fa-shield", links: [ { text: 'Data sources', href:"/account/datasources", icon: "fa fa-sitemap" }, - { text: 'Users', href:"/account/datasources", icon: "fa fa-users" }, - { text: 'API Keys', href:"/account/datasources", icon: "fa fa-key" }, + { text: 'Users', href:"/account/users", icon: "fa fa-users" }, + { text: 'API Keys', href:"/account/apikeys", icon: "fa fa-key" }, ] }, { @@ -39,12 +41,18 @@ function (angular, _) { } ]; + $scope.onAppEvent('$routeUpdate', function() { + $scope.updateState(); + }); + $scope.onAppEvent('$routeChangeSuccess', function() { $scope.updateState(); }); $scope.updateState = function() { var currentPath = $location.path(); + var search = $location.search(); + _.each($scope.menu, function(item) { item.active = false; @@ -52,9 +60,25 @@ function (angular, _) { item.active = true; } + if (item.startsWith) { + if (currentPath.indexOf(item.startsWith) === 0) { + item.active = true; + } + } + _.each(item.links, function(link) { link.active = false; + if (link.editview) { + var params = {}; + _.each(search, function(value, key) { + if (value !== null) { params[key] = value; } + }); + + params.editview = link.editview; + link.href = currentPath + '?' + $.param(params); + } + if (link.href === currentPath) { item.active = true; link.active = true; diff --git a/src/app/directives/dashEditLink.js b/src/app/directives/dashEditLink.js index b0ac97d3423..263982d3258 100644 --- a/src/app/directives/dashEditLink.js +++ b/src/app/directives/dashEditLink.js @@ -5,6 +5,12 @@ define([ function (angular, $) { 'use strict'; + var editViewMap = { + 'settings': 'app/partials/dasheditor.html', + 'annotations': 'app/features/annotations/partials/editor.html', + 'templating': 'app/partials/templating_editor.html', + }; + angular .module('grafana.directives') .directive('dashEditorLink', function($timeout) { @@ -25,7 +31,7 @@ function (angular, $) { angular .module('grafana.directives') - .directive('dashEditorView', function($compile) { + .directive('dashEditorView', function($compile, $location) { return { restrict: 'A', link: function(scope, elem) { @@ -48,10 +54,13 @@ function (angular, $) { if (editorScope) { editorScope.dismiss(); } } - scope.onAppEvent("dashboard-loaded", hideEditorPane); scope.onAppEvent('hide-dash-editor', hideEditorPane); scope.onAppEvent('show-dash-editor', function(evt, payload) { + if (payload.editview) { + payload.src = editViewMap[payload.editview]; + } + if (lastEditor === payload.src) { hideEditorPane(); return; @@ -70,6 +79,14 @@ function (angular, $) { lastEditor = null; editorScope = null; hideScrollbars(false); + + if (payload.editview) { + var urlParams = $location.search(); + if (payload.editview === urlParams.editview) { + delete urlParams.editview; + $location.search(urlParams); + } + } }; // hide page scrollbars while edit pane is visible diff --git a/src/app/features/account/partials/apikeys.html b/src/app/features/account/partials/apikeys.html index f286360a811..489cd85c743 100644 --- a/src/app/features/account/partials/apikeys.html +++ b/src/app/features/account/partials/apikeys.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/src/app/features/account/partials/datasources.html b/src/app/features/account/partials/datasources.html index 4f5f2399d98..c936125aa37 100644 --- a/src/app/features/account/partials/datasources.html +++ b/src/app/features/account/partials/datasources.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/src/app/features/account/partials/users.html b/src/app/features/account/partials/users.html index dc6becf45b6..9b54b33fea8 100644 --- a/src/app/features/account/partials/users.html +++ b/src/app/features/account/partials/users.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/src/app/features/dashboard/viewStateSrv.js b/src/app/features/dashboard/viewStateSrv.js index c08d3cdba6b..2928e0800e9 100644 --- a/src/app/features/dashboard/viewStateSrv.js +++ b/src/app/features/dashboard/viewStateSrv.js @@ -81,6 +81,11 @@ 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/sidemenu.html b/src/app/partials/sidemenu.html index f45622cfa6f..3983742497e 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -8,7 +8,7 @@
    -
    - - - - - - - - - - - - - - - - - - - - - - - - +
    Admin @@ -62,7 +38,6 @@ Sign out -
    From 1fb9bbba91e6d760d1c0ff2bd20021d1b7804a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 21 Jan 2015 19:45:23 +0100 Subject: [PATCH 07/20] a lot of work on sidemenu, and encoding dash edit view in url --- src/app/controllers/sidemenuCtrl.js | 4 +- src/app/directives/dashEditLink.js | 22 +++--- .../features/account/partials/account.html | 16 +++++ src/app/features/dashboard/viewStateSrv.js | 8 +-- src/app/partials/dashboard_topnav.html | 57 +++------------- src/app/partials/navbar.html | 9 ++- src/app/partials/sidemenu.html | 38 +++-------- src/app/routes/backend/dashboard.js | 1 + src/css/less/p_pro.less | 67 +++++++------------ 9 files changed, 85 insertions(+), 137 deletions(-) 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 { From fc9de68ee9e367bb2bd107d49fd5dfcf6ef64f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 21 Jan 2015 20:01:22 +0100 Subject: [PATCH 08/20] fixed broken html on login page --- src/app/partials/loadmetrics.html | 36 ------------------------------- src/app/partials/login.html | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 src/app/partials/loadmetrics.html diff --git a/src/app/partials/loadmetrics.html b/src/app/partials/loadmetrics.html deleted file mode 100644 index 2665386e0e9..00000000000 --- a/src/app/partials/loadmetrics.html +++ /dev/null @@ -1,36 +0,0 @@ -
        -
        Load metrics keys into elastic search
        - -

        - Work in progress... -

        - -
        diff --git a/src/app/partials/login.html b/src/app/partials/login.html index 3ba55cb94be..9c197969b5e 100644 --- a/src/app/partials/login.html +++ b/src/app/partials/login.html @@ -28,7 +28,7 @@ Password
      • -
      From 1d8bb45d3afc5934a3633071a9d3af2a8a69cdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 21 Jan 2015 20:14:53 +0100 Subject: [PATCH 09/20] quickfix for support suburl for sidemenu nav --- src/app/controllers/sidemenuCtrl.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/app/controllers/sidemenuCtrl.js b/src/app/controllers/sidemenuCtrl.js index 4a10445afc5..355783653cf 100644 --- a/src/app/controllers/sidemenuCtrl.js +++ b/src/app/controllers/sidemenuCtrl.js @@ -2,19 +2,24 @@ define([ 'angular', 'lodash', 'jquery', + 'config', ], -function (angular, _, $) { +function (angular, _, $, config) { 'use strict'; var module = angular.module('grafana.controllers'); module.controller('SideMenuCtrl', function($scope, $location) { + $scope.getUrl = function(url) { + return config.appSubUrl + url; + }; + $scope.menu = [ { text: "Dashbord", - href: "/", - startsWith: '/dashboard/', + href: $scope.getUrl("/"), + startsWith: config.appSubUrl + '/dashboard/', icon: "fa fa-th-large", links: [ { text: 'Settings', editview: 'settings', icon: "fa fa-cogs" }, @@ -25,19 +30,19 @@ function (angular, _, $) { ] }, { - text: "Account", href: "/account", + text: "Account", href: $scope.getUrl("/account"), icon: "fa fa-shield", links: [ - { text: 'Data sources', href:"/account/datasources", icon: "fa fa-sitemap" }, - { text: 'Users', href:"/account/users", icon: "fa fa-users" }, - { text: 'API Keys', href:"/account/apikeys", icon: "fa fa-key" }, + { text: 'Data sources', href: $scope.getUrl("/account/datasources"), icon: "fa fa-sitemap" }, + { text: 'Users', href: $scope.getUrl("/account/users"), icon: "fa fa-users" }, + { text: 'API Keys', href: $scope.getUrl("/account/apikeys"), icon: "fa fa-key" }, ] }, { - text: "Profile", href: "/profile", + text: "Profile", href: $scope.getUrl("/profile"), icon: "fa fa-user", links: [ - { text: 'Password', href:"asd", icon: "fa fa-lock" }, + { text: 'Password', href:"", icon: "fa fa-lock" }, ] } ]; @@ -51,7 +56,7 @@ function (angular, _, $) { }); $scope.updateState = function() { - var currentPath = $location.path(); + var currentPath = config.appSubUrl + $location.path(); var search = $location.search(); _.each($scope.menu, function(item) { From 1a11b400b026806753a567813d4b65026b526e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 22 Jan 2015 10:14:24 +0100 Subject: [PATCH 10/20] Polish and incorporating new design for login screen from matt --- src/app/controllers/loginCtrl.js | 29 +++--- src/app/partials/login.html | 57 +++++------- src/app/partials/sidemenu.html | 2 +- src/css/less/bootswatch.dark.less | 2 +- src/css/less/bootswatch.light.less | 2 +- src/css/less/overrides.less | 1 - src/css/less/p_pro.less | 136 ++++++++++++++++------------- src/css/less/variables.dark.less | 12 +-- 8 files changed, 126 insertions(+), 115 deletions(-) diff --git a/src/app/controllers/loginCtrl.js b/src/app/controllers/loginCtrl.js index 9cc28d75ddb..752e1e26cb4 100644 --- a/src/app/controllers/loginCtrl.js +++ b/src/app/controllers/loginCtrl.js @@ -16,7 +16,7 @@ function (angular, config) { $scope.newUser = {}; $scope.grafana.sidemenu = false; - $scope.mode = 'login'; + $scope.loginMode = true; // build info view model $scope.buildInfo = { @@ -26,13 +26,29 @@ function (angular, config) { }; $scope.submit = function() { - if ($scope.mode === 'login') { + if ($scope.loginMode) { $scope.login(); } else { $scope.signUp(); } }; + $scope.getSubmitBtnClass = function() { + if ($scope.loginForm.$valid) { + return "btn-primary"; + } else { + return "btn-inverse"; + } + }; + + $scope.getSubmitBtnText = function() { + if ($scope.loginMode) { + return "Log in"; + } else { + return "Sign up"; + } + }; + $scope.init = function() { if ($routeParams.logout) { $scope.logout(); @@ -40,11 +56,6 @@ function (angular, config) { }; $scope.signUp = function() { - if ($scope.mode === 'login') { - $scope.mode = 'signup'; - return; - } - if (!$scope.loginForm.$valid) { return; } @@ -63,10 +74,6 @@ function (angular, config) { }; $scope.login = function() { - if ($scope.mode === 'signup') { - $scope.mode = 'login'; - return; - } delete $scope.loginError; if (!$scope.loginForm.$valid) { diff --git a/src/app/partials/login.html b/src/app/partials/login.html index 9c197969b5e..68e80ef6139 100644 --- a/src/app/partials/login.html +++ b/src/app/partials/login.html @@ -7,14 +7,20 @@
  • diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less index f3d83683f51..a1b06114d38 100644 --- a/src/css/less/bootswatch.dark.less +++ b/src/css/less/bootswatch.dark.less @@ -363,7 +363,7 @@ div.subnav { background-image: none; .box-shadow(none); border: none; - .border-radius(2px); + .border-radius(3px); text-shadow: none; &.disabled { diff --git a/src/css/less/bootswatch.light.less b/src/css/less/bootswatch.light.less index f4f573c58b0..2e59e80769d 100644 --- a/src/css/less/bootswatch.light.less +++ b/src/css/less/bootswatch.light.less @@ -309,7 +309,7 @@ div.subnav { background-image: none; .box-shadow(none); border: none; - .border-radius(0); + .border-radius(3px); text-shadow: none; &.disabled { diff --git a/src/css/less/overrides.less b/src/css/less/overrides.less index f4139e020ea..969823a5481 100644 --- a/src/css/less/overrides.less +++ b/src/css/less/overrides.less @@ -58,7 +58,6 @@ .bgInverse { background: @btnInverseBackground; color: rgba(255,255,255,.90); - } code, pre { diff --git a/src/css/less/p_pro.less b/src/css/less/p_pro.less index dec3bc33393..e79105cf5bd 100644 --- a/src/css/less/p_pro.less +++ b/src/css/less/p_pro.less @@ -2,6 +2,33 @@ display: none; } +.pro-sidemenu-open { + .pro-sidemenu { + display: block; + position: absolute; + top: 0; + left: 0; + width: 200px; + background: @bodyBackground; + border-right: 2px solid black; + min-height: 100%; + z-index: 101; + } + + .dashboard-notice { + margin-left: 200px; + width: auto; + } + + .pro-main-view { + padding-left: 200px; + } + + .panel-fullscreen { + left: 200px; + } +} + .sidemenu { list-style: none; background: @grafanaPanelBackground; @@ -58,54 +85,66 @@ border-bottom: 1px solid black; } -.pro-sidemenu-open { - .pro-sidemenu { - display: block; - position: absolute; - top: 0; - left: 0; - width: 200px; - background: @bodyBackground; - border-right: 2px solid black; - min-height: 100%; - z-index: 101; - } - .dashboard-notice { - margin-left: 200px; - width: auto; - } - - .pro-main-view { - padding-left: 200px; - } - - .panel-fullscreen { - left: 200px; - } +.login-form { + width: 50%; + float: left; + margin-left: 25%; + margin-right: 25%; + padding-top: 50px; } +.login-box { + width: 700px; + margin: 100px auto 0 auto; +} + +.login-box-logo { + text-align: center; + padding-bottom: 50px; +} + + .login-inner-box { background: @grafanaPanelBackground; - h1 { - font-size: 1.15em; - background: @grafanaTargetBackground; - text-align: center; - padding: 2px; - } } -.login-signup-button { - width: 45%; +.login-tab-header { + background: @grafanaTargetBackground; text-align: center; +} - a { - font-weight: bold; +.btn-login-tab { + background: transparent; + border: none; + font-size: 15px; + padding: 10px 10px; + + &.active { + background: darken(@grafanaTargetBackground, 5%); + color: @white; } - &.login-signup-button-disable { - a { - color: darken(@linkColor, 35%); - } + + &:focus { + outline: none; + } + + font-weight: bold; + display: inline-block; + width: 170px; + color: @textColor; +} + +.login-submit-button-row { + text-align: center; + margin-top: 40px; + button { + padding: 9px 7px; + font-size: 14px; + font-weight: bold; + width: 150px; + display: inline-block; + border: 1px solid lighten(@btnInverseBackground, 10%); } } @@ -123,25 +162,4 @@ } } -.login-form { - width: 50%; - float: left; - margin-left: 25%; - margin-right: 25%; - padding-top: 30px; -} - -.login-box { - width: 700px; - margin: 100px auto 0 auto; -} - -.login-box-logo { - text-align: center; - padding-bottom: 50px; -} - -.register-box { - margin-top: 100px; -} diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less index 6dbe943e0c2..be851d6a5ad 100644 --- a/src/css/less/variables.dark.less +++ b/src/css/less/variables.dark.less @@ -17,7 +17,7 @@ // Accent colors // ------------------------- @blue: #33B5E5; -@blueDark: #0099CC; +@blueDark: #0086b3; @green: #669900; @red: #CC3900; @yellow: #ECBB13; @@ -111,12 +111,12 @@ // Buttons // ------------------------- -@btnBackground: @grayLight; +@btnBackground: @grayDark; @btnBackgroundHighlight: darken(@grayLight, 15%); @btnBorder: #bbb; -@btnPrimaryBackground: lighten(@blue, 5%); -@btnPrimaryBackgroundHighlight: darken(@blue, 5%); +@btnPrimaryBackground: lighten(@blueDark, 5%); +@btnPrimaryBackgroundHighlight: darken(@blueDark, 5%); @btnInfoBackground: lighten(@purple, 5%); @btnInfoBackgroundHighlight: darken(@purple, 5%); @@ -130,8 +130,8 @@ @btnDangerBackground: lighten(@red, 5%); @btnDangerBackgroundHighlight: darken(@red, 5%); -@btnInverseBackground: lighten(@black, 5%); -@btnInverseBackgroundHighlight: darken(@black, 5%); +@btnInverseBackground: @grayDark; +@btnInverseBackgroundHighlight: lighten(@grayDark, 5%); // Forms From c82e2d74bfa9c72bb6f5a9c750eadf7567a51672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 22 Jan 2015 11:51:44 +0100 Subject: [PATCH 11/20] Login validation --- src/app/controllers/loginCtrl.js | 61 ++++++++++++++++++++------------ src/app/directives/tip.js | 15 ++++++++ src/app/partials/login.html | 19 ++++++---- src/css/less/p_pro.less | 19 ++++++++++ 4 files changed, 84 insertions(+), 30 deletions(-) diff --git a/src/app/controllers/loginCtrl.js b/src/app/controllers/loginCtrl.js index 752e1e26cb4..3f109709167 100644 --- a/src/app/controllers/loginCtrl.js +++ b/src/app/controllers/loginCtrl.js @@ -8,15 +8,27 @@ function (angular, config) { var module = angular.module('grafana.controllers'); module.controller('LoginCtrl', function($scope, backendSrv, $location, $routeParams, alertSrv) { - $scope.loginModel = { - user: '', - password: '' - }; - $scope.newUser = {}; + $scope.formModel = { + user: '', + email: '', + password: '', + }; $scope.grafana.sidemenu = false; $scope.loginMode = true; + $scope.submitBtnClass = 'btn-inverse'; + $scope.submitBtnText = 'Log in'; + $scope.strengthClass = ''; + + $scope.init = function() { + if ($routeParams.logout) { + $scope.logout(); + } + + $scope.$watch("loginMode", $scope.loginModeChanged); + $scope.passwordChanged(); + }; // build info view model $scope.buildInfo = { @@ -33,26 +45,29 @@ function (angular, config) { } }; - $scope.getSubmitBtnClass = function() { - if ($scope.loginForm.$valid) { - return "btn-primary"; - } else { - return "btn-inverse"; - } + $scope.loginModeChanged = function(newValue) { + $scope.submitBtnText = newValue ? 'Log in' : 'Sign up'; }; - $scope.getSubmitBtnText = function() { - if ($scope.loginMode) { - return "Log in"; - } else { - return "Sign up"; + $scope.passwordChanged = function(newValue) { + if (!newValue) { + $scope.strengthText = ""; + $scope.strengthClass = "hidden"; + return; + } + if (newValue.length < 4) { + $scope.strengthText = "strength: weak sauce."; + $scope.strengthClass = "password-strength-bad"; + return; + } + if (newValue.length <= 6) { + $scope.strengthText = "strength: you can do better."; + $scope.strengthClass = "password-strength-ok"; + return; } - }; - $scope.init = function() { - if ($routeParams.logout) { - $scope.logout(); - } + $scope.strengthText = "strength: strong like a bull."; + $scope.strengthClass = "password-strength-good"; }; $scope.signUp = function() { @@ -60,7 +75,7 @@ function (angular, config) { return; } - backendSrv.put('/api/user/signup', $scope.newUser).then(function() { + backendSrv.put('/api/user/signup', $scope.formModel).then(function() { window.location.href = config.appSubUrl + '/'; }); }; @@ -80,7 +95,7 @@ function (angular, config) { return; } - backendSrv.post('/login', $scope.loginModel).then(function() { + backendSrv.post('/login', $scope.formModel).then(function() { window.location.href = config.appSubUrl + '/'; }); }; diff --git a/src/app/directives/tip.js b/src/app/directives/tip.js index 895015cb671..a0aac161bb2 100644 --- a/src/app/directives/tip.js +++ b/src/app/directives/tip.js @@ -18,6 +18,21 @@ function (angular, kbn) { }; }); + angular + .module('grafana.directives') + .directive('watchChange', function() { + return { + scope: { onchange: '&watchChange' }, + link: function(scope, element) { + element.on('input', function() { + scope.$apply(function () { + scope.onchange({ inputValue: element.val() }); + }); + }); + } + }; + }); + angular .module('grafana.directives') .directive('editorOptBool', function($compile) { diff --git a/src/app/partials/login.html b/src/app/partials/login.html index 68e80ef6139..4c70be392af 100644 --- a/src/app/partials/login.html +++ b/src/app/partials/login.html @@ -23,7 +23,7 @@ User
  • - +
    • @@ -34,11 +34,11 @@ Password
  • - +
    • -
    +
      @@ -46,7 +46,7 @@ Email
    • - +
    @@ -58,16 +58,21 @@ Password
  • - +
    • +
    + {{strengthText}} +
    + diff --git a/src/css/less/p_pro.less b/src/css/less/p_pro.less index e79105cf5bd..b3d65e9acc5 100644 --- a/src/css/less/p_pro.less +++ b/src/css/less/p_pro.less @@ -135,6 +135,25 @@ color: @textColor; } +.password-strength { + display: block; + width: 50px; + overflow: visible; + white-space: nowrap; + padding-top: 3px; + margin-left: 97px; + color: darken(@textColor, 20%); + border-top: 3px solid @red; + &.password-strength-ok { + width: 170px; + border-top: 3px solid lighten(@yellow, 10%); + } + &.password-strength-good { + width: 254px; + border-top: 3px solid lighten(@green, 10%); + } +} + .login-submit-button-row { text-align: center; margin-top: 40px; From d3c37bda718bc577ad093cfd72faf356b9422653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 23 Jan 2015 10:29:54 +0100 Subject: [PATCH 12/20] Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax), Fixes #1372 --- CHANGELOG.md | 1 + src/app/features/graphite/datasource.js | 1 + src/test/specs/graphiteDatasource-specs.js | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa3114b39af..1a8450a80e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - [Issue #1298](https://github.com/grafana/grafana/issues/1298). InfluxDB: Fix handling of empty array in templating variable query - [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold - [Issue #1345](https://github.com/grafana/grafana/issues/1345). UI: Fixed position of confirm modal when scrolled down +- [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax) **Tech** - [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2 diff --git a/src/app/features/graphite/datasource.js b/src/app/features/graphite/datasource.js index 639e150a320..a486250ac74 100644 --- a/src/app/features/graphite/datasource.js +++ b/src/app/features/graphite/datasource.js @@ -276,6 +276,7 @@ function (angular, _, $, config, kbn, moment) { targetValue = targets[this._seriesRefLetters[i]]; targetValue = targetValue.replace(regex, nestedSeriesRegexReplacer); + targets[this._seriesRefLetters[i]] = targetValue; clean_options.push("target=" + encodeURIComponent(targetValue)); } diff --git a/src/test/specs/graphiteDatasource-specs.js b/src/test/specs/graphiteDatasource-specs.js index e23f0e89d4c..58bc62be7ce 100644 --- a/src/test/specs/graphiteDatasource-specs.js +++ b/src/test/specs/graphiteDatasource-specs.js @@ -74,6 +74,13 @@ define([ expect(results[2]).to.be('target=asPercent(series1%2Cseries2)'); }); + it('should replace target placeholder when nesting query references', function() { + var results = ctx.ds.buildGraphiteParams({ + targets: [{target: 'series1'}, {target: 'sumSeries(#A)'}, {target: 'asPercent(#A,#B)'}] + }); + expect(results[2]).to.be('target=' + encodeURIComponent("asPercent(series1,sumSeries(series1))")); + }); + it('should fix wrong minute interval parameters', function() { var results = ctx.ds.buildGraphiteParams({ targets: [{target: "summarize(prod.25m.count, '25m', 'sum')" }] From 1508d0ac236242bf7ee81466fcc992d594f82a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 23 Jan 2015 10:41:23 +0100 Subject: [PATCH 13/20] TemplatOCing: Fix to allow custom template variables to contain white space, now only splits on ',', Fixes #1363 --- CHANGELOG.md | 1 + src/app/features/templating/templateValuesSrv.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a8450a80e8..230ff061e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold - [Issue #1345](https://github.com/grafana/grafana/issues/1345). UI: Fixed position of confirm modal when scrolled down - [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax) +- [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ',' **Tech** - [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2 diff --git a/src/app/features/templating/templateValuesSrv.js b/src/app/features/templating/templateValuesSrv.js index 51b11dfb3fa..0add3fc5df9 100644 --- a/src/app/features/templating/templateValuesSrv.js +++ b/src/app/features/templating/templateValuesSrv.js @@ -81,7 +81,7 @@ function (angular, _, kbn) { this._updateNonQueryVariable = function(variable) { // extract options in comma seperated string - variable.options = _.map(variable.query.split(/[\s,]+/), function(text) { + variable.options = _.map(variable.query.split(/[,]+/), function(text) { return { text: text, value: text }; }); From c2c81e7e6aafcfec6814e0acde11927a7c88a321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 23 Jan 2015 11:36:18 +0100 Subject: [PATCH 14/20] Graph: Fix for all series tooltip showing series with all null values when Hide Empty option is enabled, Fixes #1359 --- CHANGELOG.md | 1 + src/app/features/templating/templateValuesSrv.js | 2 +- src/app/panels/graph/graph.tooltip.js | 2 +- src/test/specs/graph-tooltip-specs.js | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 230ff061e8d..a6ccfc84ac2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - [Issue #1345](https://github.com/grafana/grafana/issues/1345). UI: Fixed position of confirm modal when scrolled down - [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax) - [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ',' +- [Issue #1359](https://github.com/grafana/grafana/issues/1359). Graph: Fix for all series tooltip showing series with all null values when ``Hide Empty`` option is enabled **Tech** - [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2 diff --git a/src/app/features/templating/templateValuesSrv.js b/src/app/features/templating/templateValuesSrv.js index 0add3fc5df9..baff0a840b8 100644 --- a/src/app/features/templating/templateValuesSrv.js +++ b/src/app/features/templating/templateValuesSrv.js @@ -82,7 +82,7 @@ function (angular, _, kbn) { this._updateNonQueryVariable = function(variable) { // extract options in comma seperated string variable.options = _.map(variable.query.split(/[,]+/), function(text) { - return { text: text, value: text }; + return { text: text.trim(), value: text.trim() }; }); if (variable.type === 'interval') { diff --git a/src/app/panels/graph/graph.tooltip.js b/src/app/panels/graph/graph.tooltip.js index 67d6c601104..9e0ff0b8c7b 100644 --- a/src/app/panels/graph/graph.tooltip.js +++ b/src/app/panels/graph/graph.tooltip.js @@ -71,7 +71,7 @@ function ($) { for (i = 0; i < seriesList.length; i++) { series = seriesList[i]; - if (!series.data.length) { + if (!series.data.length || (scope.panel.legend.hideEmpty && series.allIsNull)) { results.push({ hidden: true }); continue; } diff --git a/src/test/specs/graph-tooltip-specs.js b/src/test/specs/graph-tooltip-specs.js index b7def74ac89..16b4211921f 100644 --- a/src/test/specs/graph-tooltip-specs.js +++ b/src/test/specs/graph-tooltip-specs.js @@ -19,6 +19,8 @@ define([ tooltip: { shared: true }, + legend: { + }, stack: false }; From b940f4a97d7a849371bfb5345c1e8617140f26c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 25 Jan 2015 13:45:08 +0100 Subject: [PATCH 15/20] Timepicker: New option in timepicker (under dashboard settings), to change now to be for example now-1m, usefull when you want to ignore last minute because it contains incomplete data, Closes #1242, Closes #374 --- CHANGELOG.md | 1 + src/app/features/dashboard/timeSrv.js | 1 + src/app/features/influxdb/datasource.js | 11 +--- src/app/panels/timepicker/editor.html | 58 +++++++++++++++------ src/app/panels/timepicker/module.js | 14 +++-- src/test/specs/graph-tooltip-specs.js | 3 +- src/test/specs/influxdb-datasource-specs.js | 6 +-- 7 files changed, 61 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6ccfc84ac2..d56edad01a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ **New features** - [Issue #1331](https://github.com/grafana/grafana/issues/1331). Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views +- [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change ``now`` to be for example ``now-1m``, usefull when you want to ignore last minute because it contains incomplete data **Enhancements** - [Issue #1297](https://github.com/grafana/grafana/issues/1297). Graphite: Added cumulative and minimumBelow graphite functions diff --git a/src/app/features/dashboard/timeSrv.js b/src/app/features/dashboard/timeSrv.js index 564f30de7fd..e2f9f313d1e 100644 --- a/src/app/features/dashboard/timeSrv.js +++ b/src/app/features/dashboard/timeSrv.js @@ -112,6 +112,7 @@ define([ if(_.isUndefined(_t) || _.isUndefined(_t.from)) { return false; } + if(parse === false) { return { from: _t.from, diff --git a/src/app/features/influxdb/datasource.js b/src/app/features/influxdb/datasource.js index cef933d8d42..e1acd1632e7 100644 --- a/src/app/features/influxdb/datasource.js +++ b/src/app/features/influxdb/datasource.js @@ -374,7 +374,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { var fromIsAbsolute = from[from.length-1] === 's'; if (until === 'now()' && !fromIsAbsolute) { - return 'time > now() - ' + from; + return 'time > ' + from; } return 'time > ' + from + ' and time < ' + until; @@ -382,14 +382,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { function getInfluxTime(date) { if (_.isString(date)) { - if (date === 'now') { - return 'now()'; - } - else if (date.indexOf('now') >= 0) { - return date.substring(4); - } - - date = kbn.parseDate(date); + return date.replace('now', 'now()'); } return to_utc_epoch_seconds(date); diff --git a/src/app/panels/timepicker/editor.html b/src/app/panels/timepicker/editor.html index fc51d35ad9f..b6073c64998 100644 --- a/src/app/panels/timepicker/editor.html +++ b/src/app/panels/timepicker/editor.html @@ -1,18 +1,44 @@
    -
    -
    - - -
    -
    - - -
    +
    +
    +
      +
    • + Relative time options +
      • +
    • + +
      • +
    • + Until +
      • +
    • + now- +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + Auto-refresh options +
      • +
    • + +
      • +
    +
    +
    -

    -
    - - For these changes to fully take effect save and reload the dashboard. -     -

    -
    +

    +
    + + For these changes to fully take effect save and reload the dashboard. +     +

    +
    diff --git a/src/app/panels/timepicker/module.js b/src/app/panels/timepicker/module.js index eca4936ad00..2f0d9bd75b8 100644 --- a/src/app/panels/timepicker/module.js +++ b/src/app/panels/timepicker/module.js @@ -58,10 +58,14 @@ function (angular, app, _, moment, kbn) { $scope.init = function() { var time = timeSrv.timeRange(true); - if(time) { - $scope.panel.now = timeSrv.timeRange(false).to === "now" ? true : false; - $scope.time = getScopeTimeObj(time.from,time.to); + $scope.panel.now = false; + + var unparsed = timeSrv.timeRange(false); + if (_.isString(unparsed.to) && unparsed.to.indexOf('now') === 0) { + $scope.panel.now = true; } + + $scope.time = getScopeTimeObj(time.from, time.to); }; $scope.customTime = function() { @@ -142,6 +146,10 @@ function (angular, app, _, moment, kbn) { to: "now" }; + if ($scope.panel.nowDelay) { + _filter.to = 'now-' + $scope.panel.nowDelay; + } + timeSrv.setTime(_filter); $scope.time = getScopeTimeObj(kbn.parseDate(_filter.from),new Date()); diff --git a/src/test/specs/graph-tooltip-specs.js b/src/test/specs/graph-tooltip-specs.js index 16b4211921f..155469f18a7 100644 --- a/src/test/specs/graph-tooltip-specs.js +++ b/src/test/specs/graph-tooltip-specs.js @@ -19,8 +19,7 @@ define([ tooltip: { shared: true }, - legend: { - }, + legend: { }, stack: false }; diff --git a/src/test/specs/influxdb-datasource-specs.js b/src/test/specs/influxdb-datasource-specs.js index f8b545e7db2..028423ac1f4 100644 --- a/src/test/specs/influxdb-datasource-specs.js +++ b/src/test/specs/influxdb-datasource-specs.js @@ -17,7 +17,7 @@ define([ describe('When querying influxdb with one target using query editor target spec', function() { var results; var urlExpected = "/series?p=mupp&q=select+mean(value)+from+%22test%22"+ - "+where+time+%3E+now()+-+1h+group+by+time(1s)+order+asc"; + "+where+time+%3E+now()-1h+group+by+time(1s)+order+asc"; var query = { range: { from: 'now-1h', to: 'now' }, targets: [{ series: 'test', column: 'value', function: 'mean' }], @@ -50,7 +50,7 @@ define([ describe('When querying influxdb with one raw query', function() { var results; var urlExpected = "/series?p=mupp&q=select+value+from+series"+ - "+where+time+%3E+now()+-+1h"; + "+where+time+%3E+now()-1h"; var query = { range: { from: 'now-1h', to: 'now' }, targets: [{ query: "select value from series where $timeFilter", rawQuery: true }] @@ -73,7 +73,7 @@ define([ describe('When issuing annotation query', function() { var results; var urlExpected = "/series?p=mupp&q=select+title+from+events.backend_01"+ - "+where+time+%3E+now()+-+1h"; + "+where+time+%3E+now()-1h"; var range = { from: 'now-1h', to: 'now' }; var annotation = { query: 'select title from events.$server where $timeFilter' }; From 6fc451da9e0b55547f4f04b5d5de2b2202ad3856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 25 Jan 2015 14:51:51 +0100 Subject: [PATCH 16/20] Small fix --- src/app/panels/timepicker/editor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/panels/timepicker/editor.html b/src/app/panels/timepicker/editor.html index b6073c64998..8771bcadb20 100644 --- a/src/app/panels/timepicker/editor.html +++ b/src/app/panels/timepicker/editor.html @@ -16,7 +16,7 @@ now-
  • -
    • From 1c8ef716a2df95d1166e9cd6402abf8632e1d054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 26 Jan 2015 10:57:08 +0100 Subject: [PATCH 17/20] Began work on time overrides for panels, to enable different time periods on the same dashboard, #171 --- .../dashboard/partials/panelTime.html | 43 +++++++++++++++++++ src/app/features/dashboard/timeSrv.js | 14 ++++-- src/app/panels/graph/module.html | 4 ++ src/app/panels/graph/module.js | 23 ++++++++++ src/css/less/graph.less | 13 +++++- src/css/less/panel.less | 4 +- 6 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 src/app/features/dashboard/partials/panelTime.html diff --git a/src/app/features/dashboard/partials/panelTime.html b/src/app/features/dashboard/partials/panelTime.html new file mode 100644 index 00000000000..7b8b507a2ae --- /dev/null +++ b/src/app/features/dashboard/partials/panelTime.html @@ -0,0 +1,43 @@ +
    +
    +
    +
      +
    • + +
      • +
    • + Override relative time +
      • +
    • + Last +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + +
      • +
    • + Add time shift +
      • +
    • + Amount +
      • +
    • + +
      • +
    +
    +
    +
    +
    + diff --git a/src/app/features/dashboard/timeSrv.js b/src/app/features/dashboard/timeSrv.js index e2f9f313d1e..0d8dc31567b 100644 --- a/src/app/features/dashboard/timeSrv.js +++ b/src/app/features/dashboard/timeSrv.js @@ -19,12 +19,23 @@ define([ this.time = dashboard.time; this._initTimeFromUrl(); + this._parseTime(); if(this.dashboard.refresh) { this.set_interval(this.dashboard.refresh); } }; + this._parseTime = function() { + // when absolute time is saved in json it is turned to a string + if (_.isString(this.time.from) && this.time.from.indexOf('Z') >= 0) { + this.time.from = new Date(this.time.from); + } + if (_.isString(this.time.to) && this.time.to.indexOf('Z') >= 0) { + this.time.to = new Date(this.time.to); + } + }; + this._parseUrlParam = function(value) { if (value.indexOf('now') !== -1) { return value; @@ -109,9 +120,6 @@ define([ this.timeRange = function(parse) { var _t = this.time; - if(_.isUndefined(_t) || _.isUndefined(_t.from)) { - return false; - } if(parse === false) { return { diff --git a/src/app/panels/graph/module.html b/src/app/panels/graph/module.html index fa205e488a6..20896fc5c83 100644 --- a/src/app/panels/graph/module.html +++ b/src/app/panels/graph/module.html @@ -3,6 +3,10 @@
    + + {{panelMeta.timeInfo}} + +
    No datapoints No datapoints returned from metric query diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js index 7fde36b475f..eac410360ad 100644 --- a/src/app/panels/graph/module.js +++ b/src/app/panels/graph/module.js @@ -26,6 +26,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { $scope.panelMeta.addEditorTab('Axes & Grid', 'app/panels/graph/axisEditor.html'); $scope.panelMeta.addEditorTab('Display Styles', 'app/panels/graph/styleEditor.html'); + $scope.panelMeta.addEditorTab('Time range', 'app/features/dashboard/partials/panelTime.html'); $scope.panelMeta.addExtendedMenuItem('Export CSV', '', 'exportCsv()'); $scope.panelMeta.addExtendedMenuItem('Toggle legend', '', 'toggleLegend()'); @@ -88,6 +89,9 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { value_type: 'cumulative', shared: false, }, + // time overrides + timeFrom: null, + timeShift: null, // metric queries targets: [{}], // series color overrides @@ -114,6 +118,25 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { $scope.updateTimeRange = function () { $scope.range = timeSrv.timeRange(); $scope.rangeUnparsed = timeSrv.timeRange(false); + + $scope.panelMeta.timeInfo = ""; + + // check panel time overrrides + if ($scope.panel.timeFrom) { + if (_.isString($scope.rangeUnparsed.from)) { + $scope.panelMeta.timeInfo = "Last " + $scope.panel.timeFrom; + $scope.rangeUnparsed.from = 'now-' + $scope.panel.timeFrom; + $scope.range.from = kbn.parseDate($scope.rangeUnparsed.from); + } + } + // if ($scope.panel.timeShift) { + // // from: now-1h + // // to: now + // // timeshift: 1d + // // from: now-1d-1h + // // to: now-1d + // } + if ($scope.panel.maxDataPoints) { $scope.resolution = $scope.panel.maxDataPoints; } diff --git a/src/css/less/graph.less b/src/css/less/graph.less index 5ad38283689..46263a43988 100644 --- a/src/css/less/graph.less +++ b/src/css/less/graph.less @@ -141,7 +141,7 @@ vertical-align: top; position: relative; left: 4px; - top: -20px; + top: -25px; } .graph-legend { @@ -260,7 +260,6 @@ transform-origin: right top; } - .axisLabel { color: @textColor; font-size: @fontSizeSmall; @@ -269,3 +268,13 @@ font-size: 12px; } +.graph-time-info { + font-weight: bold; + float: right; + margin-right: 15px; + color: @blue; + font-size: 85%; + position: relative; + top: -20px; +} + diff --git a/src/css/less/panel.less b/src/css/less/panel.less index 7a9a8aba4ff..451431b9d76 100644 --- a/src/css/less/panel.less +++ b/src/css/less/panel.less @@ -49,8 +49,8 @@ .panel-loading { position:absolute; - top: 0px; - right: 4px; + top: -3px; + right: 0px; z-index: 800; } From ea5da627af111cc74c3c21a27233bdbe35cdf2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 26 Jan 2015 11:49:18 +0100 Subject: [PATCH 18/20] Panel: Different time periods, panels can override dashboard relative time and/or add a time shift, #171, only works for graph panel for now, need feedback for how to do it for singlestat panel --- CHANGELOG.md | 1 + src/app/panels/graph/module.js | 17 +++++++++-------- src/test/specs/kbn-format-specs.js | 11 +++++++++++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d56edad01a1..5d5721604c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ **New features** - [Issue #1331](https://github.com/grafana/grafana/issues/1331). Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views - [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change ``now`` to be for example ``now-1m``, usefull when you want to ignore last minute because it contains incomplete data +- [Issue #171](https://github.com/grafana/grafana/issues/171). Panel: Different time periods, panels can override dashboard relative time and/or add a time shift **Enhancements** - [Issue #1297](https://github.com/grafana/grafana/issues/1297). Graphite: Added cumulative and minimumBelow graphite functions diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js index eac410360ad..56a15a7b72e 100644 --- a/src/app/panels/graph/module.js +++ b/src/app/panels/graph/module.js @@ -124,18 +124,19 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { // check panel time overrrides if ($scope.panel.timeFrom) { if (_.isString($scope.rangeUnparsed.from)) { - $scope.panelMeta.timeInfo = "Last " + $scope.panel.timeFrom; + $scope.panelMeta.timeInfo = "last " + $scope.panel.timeFrom; $scope.rangeUnparsed.from = 'now-' + $scope.panel.timeFrom; $scope.range.from = kbn.parseDate($scope.rangeUnparsed.from); } } - // if ($scope.panel.timeShift) { - // // from: now-1h - // // to: now - // // timeshift: 1d - // // from: now-1d-1h - // // to: now-1d - // } + + if ($scope.panel.timeShift) { + var timeShift = '-' + $scope.panel.timeShift; + $scope.panelMeta.timeInfo += ' timeshift ' + timeShift; + $scope.range.from = kbn.parseDateMath(timeShift, $scope.range.from); + $scope.range.to = kbn.parseDateMath(timeShift, $scope.range.to); + $scope.rangeUnparsed = $scope.range; + } if ($scope.panel.maxDataPoints) { $scope.resolution = $scope.panel.maxDataPoints; diff --git a/src/test/specs/kbn-format-specs.js b/src/test/specs/kbn-format-specs.js index 785d9376411..7c75e7eca93 100644 --- a/src/test/specs/kbn-format-specs.js +++ b/src/test/specs/kbn-format-specs.js @@ -69,4 +69,15 @@ define([ }); + describe('relative time to date parsing', function() { + it('should handle negative time', function() { + var date = kbn.parseDateMath('-2d', new Date(2014,1,5)); + expect(date.getTime()).to.equal(new Date(2014, 1, 3).getTime()); + }); + it('should handle multiple math expressions', function() { + var date = kbn.parseDateMath('-2d-6h', new Date(2014, 1, 5)); + expect(date.toString()).to.equal(new Date(2014, 1, 2, 18).toString()); + }); + }); + }); From ab7e2f89fb596d6adc9a28177feb97574e860ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 26 Jan 2015 12:57:44 +0100 Subject: [PATCH 19/20] Corrected the use of POST vs PUT, POST creates something, PUT updates, got them mixed up --- src/app/controllers/loginCtrl.js | 2 +- src/app/features/account/accountUsersCtrl.js | 16 +++------------- src/app/features/account/apiKeysCtrl.js | 7 +------ src/app/features/profile/profileCtrl.js | 5 ++--- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/app/controllers/loginCtrl.js b/src/app/controllers/loginCtrl.js index 3f109709167..45d24987ca1 100644 --- a/src/app/controllers/loginCtrl.js +++ b/src/app/controllers/loginCtrl.js @@ -75,7 +75,7 @@ function (angular, config) { return; } - backendSrv.put('/api/user/signup', $scope.formModel).then(function() { + backendSrv.post('/api/user/signup', $scope.formModel).then(function() { window.location.href = config.appSubUrl + '/'; }); }; diff --git a/src/app/features/account/accountUsersCtrl.js b/src/app/features/account/accountUsersCtrl.js index 560b8ff4bc6..65ad8bcf847 100644 --- a/src/app/features/account/accountUsersCtrl.js +++ b/src/app/features/account/accountUsersCtrl.js @@ -24,22 +24,12 @@ function (angular) { }; $scope.removeUser = function(user) { - backendSrv.request({ - method: 'DELETE', - url: '/api/account/users/' + user.userId - }).then($scope.get); + backendSrv.delete('/api/account/users/' + user.userId).then($scope.get); }; $scope.addUser = function() { - if (!$scope.form.$valid) { - return; - } - - backendSrv.request({ - method: 'PUT', - url: '/api/account/users', - data: $scope.user, - }).then($scope.get); + if (!$scope.form.$valid) { return; } + backendSrv.post('/api/account/users', $scope.user).then($scope.get); }; $scope.init(); diff --git a/src/app/features/account/apiKeysCtrl.js b/src/app/features/account/apiKeysCtrl.js index 8878edc3506..64df055dd90 100644 --- a/src/app/features/account/apiKeysCtrl.js +++ b/src/app/features/account/apiKeysCtrl.js @@ -26,12 +26,7 @@ function (angular) { }; $scope.addToken = function() { - backendSrv.request({ - method: 'PUT', - url: '/api/tokens', - data: $scope.token, - desc: 'Add token' - }).then($scope.getTokens); + backendSrv.post('/api/tokens', $scope.token).then($scope.getTokens); }; $scope.init(); diff --git a/src/app/features/profile/profileCtrl.js b/src/app/features/profile/profileCtrl.js index 0a2ea70efe7..b028e48be1d 100644 --- a/src/app/features/profile/profileCtrl.js +++ b/src/app/features/profile/profileCtrl.js @@ -33,12 +33,11 @@ function (angular) { $scope.update = function() { if (!$scope.userForm.$valid) { return; } - - backendSrv.post('/api/user/', $scope.user); + backendSrv.put('/api/user/', $scope.user); }; $scope.createAccount = function() { - backendSrv.put('/api/account/', $scope.newAccount).then($scope.getUserAccounts); + backendSrv.post('/api/account/', $scope.newAccount).then($scope.getUserAccounts); }; $scope.init(); From a6b0856020847b6530b9d1505fe39f347988be57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 26 Jan 2015 15:42:11 +0100 Subject: [PATCH 20/20] Worked on account update view --- src/app/controllers/sidemenuCtrl.js | 2 + src/app/features/account/accountCtrl.js | 29 ++++++ .../features/account/partials/account.html | 26 +++++- src/app/features/account/partials/users.html | 2 +- src/app/features/all.js | 1 + .../features/profile/partials/profile.html | 89 ++++++++++--------- src/app/partials/sidemenu.html | 2 +- src/app/routes/backend/all.js | 1 + src/css/less/p_pro.less | 8 ++ 9 files changed, 112 insertions(+), 48 deletions(-) create mode 100644 src/app/features/account/accountCtrl.js diff --git a/src/app/controllers/sidemenuCtrl.js b/src/app/controllers/sidemenuCtrl.js index 355783653cf..10b73e2458a 100644 --- a/src/app/controllers/sidemenuCtrl.js +++ b/src/app/controllers/sidemenuCtrl.js @@ -33,6 +33,7 @@ function (angular, _, $, config) { text: "Account", href: $scope.getUrl("/account"), icon: "fa fa-shield", links: [ + { text: 'Info', href: $scope.getUrl("/account"), icon: "fa fa-sitemap" }, { text: 'Data sources', href: $scope.getUrl("/account/datasources"), icon: "fa fa-sitemap" }, { text: 'Users', href: $scope.getUrl("/account/users"), icon: "fa fa-users" }, { text: 'API Keys', href: $scope.getUrl("/account/apikeys"), icon: "fa fa-key" }, @@ -42,6 +43,7 @@ function (angular, _, $, config) { text: "Profile", href: $scope.getUrl("/profile"), icon: "fa fa-user", links: [ + { text: 'Info', href: $scope.getUrl("/profile"), icon: "fa fa-sitemap" }, { text: 'Password', href:"", icon: "fa fa-lock" }, ] } diff --git a/src/app/features/account/accountCtrl.js b/src/app/features/account/accountCtrl.js new file mode 100644 index 00000000000..8d4130bda03 --- /dev/null +++ b/src/app/features/account/accountCtrl.js @@ -0,0 +1,29 @@ +define([ + 'angular', +], +function (angular) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('AccountCtrl', function($scope, $http, backendSrv) { + + $scope.init = function() { + $scope.getAccount(); + }; + + $scope.getAccount = function() { + backendSrv.get('/api/account').then(function(account) { + $scope.account = account; + }); + }; + + $scope.update = function() { + if (!$scope.accountForm.$valid) { return; } + backendSrv.put('/api/account', $scope.account).then($scope.getAccount); + }; + + $scope.init(); + + }); +}); diff --git a/src/app/features/account/partials/account.html b/src/app/features/account/partials/account.html index f45138b9736..5465d0c7094 100644 --- a/src/app/features/account/partials/account.html +++ b/src/app/features/account/partials/account.html @@ -5,14 +5,32 @@
    - Account info + Account information
    - -

    TODO

    - +
    +
    +
    +
    +
    +
      +
    • + Account name +
      • +
    • + +
      • +
    +
    +
    +
    +
    + +
    +
    +
    diff --git a/src/app/features/account/partials/users.html b/src/app/features/account/partials/users.html index 9b54b33fea8..819e5ef76ba 100644 --- a/src/app/features/account/partials/users.html +++ b/src/app/features/account/partials/users.html @@ -5,7 +5,7 @@
    - Account users + Users
    diff --git a/src/app/features/all.js b/src/app/features/all.js index 54946bb0fc2..de8e1ac3a32 100644 --- a/src/app/features/all.js +++ b/src/app/features/all.js @@ -12,6 +12,7 @@ define([ './account/datasourcesCtrl', './account/apiKeysCtrl', './account/importCtrl', + './account/accountCtrl', './admin/adminUsersCtrl', './grafanaDatasource/datasource', ], function () {}); diff --git a/src/app/features/profile/partials/profile.html b/src/app/features/profile/partials/profile.html index 2f5df6146ed..800062c8453 100644 --- a/src/app/features/profile/partials/profile.html +++ b/src/app/features/profile/partials/profile.html @@ -7,51 +7,53 @@
    - Your info + Personal information
    +
    +
    +
    +
    +
      +
    • + Name +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + Email +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + Username +
      • +
    • + +
      • +
    +
    +
    +
    - - -
    -
      -
    • - Name -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - Email -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - Username -
      • -
    • - -
      • -
    -
    -
    - -
    - -
    +
    + + +
    @@ -59,7 +61,7 @@
    - Your accounts + Your accounts

    @@ -87,7 +89,7 @@
    - Add account + Add account

    @@ -111,5 +113,8 @@
    + + + diff --git a/src/app/partials/sidemenu.html b/src/app/partials/sidemenu.html index 980ed6b897e..0ba9c642686 100644 --- a/src/app/partials/sidemenu.html +++ b/src/app/partials/sidemenu.html @@ -17,7 +17,7 @@
    • diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js index e52abb47f41..f97ca90ba04 100644 --- a/src/app/routes/backend/all.js +++ b/src/app/routes/backend/all.js @@ -32,6 +32,7 @@ define([ }) .when('/account', { templateUrl: 'app/features/account/partials/account.html', + controller : 'AccountCtrl', }) .when('/account/datasources', { templateUrl: 'app/features/account/partials/datasources.html', diff --git a/src/css/less/p_pro.less b/src/css/less/p_pro.less index b3d65e9acc5..678c2fba064 100644 --- a/src/css/less/p_pro.less +++ b/src/css/less/p_pro.less @@ -1,5 +1,8 @@ .pro-sidemenu { display: none; + a:focus { + text-decoration: none; + } } .pro-sidemenu-open { @@ -50,9 +53,14 @@ display: block; padding: 6px 0 6px 30px; font-size: 15px; + color: @gray; i { padding-right: 15px; } + &.active { + color: white; + font-weight: bold; + } } .sidemenu-user {