From 84eb8fc047029bb80786c32fbd9e78ca543e5097 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 28 Dec 2013 02:09:05 -0500
Subject: [PATCH] now playing bar fixes

---
 dashboard-ui/css/librarybrowser.css | 15 +++++++--------
 dashboard-ui/css/mediaplayer.css    | 11 ++++++-----
 dashboard-ui/css/metadataeditor.css |  2 +-
 dashboard-ui/index.html             |  1 -
 dashboard-ui/scripts/librarymenu.js |  8 ++------
 dashboard-ui/scripts/mediaplayer.js |  7 +++----
 6 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index d9f74ad2a8..c6a7e9d457 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -4,7 +4,7 @@
 }
 
 .libraryPage {
-    padding-top: 46px !important;
+    padding-top: 48px !important;
 }
 
 .ui-panel fieldset + fieldset {
@@ -17,15 +17,12 @@
 }
 
 .viewMenuBar {
-    background: #404040;
-    background-image: linear-gradient(#404040,#2d2d2d);
     font-weight: bold;
     position: fixed;
     right: 0;
     left: 0;
     z-index: 1000;
     top: 0;
-    border-bottom: 1px solid #111;
     padding-left: 10px;
 }
 
@@ -116,13 +113,14 @@
 
 .libraryViewNav {
     text-align: center;
-    background-image: linear-gradient(#404040,#2d2d2d);
+    background-image: linear-gradient(#333,#333);
     border-bottom: 1px solid #111;
-    border-top: 0;
+    border-top: 1px solid #000;
+    font-family: sans-serif, Arial;
 }
 
     .libraryViewNav .ui-btn-active {
-        border: 0;
+        border: 0!important;
         background-color: #38c;
     }
 
@@ -131,6 +129,7 @@
         padding: .6em 1em;
         color: #eee!important;
         text-decoration: none;
+        margin: 1px 0;
     }
 
         .libraryViewNav a:hover {
@@ -523,7 +522,7 @@ a.itemTag:hover {
     .libraryPanelHeader span {
         color: #fff;
         vertical-align: middle;
-        font-size: 14px;
+        font-size: 15px;
         font-weight: 300;
     }
 
diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css
index e585787692..d076afa904 100644
--- a/dashboard-ui/css/mediaplayer.css
+++ b/dashboard-ui/css/mediaplayer.css
@@ -1,6 +1,4 @@
-
-
-/* Now playing bar */
+/* Now playing bar */
 .nowPlayingBar {
     padding: 6px 0 12px 0;
     border-top: 2px solid green;
@@ -119,7 +117,7 @@
     width: 130px;
 }
 
-.volumeSliderContainer  {
+.volumeSliderContainer {
     width: 90px;
 }
 
@@ -129,6 +127,9 @@
 
 .sliderContainer .ui-slider-track {
     margin-left: 15px !important;
+}
+
+.highPosition .ui-slider-track {
     z-index: 100000;
 }
 
@@ -318,4 +319,4 @@ input[type="range"]::-ms-fill-upper {
     .itemVideo {
         left: -710px;
     }
-}
\ No newline at end of file
+}
diff --git a/dashboard-ui/css/metadataeditor.css b/dashboard-ui/css/metadataeditor.css
index 9926d929d7..51ded46c33 100644
--- a/dashboard-ui/css/metadataeditor.css
+++ b/dashboard-ui/css/metadataeditor.css
@@ -92,7 +92,7 @@
 
     .editPageSidebar {
         position: fixed;
-        top: 36px;
+        top: 48px;
         bottom: 0;
         left: 0;
         width: 27.5%;
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index 9686d43588..f1818c0aca 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -11,7 +11,6 @@
                 <tr>
                     <td>
 
-                        <br />
                         <br />
                         <div id="views">
                         </div>
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 3bc60ca013..70a68af44a 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -10,7 +10,7 @@
 
     function renderHeader(page, user) {
 
-        var html = '<div class="viewMenuBar">';
+        var html = '<div class="viewMenuBar ui-bar-b">';
 
         html += '<button type="button" data-icon="bars" data-iconpos="notext" data-inline="true" title="Menu" class="libraryMenuButton" onclick="LibraryMenu.showLibraryMenu($(this).parents(\'.page\'));">Menu</button>';
 
@@ -221,11 +221,7 @@
 
             var link = links[i];
             
-            if (selectedIndex == i) {
-                html += '<li><a class="selectedLibraryPanelLink libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
-            } else {
-                html += '<li><a class="libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
-            }
+            html += '<li><a class="libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
         }
 
         html += '</ul>';
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index c619a63e34..afab402fd6 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -48,7 +48,7 @@
                 idleState = true;
                 $('.itemVideo').on('mousemove keydown scroll', idleHandler).trigger('mousemove');
             } else {
-                $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).removeClass("highPosition");
+                $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.sliderContainer,.barBackground", nowPlayingBar).removeClass("highPosition");
                 $('.itemVideo').removeClass('fullscreenVideo');
             }
 
@@ -218,7 +218,6 @@
 
             volumeSlider = $('.volumeSlider').on('slidestop', function () {
 
-                document.title += '1';
                 var vol = this.value;
 
                 updateVolumeButtons(vol);
@@ -699,12 +698,12 @@
                 window.clearTimeout(timeout);
             }
             if (idleState == true) {
-                $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).addClass("highPosition");
+                $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.sliderContainer,.barBackground", nowPlayingBar).addClass("highPosition");
             }
             idleState = false;
             timeout = window.setTimeout(function () {
                 idleState = true;
-                $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).removeClass("highPosition");
+                $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.sliderContainer,.barBackground", nowPlayingBar).removeClass("highPosition");
             }, 4000);
         }