Merge branch 'master' into panel_edit_menu_poc

CHANGELOG.md

@@ -8,6 +8,7 @@
 - [Issue #846](https://github.com/grafana/grafana/issues/846). Edit panes: Issue when open row or json editor when scrolled down the page, unable to scroll and you did not see editor
 - [Issue #840](https://github.com/grafana/grafana/issues/840). Import: Fixes to import from json file and import from graphite. Issues was lingering state from previous dashboard.
 - [Issue #859](https://github.com/grafana/grafana/issues/859). InfluxDB: Fix for bug when saving dashboard where title is the same as slugified url id
+- [Issue #852](https://github.com/grafana/grafana/issues/852). White theme: Fixes for hidden series legend text and disabled annotations color
 
 # 1.8.0 (2014-09-22)
 

src/app/controllers/dashboardNavCtrl.js

@@ -93,7 +93,7 @@ function (angular, _, moment, config, store) {
     };
 
     $scope.deleteDashboard = function(evt, options) {
-      if (!confirm('Are you sure you want to delete dashboard?')) {
+      if (!confirm('Do you want to delete dashboard ' + options.title + ' ?')) {
         return;
       }
 

src/app/controllers/search.js

@@ -121,7 +121,7 @@ function (angular, _, config, $) {
 
     $scope.deleteDashboard = function(dash, evt) {
       evt.stopPropagation();
-      $scope.emitAppEvent('delete-dashboard', { id: dash.id });
+      $scope.emitAppEvent('delete-dashboard', { id: dash.id, title: dash.title });
       $scope.results.dashboards = _.without($scope.results.dashboards, dash);
     };
 

src/app/partials/graphite/editor.html

@@ -76,6 +76,7 @@
 </div>
 
 <section class="grafana-metric-options">
+	<div class="grafana-target">
 		<div class="grafana-target-inner">
 			<ul class="grafana-segment-list">
 				<li class="grafana-target-segment grafana-target-segment-icon">
@@ -125,6 +126,7 @@
 			<div class="clearfix"></div>
 		</div>
 	</div>
+ </div>
 </section>
 
 <div class="editor-row">

src/app/partials/submenu.html

@@ -17,9 +17,6 @@
 				</ul>
 
 				<ul class="grafana-segment-list" ng-if="dashboard.templating.enable">
-					<li class="small grafana-target-segment">
-						<strong>VARIABLES</strong>
-					</li>
 					<li ng-repeat-start="variable in variables" class="grafana-target-segment template-param-name">
 						<span class="template-variable ">
 						${{variable.name}}:
@@ -31,10 +28,6 @@
 				</ul>
 
 				<ul class="grafana-segment-list" ng-if="dashboard.annotations.enable">
-					<li class="small grafana-target-segment">
-						<strong>ANNOTATIONS</strong>
-					</li>
-
 					<li ng-repeat="annotation in dashboard.annotations.list" class="grafana-target-segment annotation-segment" ng-class="{'annotation-disabled': !annotation.enable}">
 						<a ng-click="disableAnnotation(annotation)">
 							<i class="annotation-color-icon icon-bolt"></i>

src/css/less/graph.less

@@ -124,7 +124,7 @@
 
 .graph-legend-series-hidden {
   a {
-    color: darken(@linkColor, 45%);
+    color: @linkColorDisabled;
   }
 }
 

src/css/less/submenu.less

@@ -5,6 +5,6 @@
 }
 
 .annotation-disabled, .annotation-disabled a {
-  color: darken(@textColor, 25%);
+  color: @linkColorDisabled;
 }
 

src/css/less/variables.dark.less

@@ -52,6 +52,7 @@
 // Links
 // -------------------------
 @linkColor:             darken(@white,11%);
+@linkColorDisabled:     darken(@linkColor,45%);
 @linkColorHover:        @white;
 
 

src/css/less/variables.light.less

@@ -54,12 +54,13 @@
 // Scaffolding
 // -------------------------
 @bodyBackground:        @grayLighter;
-@textColor:             #555;
+@textColor:             #666;
 
 
 // Links
 // -------------------------
 @linkColor:             @textColor;
+@linkColorDisabled:     lighten(@linkColor,35%);
 @linkColorHover:        @blue;