More work on annotations

src/app/partials/dasheditor.html

@@ -2,7 +2,7 @@
   <div class="pull-right editor-title">Dashboard settings</div>
   <div class="pull-right editor-title">Dashboard settings</div>
 
 
   <div ng-model="editor.index" bs-tabs style="text-transform:capitalize;">
   <div ng-model="editor.index" bs-tabs style="text-transform:capitalize;">
-    <div ng-repeat="tab in ['General', 'Rows','Controls', 'Import']" data-title="{{tab}}">
+    <div ng-repeat="tab in ['General', 'Rows','Controls', 'Metrics', 'Import']" data-title="{{tab}}">
     </div>
     </div>
     <div ng-repeat="tab in dashboard.current.nav" data-title="{{tab.type}}">
     <div ng-repeat="tab in dashboard.current.nav" data-title="{{tab.type}}">
     </div>
     </div>

src/app/partials/loadmetrics.html

 <div ng-controller="MetricKeysCtrl" ng-init="init()">
 <div ng-controller="MetricKeysCtrl" ng-init="init()">
   <h5>Load metrics keys into elastic search</h5>
   <h5>Load metrics keys into elastic search</h5>
 
 
-  <div class="row-fluid">
+  <p>
+    Work in progress...
+  </p>
+  <!-- <div class="row-fluid">
     <div class="span12">
     <div class="span12">
       <label class="small">Load metrics recursive starting from this metric path</label>
       <label class="small">Load metrics recursive starting from this metric path</label>
       <input type="text" class="input-xlarge" ng-model="metricPath"> </input>
       <input type="text" class="input-xlarge" ng-model="metricPath"> </input>
@@ -29,5 +32,5 @@
     <div class="span12" style="padding-top: 10px;">
     <div class="span12" style="padding-top: 10px;">
       Metrics indexed: {{metricCounter}}
       Metrics indexed: {{metricCounter}}
     </div>
     </div>
-  </div>
+  </div> -->
 </div>
 </div>

src/app/services/dashboard.js

@@ -27,7 +27,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
       failover: false,
       failover: false,
       panel_hints: true,
       panel_hints: true,
       rows: [],
       rows: [],
-      pulldowns: [ { type: 'filtering' },  { type: 'annotations' } ],
+      pulldowns: [ { type: 'filtering' },  /*{ type: 'annotations' }*/ ],
       nav: [ { type: 'timepicker' } ],
       nav: [ { type: 'timepicker' } ],
       services: {},
       services: {},
       loader: {
       loader: {
@@ -126,19 +126,17 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
       if (!filtering) {
       if (!filtering) {
         dashboard.pulldowns.push({
         dashboard.pulldowns.push({
           type: 'filtering',
           type: 'filtering',
-          enable: false,
-          collapse: true
+          enable: false
         });
         });
       }
       }
 
 
-      var annotations = _.findWhere(dashboard.pulldowns, {type: 'annotations'});
+      /*var annotations = _.findWhere(dashboard.pulldowns, {type: 'annotations'});
       if (!annotations) {
       if (!annotations) {
         dashboard.pulldowns.push({
         dashboard.pulldowns.push({
           type: 'annotations',
           type: 'annotations',
-          enable: false,
-          collapse: true
+          enable: false
         });
         });
-      }
+      }*/
 
 
       return dashboard;
       return dashboard;
     };
     };

src/css/less/submenu.less

@@ -20,7 +20,7 @@
 .submenu-panel-title {
 .submenu-panel-title {
   float: left;
   float: left;
   text-transform: uppercase;
   text-transform: uppercase;
-  padding: 4px 10px 0 0;
+  padding: 4px 10px 3px 0;
 }
 }
 
 
 .submenu-panel-wrapper {
 .submenu-panel-wrapper {
@@ -28,7 +28,7 @@
 }
 }
 
 
 .submenu-toggle {
 .submenu-toggle {
-  padding: 4px 0 0 4px;
+  padding: 4px 0 3px 8px;
   float: left;
   float: left;
 }
 }