From f98dbd249ed014ffb22a0920a2932bcc40aa68c9 Mon Sep 17 00:00:00 2001
From: Trent White <trent@wearecapacity.com>
Date: Fri, 12 Feb 2016 17:20:58 -0500
Subject: [PATCH] update navbar and elements on playlist snapshots and change
 apps to plugins

---
 public/app/features/apps/partials/edit.html   |  2 +-
 public/app/features/apps/partials/list.html   |  4 +-
 .../dashboard/partials/saveDashboardAs.html   |  4 +-
 .../features/datasources/partials/edit.html   |  2 +-
 .../features/playlist/partials/playlist.html  | 45 +++++++++++--------
 .../features/playlist/partials/playlists.html | 16 +++++--
 .../features/snapshot/partials/snapshots.html | 12 ++++-
 public/less/playlist.less                     |  2 +-
 public/vendor/bootstrap/less/mixins.less      |  1 +
 9 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/public/app/features/apps/partials/edit.html b/public/app/features/apps/partials/edit.html
index 8986b5d7fa5..e743657f17a 100644
--- a/public/app/features/apps/partials/edit.html
+++ b/public/app/features/apps/partials/edit.html
@@ -1,4 +1,4 @@
-<navbar title="Apps" title-url="apps" icon="icon-gf icon-gf-apps" subnav="true">
+<navbar title="Plugins" title-url="Plugins" icon="icon-gf icon-gf-apps" subnav="true">
 	<ul class="nav">
 		<li class="active" ><a href="apps/edit/{{ctrl.current.type}}">{{ctrl.appModel.name}}</a></li>
 	</ul>
diff --git a/public/app/features/apps/partials/list.html b/public/app/features/apps/partials/list.html
index 83270c24747..98305ff7696 100644
--- a/public/app/features/apps/partials/list.html
+++ b/public/app/features/apps/partials/list.html
@@ -1,9 +1,9 @@
-<navbar title="Apps" icon="icon-gf icon-gf-apps">
+<navbar title="Plugins" icon="icon-gf icon-gf-apps">
 </navbar>
 
 <div class="page-container">
   <div class="page-wide">
-    <h1>Apps</h1>
+    <h1>Plugins</h1>
 
 		<div ng-if="!ctrl.apps">
 			<em>No apps defined</em>
diff --git a/public/app/features/dashboard/partials/saveDashboardAs.html b/public/app/features/dashboard/partials/saveDashboardAs.html
index 5c069f199e6..875876a4e63 100644
--- a/public/app/features/dashboard/partials/saveDashboardAs.html
+++ b/public/app/features/dashboard/partials/saveDashboardAs.html
@@ -18,8 +18,8 @@
 			<br>
 			<br>
 
-			<button class="btn btn-inverse" ng-click="dismiss();">Cancel</button>
-			<button class="btn btn-success" ng-click="saveClone();">Save</button>
+			<a class="btn btn-success" ng-click="saveClone();">Save</a>
+			<a class="btn-text" ng-click="dismiss();">Cancel</a>
 		</div>
 	</div>
 </div>
diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index 27476f684c8..57e7b7f2c55 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -65,7 +65,7 @@
 			<div class="" style="margin-top: 35px">
 				<button type="submit" class="btn btn-success" ng-show="isNew" ng-click="saveChanges()">Add</button>
 				<button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="saveChanges()">Save</button>
-				<button type="submit" class="btn btn-inverse" ng-show="!isNew" ng-click="saveChanges(true)">
+				<button type="submit" class="btn btn-primary" ng-show="!isNew" ng-click="saveChanges(true)">
 					Test Connection
 				</button>
 				<a class="btn-text" href="datasources">Cancel</a>
diff --git a/public/app/features/playlist/partials/playlist.html b/public/app/features/playlist/partials/playlist.html
index b82f00f69f9..ae37408169d 100644
--- a/public/app/features/playlist/partials/playlist.html
+++ b/public/app/features/playlist/partials/playlist.html
@@ -1,37 +1,46 @@
-<navbar title="Playlists" title-url="playlists" icon="fa fa-fw fa-list" subnav="true">
+<navbar> 
+<div class="top-nav-btn dashnav-dashboards-btn" >
+  <a class="pointer" ng-click="openSearch()">
+    <i class="fa fa-fw fa-list"></i>
+    <span class="dashboard-title">Playlist</span>
+    <i class="fa fa-caret-down"></i>
+  </a>
+</div>
+</navbar>
+<!-- <navbar title="Playlists" title-url="playlists" icon="fa fa-fw fa-list" subnav="true">
 	<ul class="nav">
 		<li ng-class="{active: ctrl.isNew()}" ng-show="ctrl.isNew()"><a href="datasources/create">New</a></li>
 		<li class="active" ng-show="!ctrl.isNew()"><a href="playlists/edit/{{ctrl.playlist.id}}">{{ctrl.playlist.name}}</a></li>
 	</ul>
-</navbar>
+</navbar> -->
 
 <div class="page-container" ng-form="playlistEditForm">
   <div class="page">
-    <h2 ng-show="ctrl.isNew()">New playlist</h2>
-    <h2 ng-show="!ctrl.isNew()">Edit playlist</h2>
+    <h1 ng-show="ctrl.isNew()">New Playlist</h1>
+    <h1 ng-show="!ctrl.isNew()">Edit Playlist</h1>
 
