From 142f081d1e9ec4f13b0fb0ce7e47498663bcd2ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 Aug 2014 21:31:43 +0200 Subject: [PATCH 1/2] fixed small issue with the recent change to the 'none' axis format, Closes #703 --- src/app/components/kbn.js | 2 +- src/app/partials/dashLoader.html | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js index 566a2edcde7..7f280cc99d6 100644 --- a/src/app/components/kbn.js +++ b/src/app/components/kbn.js @@ -526,7 +526,7 @@ function($, _, moment) { }; default: return function(val, axis) { - return kbn.noneFormat(val, axis ? axis.tickDecimals : decimals); + return kbn.noneFormat(val, axis ? axis.tickDecimals : null); }; } }; diff --git a/src/app/partials/dashLoader.html b/src/app/partials/dashLoader.html index cfa74c66af0..7e36c0b3741 100644 --- a/src/app/partials/dashLoader.html +++ b/src/app/partials/dashLoader.html @@ -1,9 +1,3 @@ - -
  • Back to dashboard From 5846c7109516aa4ca84aa48d87814d032f5f63f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 16 Aug 2014 08:55:05 +0200 Subject: [PATCH 2/2] Changed name of some partials and controllers --- src/app/controllers/all.js | 4 +- .../controllers/{dash.js => dashboardCtrl.js} | 2 +- .../{dashLoader.js => dashboardNavCtrl.js} | 2 +- src/app/partials/dashLoader.html | 65 ---------------- src/app/partials/dashboard.html | 15 +--- src/app/partials/dashboard_topnav.html | 77 +++++++++++++++++++ 6 files changed, 85 insertions(+), 80 deletions(-) rename src/app/controllers/{dash.js => dashboardCtrl.js} (98%) rename src/app/controllers/{dashLoader.js => dashboardNavCtrl.js} (97%) delete mode 100644 src/app/partials/dashLoader.html create mode 100644 src/app/partials/dashboard_topnav.html diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js index d3de182589d..3565f9fa844 100644 --- a/src/app/controllers/all.js +++ b/src/app/controllers/all.js @@ -1,7 +1,7 @@ define([ './grafanaCtrl', - './dash', - './dashLoader', + './dashboardCtrl', + './dashboardNavCtrl', './row', './submenuCtrl', './pulldown', diff --git a/src/app/controllers/dash.js b/src/app/controllers/dashboardCtrl.js similarity index 98% rename from src/app/controllers/dash.js rename to src/app/controllers/dashboardCtrl.js index a4022f1ca7e..5620b7305a2 100644 --- a/src/app/controllers/dash.js +++ b/src/app/controllers/dashboardCtrl.js @@ -10,7 +10,7 @@ function (angular, $, config, _) { var module = angular.module('grafana.controllers'); - module.controller('DashCtrl', function( + module.controller('DashboardCtrl', function( $scope, $rootScope, dashboardKeybindings, filterSrv, dashboardSrv, dashboardViewStateSrv, panelMoveSrv, timer) { diff --git a/src/app/controllers/dashLoader.js b/src/app/controllers/dashboardNavCtrl.js similarity index 97% rename from src/app/controllers/dashLoader.js rename to src/app/controllers/dashboardNavCtrl.js index 9f036b87fa0..cbcc74ae13e 100644 --- a/src/app/controllers/dashLoader.js +++ b/src/app/controllers/dashboardNavCtrl.js @@ -10,7 +10,7 @@ function (angular, _, moment, config) { var module = angular.module('grafana.controllers'); - module.controller('dashLoader', function($scope, $rootScope, $http, alertSrv, $location, playlistSrv, datasourceSrv) { + module.controller('DashboardNavCtrl', function($scope, $rootScope, alertSrv, $location, playlistSrv, datasourceSrv) { $scope.init = function() { $scope.db = datasourceSrv.getGrafanaDB(); diff --git a/src/app/partials/dashLoader.html b/src/app/partials/dashLoader.html deleted file mode 100644 index 7e36c0b3741..00000000000 --- a/src/app/partials/dashLoader.html +++ /dev/null @@ -1,65 +0,0 @@ -
  • - - Back to dashboard - -
    • - -
  • - - Zoom Out - -
    • - -
  • - - -
    • - -
  • - - - - - -
    • - -
  • -
    • - -
    • - -
    • - -
  • - - Stop playlist - -
    • diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html index 265fd640820..368583cb5c5 100644 --- a/src/app/partials/dashboard.html +++ b/src/app/partials/dashboard.html @@ -1,16 +1,9 @@ -
    +
    -
    -
    -
    - {{dashboard.title}} -
      -
    -
    -
    -
    +
    +
    -
    +
    {{pulldown.type}}: diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html new file mode 100644 index 00000000000..b49e528ffff --- /dev/null +++ b/src/app/partials/dashboard_topnav.html @@ -0,0 +1,77 @@ +
    +
    +
    + {{dashboard.title}} + +
    +
    +
    +