From 17ada9f98ecefbd60d8031e53591f09b6c0ab833 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 27 Jun 2016 18:53:42 -0400
Subject: [PATCH] update search

---
 dashboard-ui/nowplaying.html       |  2 +-
 dashboard-ui/scripts/searchpage.js | 17 ++++++++++++++++-
 dashboard-ui/scripts/site.js       |  3 +--
 dashboard-ui/search.html           | 10 +++++++---
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 5c18a51ff1..7c8162c7af 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -1,4 +1,4 @@
-<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-contextname="${TitleRemoteControl}" data-theme="b">
+<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-contextname="${TitleRemoteControl}" data-theme="b" style="padding:0;">
 
     <div class="remoteControlContent">
 
diff --git a/dashboard-ui/scripts/searchpage.js b/dashboard-ui/scripts/searchpage.js
index 956eeab8b0..5f161c0ddb 100644
--- a/dashboard-ui/scripts/searchpage.js
+++ b/dashboard-ui/scripts/searchpage.js
@@ -1,4 +1,4 @@
-define(['libraryBrowser', 'focusManager', 'emby-input', 'paper-icon-button-light', 'material-icons'], function (libraryBrowser, focusManager) {
+define(['libraryBrowser', 'focusManager', 'embyRouter', 'emby-input', 'paper-icon-button-light', 'material-icons'], function (libraryBrowser, focusManager, embyRouter) {
 
     function loadSuggestions(page) {
 
@@ -180,5 +180,20 @@
             onSearchChange(this.value);
         });
 
+        view.querySelector('.btnBack').addEventListener('click', function () {
+            embyRouter.back();
+        });
+
+        view.addEventListener('viewbeforeshow', function (e) {
+            document.body.classList.add('hiddenViewMenuBar');
+            document.body.classList.add('hiddenNowPlayingBar');
+        });
+
+        view.addEventListener('viewbeforehide', function (e) {
+
+            document.body.classList.remove('hiddenViewMenuBar');
+            document.body.classList.remove('hiddenNowPlayingBar');
+        });
+
     };
 });
\ No newline at end of file
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 822fb6acc1..9d9e8a7ec1 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2896,8 +2896,7 @@ var AppInfo = {};
         defineRoute({
             path: '/search.html',
             dependencies: [],
-            controller: 'scripts/searchpage',
-            transition: 'slidedown'
+            controller: 'scripts/searchpage'
         });
 
         defineRoute({
diff --git a/dashboard-ui/search.html b/dashboard-ui/search.html
index c06f5ad10d..44a77deeee 100644
--- a/dashboard-ui/search.html
+++ b/dashboard-ui/search.html
@@ -1,11 +1,15 @@
-<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" data-backbutton="true">
+<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" data-backbutton="true" style="padding-top:40px!important;">
+
+    <button is="paper-icon-button-light" style="position: absolute; top: .5em; left: .5em; z-index: 1;" tabindex="-1" class="btnBack autoSize">
+        <i class="md-icon">arrow_back</i>
+    </button>
 
     <div data-role="content">
         <div class="readOnlyContent" style="text-align: center;margin: 0 auto;">
 
-            <div class="inputContainer">
+            <div class="inputContainer" style="margin-bottom:1em;">
                 <div style="display: flex; align-items: center;">
-                    <i class="md-icon" style="width:28px;height:28px;font-size:28px;color:#ccc;">search</i>
+                    <i class="md-icon" style="width:28px;height:28px;font-size:28px;color:#aaa;">search</i>
                     <div style="flex-grow:1;">
                         <input is="emby-input" class="txtSearch" autocomplete="off" autofocus />
                     </div>