From 3944c37627326a14c8d39d8f2f25617681e3f074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 13 Sep 2014 18:33:35 +0200
Subject: [PATCH] patches from master

---
 src/app/partials/pro/dashboard_topnav.html | 12 +++++++++---
 src/app/routes/p_solo-panel.js             |  3 +--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/partials/pro/dashboard_topnav.html b/src/app/partials/pro/dashboard_topnav.html
index fdd0cba101d..f6648e1bcb7 100644
--- a/src/app/partials/pro/dashboard_topnav.html
+++ b/src/app/partials/pro/dashboard_topnav.html
@@ -27,7 +27,7 @@
 				</li>
 
 				<li class="dropdown grafana-menu-save">
-					<a href="#"  bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
+					<a bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
 						<i class='icon-save'></i>
 					</a>
 
@@ -51,6 +51,9 @@
 						<li ng-show="isFavorite">
 							<a class="link" ng-click="removeAsFavorite()">Remove as favorite</a>
 						</li>
+						<li>
+							<a class="link" ng-click="editJson()">Dashboard JSON</a>
+						</li>
 						<li>
 							<a class="link" ng-click="exportDashboard()">Export dashboard</a>
 						</li>
@@ -62,12 +65,15 @@
 					</ul>
 				</li>
 
-				<li class="dropdown grafana-menu-load" ng-controller="SearchCtrl" ng-init="init()" ng-include="'app/partials/search.html'">
+				<li class="dropdown grafana-menu-load">
+					<a bs-tooltip="'Search'" ng-click="openSearch()">
+						<i class='icon-folder-open'></i>
+					</a>
 				</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-edit" ng-show="dashboard.editable" bs-tooltip="'Configure dashboard'" data-placement="bottom"><a class="link" dash-editor-link="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)'>
diff --git a/src/app/routes/p_solo-panel.js b/src/app/routes/p_solo-panel.js
index 7493ab4813b..6f766e31698 100644
--- a/src/app/routes/p_solo-panel.js
+++ b/src/app/routes/p_solo-panel.js
@@ -1,8 +1,7 @@
 define([
   'angular',
-  'lodash',
 ],
-function (angular, _) {
+function (angular) {
   "use strict";
 
   var module = angular.module('grafana.routes');