Merge branch 'revert-dashboard-search-nav'

public/app/core/components/navbar/navbar.html

@@ -8,9 +8,9 @@
 		<i class="fa fa-chevron-left"></i>
 		<i class="fa fa-chevron-left"></i>
 	</a>
 	</a>
 
 
-  <a class="navbar-page-btn navbar-page-btn--search" ng-click="ctrl.showSearch()">
-		<i class="fa fa-search"></i>
-	</a>
+  <!-- <a class="navbar&#45;page&#45;btn navbar&#45;page&#45;btn&#45;&#45;search" ng&#45;click="ctrl.showSearch()"> -->
+	<!-- 	<i class="fa fa&#45;search"></i> -->
+	<!-- </a> -->
 
 
 	<div ng-if="::!ctrl.hasMenu">
 	<div ng-if="::!ctrl.hasMenu">
 		<a href="{{::ctrl.section.url}}" class="navbar-page-btn">
 		<a href="{{::ctrl.section.url}}" class="navbar-page-btn">

public/app/features/dashboard/dashnav/dashnav.html

-<navbar model="ctrl.navModel">
+<div class="navbar">
+	<div class="navbar-inner">
+		<a class="navbar-brand-btn pointer" ng-click="ctrl.toggleSideMenu()">
+			<span class="navbar-brand-btn-background">
+				<img src="public/img/grafana_icon.svg"></img>
+			</span>
+			<i class="icon-gf icon-gf-grafana_wordmark"></i>
+			<i class="fa fa-caret-down"></i>
+			<i class="fa fa-chevron-left"></i>
+		</a>
+
+		<div class="navbar-section-wrapper">
+			<a class="navbar-page-btn" ng-click="ctrl.showSearch()">
+				<i class="icon-gf icon-gf-dashboard"></i>
+				{{ctrl.dashboard.title}}
+				<i class="fa fa-caret-down"></i>
+			</a>
+		</div>
 
 
-<ul class="nav dash-playlist-actions" ng-if="ctrl.playlistSrv.isPlaying">
+		<ul class="nav dash-playlist-actions" ng-if="ctrl.playlistSrv.isPlaying">
 			<li>
 			<li>
 				<a ng-click="ctrl.playlistSrv.prev()"><i class="fa fa-step-backward"></i></a>
 				<a ng-click="ctrl.playlistSrv.prev()"><i class="fa fa-step-backward"></i></a>
 			</li>
 			</li>
@@ -10,9 +27,9 @@
 			<li>
 			<li>
 				<a ng-click="ctrl.playlistSrv.next()"><i class="fa fa-step-forward"></i></a>
 				<a ng-click="ctrl.playlistSrv.next()"><i class="fa fa-step-forward"></i></a>
 			</li>
 			</li>
-</ul>
+		</ul>
 
 
-<ul class="nav pull-left dashnav-action-icons">
+		<ul class="nav pull-left dashnav-action-icons">
 			<li ng-show="::ctrl.dashboard.meta.canStar">
 			<li ng-show="::ctrl.dashboard.meta.canStar">
 				<a class="pointer" ng-click="ctrl.starDashboard()">
 				<a class="pointer" ng-click="ctrl.starDashboard()">
 					<i class="fa" ng-class="{'fa-star-o': !ctrl.dashboard.meta.isStarred, 'fa-star': ctrl.dashboard.meta.isStarred}" style="color: orange;"></i>
 					<i class="fa" ng-class="{'fa-star-o': !ctrl.dashboard.meta.isStarred, 'fa-star': ctrl.dashboard.meta.isStarred}" style="color: orange;"></i>
@@ -47,9 +64,22 @@
 			<li ng-if="::ctrl.dashboard.snapshot.originalUrl">
 			<li ng-if="::ctrl.dashboard.snapshot.originalUrl">
 				<a ng-href="{{ctrl.dashboard.snapshot.originalUrl}}" bs-tooltip="'Open original dashboard'" data-placement="bottom"><i class="fa fa-link"></i></a>
 				<a ng-href="{{ctrl.dashboard.snapshot.originalUrl}}" bs-tooltip="'Open original dashboard'" data-placement="bottom"><i class="fa fa-link"></i></a>
 			</li>
 			</li>
-</ul>
+			<li class="dropdown">
+				<a class="pointer" data-toggle="dropdown">
+					<i class="fa fa-cog"></i>
+				</a>
+				<ul class="dropdown-menu dropdown-menu--navbar">
+					<li ng-repeat="navItem in ::ctrl.navModel.menu" ng-class="{active: navItem.active}">
+						<a class="pointer" ng-href="{{::navItem.url}}" ng-click="ctrl.navItemClicked(navItem, $event)">
+							<i class="{{::navItem.icon}}" ng-show="::navItem.icon"></i>
+							{{::navItem.title}}
+						</a>
+					</li>
+				</ul>
+			</li>
+		</ul>
 
 
-<ul class="nav pull-right">
+		<ul class="nav pull-right">
 			<li ng-show="ctrl.dashboard.meta.fullscreen" class="dashnav-back-to-dashboard">
 			<li ng-show="ctrl.dashboard.meta.fullscreen" class="dashnav-back-to-dashboard">
 				<a ng-click="ctrl.exitFullscreen()">
 				<a ng-click="ctrl.exitFullscreen()">
 					Back to dashboard
 					Back to dashboard
@@ -58,6 +88,8 @@
 			<li>
 			<li>
 				<gf-time-picker dashboard="ctrl.dashboard"></gf-time-picker>
 				<gf-time-picker dashboard="ctrl.dashboard"></gf-time-picker>
 			</li>
 			</li>
-</ul>
+		</ul>
+	</div>
+</div>
 
 
-</navbar>
+<dashboard-search></dashboard-search>

public/app/features/dashboard/dashnav/dashnav.ts

@@ -22,8 +22,8 @@ export class DashNavCtrl {
     private backendSrv,
     private backendSrv,
     private $timeout,
     private $timeout,
     private datasourceSrv,
     private datasourceSrv,
-    private navModelSrv) {
-
+    private navModelSrv,
+    private contextSrv) {
       this.navModel = navModelSrv.getDashboardNav(this.dashboard, this);
       this.navModel = navModelSrv.getDashboardNav(this.dashboard, this);
 
 
       appEvents.on('save-dashboard', this.saveDashboard.bind(this), $scope);
       appEvents.on('save-dashboard', this.saveDashboard.bind(this), $scope);
@@ -38,6 +38,10 @@ export class DashNavCtrl {
       }
       }
     }
     }
 
 
+    toggleSideMenu() {
+      this.contextSrv.toggleSideMenu();
+    }
+
     openEditView(editview) {
     openEditView(editview) {
       var search = _.extend(this.$location.search(), {editview: editview});
       var search = _.extend(this.$location.search(), {editview: editview});
       this.$location.search(search);
       this.$location.search(search);
@@ -135,6 +139,17 @@ export class DashNavCtrl {
       var uri = "data:application/json;charset=utf-8," + encodeURIComponent(html);
       var uri = "data:application/json;charset=utf-8," + encodeURIComponent(html);
       var newWindow = window.open(uri);
       var newWindow = window.open(uri);
     }
     }
+
+    showSearch() {
+      this.$rootScope.appEvent('show-dash-search');
+    }
+
+    navItemClicked(navItem, evt) {
+      if (navItem.clickHandler) {
+        navItem.clickHandler();
+        evt.preventDefault();
+      }
+    }
 }
 }
 
 
 export function dashNavDirective() {
 export function dashNavDirective() {