-    <h4>Name and interval</h4>
+    <h3>Name and interval</h3>
 
     <div style="margin-bottom: 10px;">
       <div>
-        <div class="tight-form">
-          <ul class="tight-form-list">
-            <li class="tight-form-item" style="width: 100px">
+        <div class="norm-form">
+          <ul class="norm-form-list">
+            <li class="norm-form-item" style="width: 100px">
               Name
             </li>
             <li>
-              <input type="text" required ng-model="ctrl.playlist.name" class="input-xlarge tight-form-input">
+              <input type="text" required ng-model="ctrl.playlist.name" class="input-xlarge norm-form-input">
             </li>
           </ul>
           <div class="clearfix"></div>
         </div>
-        <div class="tight-form last">
-          <ul class="tight-form-list">
-            <li class="tight-form-item" style="width: 100px">
+        <div class="norm-form last">
+          <ul class="norm-form-list">
+            <li class="norm-form-item" style="width: 100px">
               Interval
             </li>
             <li>
-              <input type="text" required ng-model="ctrl.playlist.interval" placeholder="5m" class="input-xlarge tight-form-input">
+              <input type="text" required ng-model="ctrl.playlist.interval" placeholder="5m" class="input-xlarge norm-form-input">
             </li>
           </ul>
           <div class="clearfix"></div>
@@ -116,14 +125,12 @@
   <div class="clearfix"></div>
 
   <div class="pull-left" style="margin-top: 25px;">
-    <!-- <div class="tight-form"> -->
-      <button type="button"
+    <!-- <div class="norm-form"> -->
+      <a
               class="btn btn-success"
               ng-disabled="ctrl.playlistEditForm.$invalid || ctrl.isPlaylistEmpty()"
-              ng-click="ctrl.savePlaylist(ctrl.playlist, ctrl.playlistItems)">Save</button>
-      <button type="button"
-              class="btn btn-inverse"
-              ng-click="ctrl.backToList()">Cancel</button>
+              ng-click="ctrl.savePlaylist(ctrl.playlist, ctrl.playlistItems)">Save</a>
+      <a class="btn-text" ng-click="ctrl.backToList()">Cancel</a>
     <!-- </div> -->
   </div>
 
diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html
index 4aa7944623c..673168531fc 100644
--- a/public/app/features/playlist/partials/playlists.html
+++ b/public/app/features/playlist/partials/playlists.html
@@ -1,14 +1,22 @@
-<navbar icon="fa fa-fw fa-list" title="Playlists"></navbar>
+<navbar> 
+<div class="top-nav-btn dashnav-dashboards-btn" >
+  <a class="pointer" ng-click="openSearch()">
+    <i class="fa fa-fw fa-list"></i>
+    <span class="dashboard-title">New Playlist</span>
+    <i class="fa fa-caret-down"></i>
+  </a>
+</div>
+</navbar>
 
 <div class="page-container">
   <div class="page-wide">
 
-		<a class="btn btn-inverse pull-right" href="playlists/create">
+		<a class="btn btn-success pull-right" href="playlists/create">
 			<i class="fa fa-plus"></i>
-			New playlist
+			New Playlist
 		</a>
 
-    <h2>Saved playlists</h2>
+    <h1>Saved playlists</h1>
 
      <table class="filter-table" style="margin-top: 20px">
       <thead>
diff --git a/public/app/features/snapshot/partials/snapshots.html b/public/app/features/snapshot/partials/snapshots.html
index 3bbc671e184..3cb78a49d3f 100644
--- a/public/app/features/snapshot/partials/snapshots.html
+++ b/public/app/features/snapshot/partials/snapshots.html
@@ -1,9 +1,17 @@
-<navbar icon="icon-gf icon-gf-snapshot" title="Dashboard snapshots"></navbar>
+<navbar> 
+<div class="top-nav-btn dashnav-dashboards-btn" >
+  <a class="pointer" ng-click="openSearch()">
+    <i class="icon-gf icon-gf-snapshot"></i>
+    <span class="dashboard-title">Snapshots</span>
+    <i class="fa fa-caret-down"></i>
+  </a>
+</div>
+</navbar>
 
 <div class="page-container">
   <div class="page-wide">
 
-    <h2>Available snapshots</h2>
+    <h1>Available snapshots</h1>
 
      <table class="filter-table" style="margin-top: 20px">
       <thead>
diff --git a/public/less/playlist.less b/public/less/playlist.less
index 5aa5e960979..335f7cbfbfd 100644
--- a/public/less/playlist.less
+++ b/public/less/playlist.less
@@ -1,5 +1,5 @@
 .playlist-search-container {
-  margin: 15px;
+  // margin: 15px;
   z-index: 1000;
   position: relative;
   width: 700px;
diff --git a/public/vendor/bootstrap/less/mixins.less b/public/vendor/bootstrap/less/mixins.less
index e0aef540dd4..9a8ee6676c4 100644
--- a/public/vendor/bootstrap/less/mixins.less
+++ b/public/vendor/bootstrap/less/mixins.less
@@ -522,6 +522,7 @@
     color: @textColor;
     background-color: @endColor;
     *background-color: darken(@endColor, 5%);
+    box-shadow: inset 0 -3px rgba(0,0,0,0.3);
   }
 
   // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves