diff --git a/src/app/controllers/annotationsEditorCtrl.js b/src/app/controllers/annotationsEditorCtrl.js index ce832eee1d4..13cf4d29087 100644 --- a/src/app/controllers/annotationsEditorCtrl.js +++ b/src/app/controllers/annotationsEditorCtrl.js @@ -63,9 +63,13 @@ function (angular, app, _) { }); module.controller('EditViewCtrl', function($scope) { - //$scope.editPanelSrc = 'app/partials/test.html'; + $scope.editPanelSrc = 'app/partials/dasheditor.html'; $scope.onAppEvent('show-edit-panel', function(evt, payload) { + if (payload.src === $scope.editPanelSrc) { + $scope.dismiss(); + return; + } $scope.editPanelSrc = payload.src; }); diff --git a/src/app/directives/bodyClass.js b/src/app/directives/bodyClass.js index 86ff598d69e..0b1cac65614 100644 --- a/src/app/directives/bodyClass.js +++ b/src/app/directives/bodyClass.js @@ -3,7 +3,7 @@ define([ 'app', 'lodash' ], -function (angular, app, _) { +function (angular) { 'use strict'; angular diff --git a/src/app/directives/configModal.js b/src/app/directives/configModal.js index 6ca19cef435..9e65f6cb07c 100644 --- a/src/app/directives/configModal.js +++ b/src/app/directives/configModal.js @@ -20,7 +20,7 @@ function (angular, _, $) { scope.exitFullscreen(); scope.emitAppEvent('show-edit-panel', {src: partial}); }); - return; + //return; if ($(id).length) { elem.attr('data-target', id).attr('data-toggle', 'modal'); diff --git a/src/app/panels/filtering/editor.html b/src/app/panels/filtering/editor.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/panels/filtering/module.html b/src/app/panels/filtering/module.html deleted file mode 100755 index 40f4379a98d..00000000000 --- a/src/app/panels/filtering/module.html +++ /dev/null @@ -1,48 +0,0 @@ -
- -
- -
- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/panels/filtering/module.js b/src/app/panels/filtering/module.js deleted file mode 100644 index eb89cebafa0..00000000000 --- a/src/app/panels/filtering/module.js +++ /dev/null @@ -1,47 +0,0 @@ -/* - - ## filtering - -*/ -define([ - 'angular', - 'app', - 'lodash' -], -function (angular, app, _) { - 'use strict'; - - var module = angular.module('grafana.panels.filtering', []); - app.useModule(module); - - module.controller('filtering', function($scope, datasourceSrv, $rootScope, $timeout, $q) { - - $scope.panelMeta = { - status : "Stable", - description : "graphite target filters" - }; - - // Set and populate defaults - var _d = { - }; - _.defaults($scope.panel,_d); - - $scope.init = function() { - // empty. Don't know if I need the function then. - }; - - $scope.remove = function(templateParameter) { - $scope.filter.removeTemplateParameter(templateParameter); - }; - - $scope.add = function() { - $scope.filter.addTemplateParameter({ - type : 'filter', - name : 'filter name', - editing : true, - query : 'metric.path.query.*', - }); - }; - - }); -}); diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html index 73b23ed12a4..b528c1e1016 100644 --- a/src/app/partials/dashboard.html +++ b/src/app/partials/dashboard.html @@ -9,7 +9,7 @@
-
+
diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html index 5179893ea75..3169859da01 100644 --- a/src/app/partials/dasheditor.html +++ b/src/app/partials/dasheditor.html @@ -1,108 +1,119 @@ -
-
Dashboard settings
+
+
+ + Dashboard settings +
-
-
-
-
-
-
- -
-
-
-
- -
-
- -
-
- - -
-
- - -
-
-
-
-
-
- - - - Press enter to a add tag -
-
-
-
- -
-
-
-

Rows

- - - - - - - - - - - - - -
Title
{{row.title}}
-
-
-

Add Row

- - - - -
-
-
- -
-
-
-
Feature toggles
-
- -
-
- -
-
+
+
+
+
-
- -
- -
- - -
-
-
-
- - Grafana version: {{grafanaVersion}} - +
+ +
+
+
+
+ +
+
+ +
+
+ + +
+
+ + +
+
+
+
+
+
+ + + + Press enter to a add tag +
+
+
+
+ +
+
+
+

Rows

+ + + + + + + + + + + + + +
Title
{{row.title}}
+
+
+

Add Row

+ + + + +
+ +
+
+
+ +
+
+
+
Feature toggles
+
+ +
+
+ +
+
+
+
+ +
+ +
+ +
+ + +
+ +
+ +
+
+ +
+
+ + Grafana version: {{grafanaVersion}} + | enable console disable console -
-
-
+
+
+
- - +
diff --git a/src/app/partials/import.html b/src/app/partials/import.html index eeb481e9bdf..f81468465d4 100644 --- a/src/app/partials/import.html +++ b/src/app/partials/import.html @@ -1,4 +1,4 @@ -
+
Import dashboards from graphite web
@@ -12,7 +12,7 @@
- +
diff --git a/src/app/partials/templating_editor.html b/src/app/partials/templating_editor.html index 0282ea26ade..878c017fd84 100644 --- a/src/app/partials/templating_editor.html +++ b/src/app/partials/templating_editor.html @@ -1,15 +1,51 @@ -
-
-
Templating
+
+
+ + Dashboard settings +
-
+
+
+
+
+ +
+ +
+ +
+
+
+
+ +
+
+ +
+
+ + +
+
+ + +
+
+
+
+
+
+ + + + Press enter to a add tag +
+
+
-
- -
- - - -
+
+ +
+
diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less index eb37314ae7d..5a484bb1753 100644 --- a/src/css/less/bootswatch.dark.less +++ b/src/css/less/bootswatch.dark.less @@ -221,8 +221,9 @@ div.subnav { li > a:hover, li.active > a, li.active > a:hover { - border-color: transparent; - background-color: @blue; + border-color: transparent; + background-color: transparent; + border-bottom: 1px solid @blueDark; color: @white; } diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 77381a4ebf5..5aba7086ae6 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -203,15 +203,23 @@ margin: 0; background: @fullEditTabsBackground; border-top: 1px solid @fullEditTabsBorder; + border-bottom: 1px solid @fullEditTabsBorder } .tab-content { display: none; } } + .tab-content { overflow: visible; padding: 15px; + background-color: @grafanaPanelBackground; + border-top: 1px solid @fullEditBorder; + } + + .nav-tabs > li { + margin-bottom: 0; } .nav-tabs > li > a { @@ -546,3 +554,43 @@ select.grafana-target-segment-input { max-width: 400px; } +.dashboard-edit-view { + padding: 20px; + background-color: @grafanaPanelBackground; +} + +.dashboard-editor-body { + padding: 20px 10px; + min-height: 100px; + overflow: hidden; +} +.dashboard-editor-footer { + overflow: hidden; +} + +.dashboard-editor-header { + overflow: hidden; + border-bottom: 1px solid @fullEditBorder; + .tabs { + float: left; + } + + .nav { + margin: 0; + } +} + +.dashboard-editor-title { + padding-right: 20px; + float: left; + color: @linkColor; + font-size: 20px; + font-weight: normal; + line-height: 34px; + margin: 0; + .icon { + padding: 0 8px 0 5px; + color: @textColor; + } +} + diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less index 3397ceed020..429fecb27b2 100644 --- a/src/css/less/variables.dark.less +++ b/src/css/less/variables.dark.less @@ -35,9 +35,9 @@ // Tabs @fullEditTabsBackground: @grayDark; -@fullEditBorder: @black; +@fullEditBorder: #555; @fullEditBackground: transparent; -@fullEditTabsBorder: #555; +@fullEditTabsBorder: @black; // Graphite Target Editor @grafanaTargetBorder: @black; @@ -134,12 +134,10 @@ @btnInverseBackgroundHighlight: darken(@black, 5%); - - // Forms // ------------------------- -@inputBackground: lighten(@grayDark,10%); -@inputBorder: lighten(@grayDark,20%); +@inputBackground: lighten(@grayDark,0%); +@inputBorder: lighten(@grayDark,5%); @inputBorderRadius: @baseBorderRadius; @inputDisabledBackground: #555; @formActionsBackground: transparent;