diff --git a/src/app/controllers/submenuCtrl.js b/src/app/controllers/submenuCtrl.js index 5befa5d3a8c..13e10cbe852 100644 --- a/src/app/controllers/submenuCtrl.js +++ b/src/app/controllers/submenuCtrl.js @@ -8,7 +8,7 @@ function (angular, app, _) { var module = angular.module('grafana.controllers'); - module.controller('SubmenuCtrl', function($scope, $q, datasourceSrv) { + module.controller('SubmenuCtrl', function($scope, $q, $rootScope, datasourceSrv) { var _d = { enable: true }; @@ -77,6 +77,11 @@ function (angular, app, _) { }); }; + $scope.disableAnnotation = function (annotation) { + annotation.enable = !annotation.enable; + $rootScope.$broadcast('refresh'); + }; + $scope.init(); }); diff --git a/src/app/panels/annotations/editor.js b/src/app/panels/annotations/editor.js deleted file mode 100644 index 535857418fa..00000000000 --- a/src/app/panels/annotations/editor.js +++ /dev/null @@ -1,63 +0,0 @@ -/* - -*/ -define([ - 'angular', - 'app', - 'lodash' -], -function (angular, app, _) { - 'use strict'; - - var module = angular.module('grafana.panels.annotations', []); - app.useModule(module); - - module.controller('AnnotationsEditorCtrl', function($scope, datasourceSrv) { - - var annotationDefaults = { - name: '', - datasource: null, - showLine: true, - iconColor: '#C0C6BE', - lineColor: 'rgba(255, 96, 96, 0.592157)', - iconSize: 13, - enable: true - }; - - $scope.init = function() { - $scope.currentAnnotation = angular.copy(annotationDefaults); - $scope.currentIsNew = true; - $scope.datasources = datasourceSrv.getAnnotationSources(); - - if ($scope.datasources.length > 0) { - $scope.currentDatasource = $scope.datasources[0]; - } - }; - - $scope.setDatasource = function() { - $scope.currentAnnotation.datasource = $scope.currentDatasource.name; - }; - - $scope.edit = function(annotation) { - $scope.currentAnnotation = annotation; - $scope.currentIsNew = false; - $scope.currentDatasource = _.findWhere($scope.datasources, { name: annotation.datasource }); - - if (!$scope.currentDatasource) { - $scope.currentDatasource = $scope.datasources[0]; - } - }; - - $scope.update = function() { - $scope.currentAnnotation = angular.copy(annotationDefaults); - $scope.currentIsNew = true; - }; - - $scope.add = function() { - $scope.currentAnnotation.datasource = $scope.currentDatasource.name; - $scope.panel.annotations.push($scope.currentAnnotation); - $scope.currentAnnotation = angular.copy(annotationDefaults); - }; - - }); -}); diff --git a/src/app/panels/annotations/module.html b/src/app/panels/annotations/module.html deleted file mode 100644 index 0441ed1f883..00000000000 --- a/src/app/panels/annotations/module.html +++ /dev/null @@ -1,12 +0,0 @@ -
- -
- - {{annotation.name}} -
- -
- -
- -
\ No newline at end of file diff --git a/src/app/panels/annotations/module.js b/src/app/panels/annotations/module.js deleted file mode 100644 index fe55e27303c..00000000000 --- a/src/app/panels/annotations/module.js +++ /dev/null @@ -1,39 +0,0 @@ -/* - - ## annotations - -*/ -define([ - 'angular', - 'app', - 'lodash', - './editor' -], -function (angular, app, _) { - 'use strict'; - - var module = angular.module('grafana.panels.annotations', []); - app.useModule(module); - - module.controller('AnnotationsCtrl', function($scope, datasourceSrv, $rootScope) { - - $scope.panelMeta = { - status : "Stable", - description : "Annotations" - }; - - // Set and populate defaults - var _d = { - annotations: [] - }; - - _.defaults($scope.panel, _d); - - $scope.hide = function (annotation) { - annotation.enable = !annotation.enable; - $rootScope.$broadcast('refresh'); - }; - - }); - -}); diff --git a/src/app/panels/timepicker/custom.html b/src/app/panels/timepicker/custom.html index 0784cf987e0..5497d0b6549 100644 --- a/src/app/panels/timepicker/custom.html +++ b/src/app/panels/timepicker/custom.html @@ -1,78 +1,84 @@ -
- + .timepicker-input input::-webkit-outer-spin-button, + .timepicker-input input::-webkit-inner-spin-button { + -webkit-appearance: none; + margin: 0; + } -
-
+ input.timepicker-date { + width: 90px; + } + input.timepicker-hms { + width: 20px; + } + input.timepicker-ms { + width: 25px; + } + div.timepicker-now { + float: right; + } + -
- -
- @ - : - : - . - -
-
+
+ -
+
+ +
+ @ + : + : + . + +
+
- +
-
-
- @ - : - : - . - -
-   Right Now -
-
+ - -
-
-
+
+
+ @ + : + : + . + +
+   Right Now +
+
-
-
- Invalid date or range - - +
+
+
+
- - +
+
+ Invalid date or range + + +
+
diff --git a/src/app/panels/timepicker/module.js b/src/app/panels/timepicker/module.js index f00ad5f7a87..ae6d382e34d 100644 --- a/src/app/panels/timepicker/module.js +++ b/src/app/panels/timepicker/module.js @@ -65,20 +65,10 @@ function (angular, app, _, moment, kbn) { }; $scope.customTime = function() { - if (!customTimeModal) { - customTimeModal = $modal({ - template: './app/panels/timepicker/custom.html', - persist: true, - show: false, - scope: $scope, - keyboard: false - }); - } - // Assume the form is valid since we're setting it to something valid $scope.input.$setValidity("dummy", true); $scope.temptime = cloneTime($scope.time); - $scope.tempnow = $scope.panel.now; + $scope.temptime.now = $scope.panel.now; $scope.temptime.from.date.setHours(0,0,0,0); $scope.temptime.to.date.setHours(0,0,0,0); @@ -89,9 +79,7 @@ function (angular, app, _, moment, kbn) { $scope.temptime.to.date = moment($scope.temptime.to.date).add('days',1).toDate(); } - $q.when(customTimeModal).then(function(modalEl) { - modalEl.modal('show'); - }); + $scope.emitAppEvent('show-dash-editor', {src: 'app/panels/timepicker/custom.html', scope: $scope }); }; // Constantly validate the input of the fields. This function does not change any date variables @@ -118,7 +106,7 @@ function (angular, app, _, moment, kbn) { return false; } - return {from:_from,to:_to}; + return { from: _from, to:_to, now: time.now}; }; $scope.setNow = function() { @@ -135,7 +123,7 @@ function (angular, app, _, moment, kbn) { // Create filter object var _filter = _.clone(time); - if($scope.tempnow) { + if(time.now) { _filter.to = "now"; } diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html index 2929b9abc12..6ed1552db15 100644 --- a/src/app/partials/submenu.html +++ b/src/app/partials/submenu.html @@ -37,7 +37,7 @@
  • - {{annotation.name}} + {{annotation.name}}