Changed name of some partials and controllers

src/app/controllers/all.js

@@ -1,7 +1,7 @@
 define([
   './grafanaCtrl',
-  './dash',
-  './dashLoader',
+  './dashboardCtrl',
+  './dashboardNavCtrl',
   './row',
   './submenuCtrl',
   './pulldown',

src/app/controllers/dash.js → src/app/controllers/dashboardCtrl.js

@@ -10,7 +10,7 @@ function (angular, $, config, _) {
 
   var module = angular.module('grafana.controllers');
 
-  module.controller('DashCtrl', function(
+  module.controller('DashboardCtrl', function(
       $scope, $rootScope, dashboardKeybindings,
       filterSrv, dashboardSrv, dashboardViewStateSrv,
       panelMoveSrv, timer) {

src/app/controllers/dashLoader.js → src/app/controllers/dashboardNavCtrl.js

@@ -10,7 +10,7 @@ function (angular, _, moment, config) {
 
   var module = angular.module('grafana.controllers');
 
-  module.controller('dashLoader', function($scope, $rootScope, $http, alertSrv, $location, playlistSrv, datasourceSrv) {
+  module.controller('DashboardNavCtrl', function($scope, $rootScope, alertSrv, $location, playlistSrv, datasourceSrv) {
 
     $scope.init = function() {
       $scope.db = datasourceSrv.getGrafanaDB();

src/app/partials/dashLoader.html

@@ -1,65 +0,0 @@
-<li ng-show="dashboardViewState.fullscreen">
-  <a ng-click="exitFullscreen()">
-    Back to dashboard
-  </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>
-</li>
-
-<li class="dropdown grafana-menu-save">
-  <a href="#"  bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
-    <i class='icon-save'></i>
-  </a>
-
-  <ul class="save-dashboard-dropdown dropdown-menu" ng-if="saveDropdownOpened">
-    <li>
-      <form class="input-prepend nomargin save-dashboard-dropdown-save-form">
-        <input class='input-medium' ng-model="dashboard.title" type="text" />
-        <button class="btn" ng-click="saveDashboard()"><i class="icon-save"></i></button>
-      </form>
-    </li>
-
-    <li>
-      <a class="link" ng-click="set_default()">Save as Home</a>
-    </li>
-    <li>
-      <a class="link" ng-click="purge_default()">Reset Home</a>
-    </li>
-    <li ng-show="!isFavorite">
-      <a class="link" ng-click="markAsFavorite()">Mark as favorite</a>
-    </li>
-    <li ng-show="isFavorite">
-      <a class="link" ng-click="removeAsFavorite()">Remove as favorite</a>
-    </li>
-    <li>
-      <a class="link" ng-click="exportDashboard()">Export dashboard</a>
-    </li>
-		<li ng-show="db.saveTemp">
-			<a bs-tooltip="'Share'" data-placement="bottom" ng-click="saveForSharing()" config-modal="app/partials/dashLoaderShare.html">
-				Share temp copy
-			</a>
-	  </li>
-  </ul>
-</li>
-
-<li class="dropdown grafana-menu-load" ng-controller="SearchCtrl" ng-init="init()" ng-include="'app/partials/search.html'">
-</li>
-
-<li class="grafana-menu-home"><a bs-tooltip="'Goto saved default'" data-placement="bottom" href='#/'><i class='icon-home'></i></a></li>
-
-<li class="grafana-menu-edit" ng-show="dashboard.editable" bs-tooltip="'Configure dashboard'" data-placement="bottom"><a class="link" config-modal="app/partials/dasheditor.html"><i class='icon-cog pointer'></i></a></li>
-
-<li class="grafana-menu-stop-playlist hide">
-  <a class='small' ng-click='stopPlaylist(2)'>
-    Stop playlist
-  </a>
-</li>

src/app/partials/dashboard.html

@@ -1,16 +1,9 @@
-<div ng-controller="DashCtrl" body-class ng-class="{'dashboard-fullscreen': dashboardViewState.fullscreen}">
+<div ng-controller="DashboardCtrl" body-class ng-class="{'dashboard-fullscreen': dashboardViewState.fullscreen}">
 
-  <div class="navbar navbar-static-top">
-    <div class="navbar-inner">
-      <div class="container-fluid">
-        <span class="brand"><img src="img/small.png" bs-tooltip="'Grafana'" data-placement="bottom"> {{dashboard.title}}</span>
-        <ul class="nav pull-right" ng-controller='dashLoader' ng-init="init()" ng-include="'app/partials/dashLoader.html'">
-        </ul>
-      </div>
-    </div>
-  </div>
+	<div ng-include="'app/partials/dashboard_topnav.html'">
+	</div>
 
-  <div class="submenu-controls">
+	<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>

src/app/partials/dashboard_topnav.html

@@ -0,0 +1,77 @@
+<div class="navbar navbar-static-top">
+	<div class="navbar-inner">
+		<div class="container-fluid">
+			<span class="brand"><img src="img/small.png" bs-tooltip="'Grafana'" data-placement="bottom"> {{dashboard.title}}</span>
+			<ul class="nav pull-right" ng-controller='DashboardNavCtrl' ng-init="init()">
+
+				<li ng-show="dashboardViewState.fullscreen">
+					<a ng-click="exitFullscreen()">
+						Back to dashboard
+					</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>
+				</li>
+
+				<li class="dropdown grafana-menu-save">
+					<a href="#"  bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
+						<i class='icon-save'></i>
+					</a>
+
+					<ul class="save-dashboard-dropdown dropdown-menu" ng-if="saveDropdownOpened">
+						<li>
+							<form class="input-prepend nomargin save-dashboard-dropdown-save-form">
+								<input class='input-medium' ng-model="dashboard.title" type="text" />
+								<button class="btn" ng-click="saveDashboard()"><i class="icon-save"></i></button>
+							</form>
+						</li>
+
+						<li>
+							<a class="link" ng-click="set_default()">Save as Home</a>
+						</li>
+						<li>
+							<a class="link" ng-click="purge_default()">Reset Home</a>
+						</li>
+						<li ng-show="!isFavorite">
+							<a class="link" ng-click="markAsFavorite()">Mark as favorite</a>
+						</li>
+						<li ng-show="isFavorite">
+							<a class="link" ng-click="removeAsFavorite()">Remove as favorite</a>
+						</li>
+						<li>
+							<a class="link" ng-click="exportDashboard()">Export dashboard</a>
+						</li>
+						<li ng-show="db.saveTemp">
+							<a bs-tooltip="'Share'" data-placement="bottom" ng-click="saveForSharing()" config-modal="app/partials/dashLoaderShare.html">
+								Share temp copy
+							</a>
+						</li>
+					</ul>
+				</li>
+
+				<li class="dropdown grafana-menu-load" ng-controller="SearchCtrl" ng-init="init()" ng-include="'app/partials/search.html'">
+				</li>
+
+				<li class="grafana-menu-home"><a bs-tooltip="'Goto saved default'" data-placement="bottom" href='#/'><i class='icon-home'></i></a></li>
+
+				<li class="grafana-menu-edit" ng-show="dashboard.editable" bs-tooltip="'Configure dashboard'" data-placement="bottom"><a class="link" config-modal="app/partials/dasheditor.html"><i class='icon-cog pointer'></i></a></li>
+
+				<li class="grafana-menu-stop-playlist hide">
+					<a class='small' ng-click='stopPlaylist(2)'>
+						Stop playlist
+					</a>
+				</li>
+
+			</ul>
+		</div>
+	</div>
+</div>
+