Small update to submenu (annotation/templating) css, #1554

src/app/features/dashboard/sharePanelCtrl.js

@@ -88,7 +88,7 @@ function (angular, _, require, config) {
     return function(scope, elem) {
     return function(scope, elem) {
       require(['ZeroClipboard'], function(ZeroClipboard) {
       require(['ZeroClipboard'], function(ZeroClipboard) {
         ZeroClipboard.config({
         ZeroClipboard.config({
-          swfPath: config.appSubUrl + 'public/vendor/ZeroClipboard.swf'
+          swfPath: config.appSubUrl + '/public/vendor/ZeroClipboard.swf'
         });
         });
         new ZeroClipboard(elem[0]);
         new ZeroClipboard(elem[0]);
       });
       });

src/app/partials/dashboard.html

@@ -3,14 +3,14 @@
 	<div ng-include="'app/partials/dashboard_topnav.html'">
 	<div ng-include="'app/partials/dashboard_topnav.html'">
 	</div>
 	</div>
 
 
-	<div ng-if="submenuEnabled" ng-include="'app/partials/submenu.html'">
-  </div>
-
-  <div class="clearfix"></div>
 
 
 	<div dash-editor-view></div>
 	<div dash-editor-view></div>
 	<div dash-search-view></div>
 	<div dash-search-view></div>
 
 
+	<div ng-if="submenuEnabled" ng-include="'app/partials/submenu.html'">
+  </div>
+	<div class="clearfix"></div>
+
 	<div class="main-view-container">
 	<div class="main-view-container">
 		<div class="grafana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.rows" row-height>
 		<div class="grafana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.rows" row-height>
 			<div class="row-control">
 			<div class="row-control">

src/app/partials/submenu.html

@@ -25,8 +25,9 @@
 			</li>
 			</li>
 			<li ng-repeat="annotation in dashboard.annotations.list" class="tight-form-item annotation-segment" ng-class="{'annotation-disabled': !annotation.enable}">
 			<li ng-repeat="annotation in dashboard.annotations.list" class="tight-form-item annotation-segment" ng-class="{'annotation-disabled': !annotation.enable}">
 				<a ng-click="disableAnnotation(annotation)">
 				<a ng-click="disableAnnotation(annotation)">
-					<i class="annotation-color-icon fa fa-bolt"></i>
 					{{annotation.name}}
 					{{annotation.name}}
+					<input class="cr1" id="hideYAxis" type="checkbox" ng-model="annotation.enable" ng-checked="annotation.enable">
+					<label for="hideYAxis" class="cr1"></label>
 				</a>
 				</a>
 			</li>
 			</li>
 		</ul>
 		</ul>

src/css/less/forms.less

@@ -11,12 +11,12 @@ input[type="checkbox"].cr1 {
   display: none;
   display: none;
 }
 }
 
 
-input[type="checkbox"]+.cr1 {
+label.cr1 {
   display: inline-block;
   display: inline-block;
-  height: 20px;
+  height: 19px;
   clear: none;
   clear: none;
   text-indent: 2px;
   text-indent: 2px;
-  margin: 0;
+  margin: 0 0 1px 0;
   padding: 0 0 0 20px;
   padding: 0 0 0 20px;
   vertical-align:middle;
   vertical-align:middle;
   background: url(@checkboxImageUrl) left top no-repeat;
   background: url(@checkboxImageUrl) left top no-repeat;

src/css/less/submenu.less

@@ -5,10 +5,16 @@
 }
 }
 
 
 .submenu-controls {
 .submenu-controls {
-  margin: 5px 10px 0 10px;
+  margin: 10px 10px 0 10px;
 }
 }
 
 
 .annotation-disabled, .annotation-disabled a {
 .annotation-disabled, .annotation-disabled a {
   color: @linkColorDisabled;
   color: @linkColorDisabled;
 }
 }
 
 
+.annotation-segment {
+  label.cr1 {
+    margin-left: 5px;
+  }
+}
+

src/css/less/tightform.less

@@ -92,7 +92,7 @@
     padding-right: 3px;
     padding-right: 3px;
   }
   }
   &.annotation-segment {
   &.annotation-segment {
-    padding: 8px 15px;
+    padding: 8px 10px;
   }
   }
 
 
   &.last {
   &.last {