energylink/grafana

commit 4b382e0faff3fa2e5c05ca3306d54d8e5f8ca89c
Merge: c00384ad0 d40e21a7e
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Wed Sep 17 09:54:40 2014 +0200

    Merge branch 'master' of github.com:torkelo/grafana-private into pro
    
    Conflicts:
            src/css/less/grafana.less
            src/test/test-main.js

diff --cc src/app/partials/dashboard.html
index acfd80518,8afe5d408..f619a74dc
--- a/src/app/partials/dashboard.html
+++ b/src/app/partials/dashboard.html
@@@ -1,18 -1,9 +1,9 @@@
- <div ng-controller="DashboardCtrl" body-class ng-class="{'dashboard-fullscreen': dashboardViewState.fullscreen}">
+ <div ng-controller="DashboardCtrl" body-class class="dashboard" ng-class="{'dashboard-fullscreen': dashboardViewState.fullscreen}">
  
 -	<div ng-include="'app/partials/dashboard_topnav.html'">
 +	<div ng-include="'app/partials/pro/dashboard_topnav.html'">
  	</div>
  
- 	<div class="submenu-controls">
-     <div class="submenu-panel" ng-controller="SubmenuCtrl" ng-repeat="pulldown in dashboard.pulldowns | filter:{ enable: true }">
-       <div class="submenu-panel-title">
-         <span class="small"><strong>{{pulldown.type}}:</strong></span>
-       </div>
-       <div class="submenu-panel-wrapper">
-         <grafana-simple-panel type="pulldown.type" ng-cloak></grafana-simple-panel>
-       </div>
-     </div>
-     <div class="clearfix"></div>
+ 	<div ng-if="submenuEnabled" ng-include="'app/partials/submenu.html'">
    </div>
  
    <div class="clearfix"></div>
diff --cc src/css/less/grafana.less
index f47e1a315,8d52f749f..08608cb0e
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@@ -1,3 -1,3 +1,4 @@@
++@import "p_pro.less";
  @import "submenu.less";
  @import "graph.less";
  @import "console.less";
diff --cc src/test/test-main.js
index 6a62eaa6a,342f3143a..8d074a2c1
--- a/src/test/test-main.js
+++ b/src/test/test-main.js
@@@ -125,12 -128,12 +128,13 @@@ require(
      'specs/graph-ctrl-specs',
      'specs/grafanaGraph-specs',
      'specs/seriesOverridesCtrl-specs',
-     'specs/filterSrv-specs',
+     'specs/timeSrv-specs',
+     'specs/templateSrv-specs',
+     'specs/templateValuesSrv-specs',
      'specs/kbn-format-specs',
      'specs/dashboardSrv-specs',
-     'specs/influxSeries-specs',
 -    'specs/dashboardViewStateSrv-specs'
 +    'specs/dashboardViewStateSrv-specs',
 +    'specs/overview-ctrl-specs',
    ], function () {
      window.__karma__.start();
    });