Merge branch 'master' into valuepanel

src/app/dashboards/default.json

@@ -101,7 +101,6 @@
           "legend_counts": true,
           "timezone": "browser",
           "percentage": false,
-          "zerofill": true,
           "nullPointMode": "connected",
           "steppedLine": false,
           "tooltip": {

src/app/dashboards/scripted.js

@@ -68,6 +68,17 @@ for (var i = 0; i < rows; i++) {
             'target': "randomWalk('random walk2')"
           }
         ],
+        seriesOverrides: [
+          {
+            alias: '/random/',
+            yaxis: 2,
+            fill: 0,
+            linewidth: 5
+          }
+        ],
+        tooltip: {
+          shared: true
+        }
       }
     ]
   });

src/app/dashboards/template_vars.json

@@ -65,7 +65,6 @@
             "avg": false
           },
           "percentage": false,
-          "zerofill": true,
           "nullPointMode": "connected",
           "steppedLine": false,
           "tooltip": {

src/app/directives/dropdown.typeahead.js

@@ -37,6 +37,17 @@ function (angular, app, _, $) {
             return memo;
           }, []);
 
+          $scope.menuItemSelected = function(optionIndex, valueIndex) {
+            var option = $scope.menuItems[optionIndex];
+            var result = {
+              $item: option.submenu[valueIndex],
+              $optionIndex: optionIndex,
+              $valueIndex: valueIndex
+            };
+
+            $scope.dropdownTypeaheadOnSelect(result);
+          };
+
           $input.attr('data-provide', 'typeahead');
           $input.typeahead({
             source: typeaheadValues,

src/app/panels/graph/module.js

@@ -150,10 +150,6 @@ function (angular, app, $, _, kbn, moment, TimeSeries) {
        * queries
        */
       percentage    : false,
-      /** @scratch /panels/histogram/3
-       * zerofill:: Improves the accuracy of line charts at a small performance cost.
-       */
-      zerofill      : true,
 
       nullPointMode : 'connected',
 

src/app/panels/graph/seriesOverridesCtrl.js

@@ -23,7 +23,7 @@ define([
       option.submenu = _.map(values, function(value, index) {
         return {
           text: String(value),
-          click: 'setOverride(' + option.index + ',' + index + ')'
+          click: 'menuItemSelected(' + option.index + ',' + index + ')'
         };
       });
 

src/app/panels/timepicker/module.html

@@ -10,19 +10,26 @@
     }
   </style>
   <form name="input" style="margin:0">
-    <ul class="nav nav-pills timepicker-dropdown">
-      <li class="dropdown">
+		<ul class="nav timepicker-dropdown">
 
-        <a class="dropdown-toggle timepicker-dropdown" data-toggle="dropdown" href="" bs-tooltip="time.tooltip" data-placement="bottom" ng-click="dismiss();">
-          <span ng-bind="time.rangeString"></span>
-          <span ng-show="dashboard.refresh" class="text-warning">refreshed every {{dashboard.refresh}} </span>
-          <i class="icon-caret-down"></i>
-        </a>
+			<li class="grafana-menu-zoom-out">
+				<a class='small' ng-click='zoom(2)'>
+					Zoom Out
+				</a>
+			</li>
 
-        <ul class="dropdown-menu">
-          <!-- Relative time options -->
-          <li bindonce ng-repeat='timespan in panel.time_options track by $index'>
-            <a ng-click="setRelativeFilter(timespan)" bo-text="'Last ' + timespan"></a>
+			<li class="dropdown">
+
+				<a class="dropdown-toggle timepicker-dropdown" data-toggle="dropdown" href="" bs-tooltip="time.tooltip" data-placement="bottom" ng-click="dismiss();">
+					<span ng-bind="time.rangeString"></span>
+					<span ng-show="dashboard.refresh" class="text-warning">refreshed every {{dashboard.refresh}} </span>
+					<i class="icon-caret-down"></i>
+				</a>
+
+				<ul class="dropdown-menu">
+					<!-- Relative time options -->
+					<li bindonce ng-repeat='timespan in panel.time_options track by $index'>
+						<a ng-click="setRelativeFilter(timespan)" bo-text="'Last ' + timespan"></a>
           </li>
 
           <!-- Auto refresh submenu -->

src/app/partials/dashboard_topnav.html

@@ -13,12 +13,6 @@
 					</a>
 				</li>
 
-				<li class="grafana-menu-zoom-out">
-					<a class='small' ng-click='zoom(2)'>
-						Zoom Out
-					</a>
-				</li>
-
 				<li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable">
 					<grafana-simple-panel type="pulldown.type" ng-cloak>
 					</grafana-simple-panel>

src/app/partials/help_modal.html

@@ -36,6 +36,10 @@
 				<td><span class="label label-info">CTRL+R</span></td>
 				<td>Refresh (Fetches new data and rerenders panels)</td>
 			</tr>
+			<tr>
+				<td><span class="label label-info">CTRL+O</span></td>
+				<td>Enable/Disable shared graph crosshair</td>
+			</tr>
 		</table>
 	</div>
 

src/app/services/dashboard/dashboardKeyBindings.js

@@ -23,7 +23,7 @@ function(angular, $) {
       });
 
       var helpModalScope = null;
-      keyboardManager.bind('shift+¿', function() {
+      keyboardManager.bind('shift+?', function() {
         if (helpModalScope) { return; }
 
         helpModalScope = $rootScope.$new();

src/app/services/keyboardManager.js

@@ -61,6 +61,7 @@ function (angular) {
         else if (e.which) {
           code = e.which;
         }
+
         var character = String.fromCharCode(code).toLowerCase();
 
         if (code === 188) {
@@ -93,6 +94,9 @@ function (angular) {
           ",": "<",
           ".": ">",
           "/": "?",
+          "»": "?",
+          "«": "?",
+          "¿": "?",
           "\\": "|"
         };
         // Special Keys - and their codes

src/css/less/grafana.less

@@ -116,7 +116,7 @@
   position: fixed;
   left: 0px;
   right: 0px;
-  top: 54px;
+  top: 51px;
   height: 100%;
   padding: 0 10px;
   background: @grafanaPanelBackground;
@@ -134,9 +134,11 @@
 
 .dashboard-fullscreen {
   .main-view-container {
-    height: 0;
     overflow: hidden;
-    padding: 0;
+    height: 0;
+    .row-control-inner {
+      display: none;
+    }
   }
 }
 

src/css/less/submenu.less

 .submenu-controls-visible:not(.hide-controls) {
   .panel-fullscreen {
-    top: 91px;
+    top: 88px;
   }
 }
 

src/test/specs/seriesOverridesCtrl-specs.js

@@ -18,7 +18,7 @@ define([
 
     describe('Controller should init overrideMenu', function() {
       it('click should include option and value index', function() {
-        expect(ctx.scope.overrideMenu[1].submenu[1].click).to.be('setOverride(1,1)');
+        expect(ctx.scope.overrideMenu[1].submenu[1].click).to.be('menuItemSelected(1,1)');
       });
     });