From e4d25134516c9db68a5a41836b7738ffdf0c517b Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Thu, 7 Jun 2018 19:50:16 -0400
Subject: [PATCH] close search button

---
 src/public/images/icons/search-20.png           | Bin 0 -> 431 bytes
 src/public/images/icons/x.png                   | Bin 0 -> 259 bytes
 src/public/javascripts/services/search_notes.js |  15 +++++++++++----
 src/views/index.ejs                             |  12 ++++++++++--
 4 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 src/public/images/icons/search-20.png
 create mode 100644 src/public/images/icons/x.png

diff --git a/src/public/images/icons/search-20.png b/src/public/images/icons/search-20.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1c748801296e11a6a523f9158cd49be696b19c0
GIT binary patch
literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;sys7F9eC#l(7H+0X#`W
zK~y-)t<*nCLqQP7@sIHjrcty@r>H4xJcFny?UW$cS=o95i`>Bj2%_Q<EVR{1f|Z>S
zLBS>nM$p(yKp)S%_o4&KvdqqRXMQ`o{Id;Z_-C+yakOxQk3kNpM{qYWp3%TWURW6?
z5&VJ!>|h)FxDDSO7V~7*gB@WiWlssa=!687e!%)SSeCY%_>2U8wVNn&DyKYW0j;Jv
zXCu3V0+&~dn7yPXqBY>U0Prdi`vW)@^Lqi{Tg>BWz=xRU3IKcBwbGo!c#1wN<pefD
z!{w|EyE$NUXrmd)q}pV>fDShLz~=E9Ewh?+@?vQ68GW{f>3EV$QAIoaT^wU13tGYH
zx1i)`Vg-k>KE-G+IF0@oC0DT?C6;lIb6mz3b`hZ7Gu#^FYfIWll-<pvXAx+v-);ZN
Zz5r%%Pe8^;;Q9an002ovPDHLkV1iSbwP*kU

literal 0
HcmV?d00001

diff --git a/src/public/images/icons/x.png b/src/public/images/icons/x.png
new file mode 100644
index 0000000000000000000000000000000000000000..953d2df3ca13de52e2198e80bd3de3cc0dac31aa
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWS|IVfk$L9
zP{(x;W^~e+T>%tiFY)wsWq-uRF0QR-#xNrpC^W&-#WBR<^xI30d`$)dtq=Wmmw(}!
z*KGVCF1e?|bT5PF-775<xI{~iM{ljn|5vi?@T&S1Zp{XhI5mT(Gf2C{*gH6XN;>72
z)gG+1W1&>V^LgT4x6e7IA1=BeHeGc?Ot;{7%^TYocD<bY_<`N;(zgk9SA}j=rzP+I
yZ@MOB>A%f4b~ds1Su8mHL-t$6vNx;bU$g#LY<Q(MmM<6RHU>{uKbLh*2~7Zxj$;l0

literal 0
HcmV?d00001

diff --git a/src/public/javascripts/services/search_notes.js b/src/public/javascripts/services/search_notes.js
index b8b90d88c..d1b69dfc0 100644
--- a/src/public/javascripts/services/search_notes.js
+++ b/src/public/javascripts/services/search_notes.js
@@ -10,21 +10,26 @@ const $saveSearchButton = $("#save-search-button");
 const $searchBox = $("#search-box");
 const $searchResults = $("#search-results");
 const $searchResultsInner = $("#search-results-inner");
+const $closeSearchButton = $("#close-search-button");
 
 function showSearch() {
     $searchBox.show();
     $searchInput.focus();
 }
 
+function hideSearch() {
+    resetSearch();
+
+    $searchResults.hide();
+    $searchBox.hide();
+}
+
 function toggleSearch() {
     if ($searchBox.is(":hidden")) {
         showSearch();
     }
     else {
-        resetSearch();
-
-        $searchResults.hide();
-        $searchBox.hide();
+        hideSearch();
     }
 }
 
@@ -89,6 +94,8 @@ $resetSearchButton.click(resetSearch);
 
 $saveSearchButton.click(saveSearch);
 
+$closeSearchButton.click(hideSearch);
+
 export default {
     toggleSearch,
     resetSearch,
diff --git a/src/views/index.ejs b/src/views/index.ejs
index 3a6890149..0efe09cf4 100644
--- a/src/views/index.ejs
+++ b/src/views/index.ejs
@@ -76,13 +76,21 @@
         <div id="search-box" style="display: none; padding: 10px; margin-top: 10px;">
           <div style="display: flex; align-items: center;">
             <input name="search-text" placeholder="Search text, labels" style="flex-grow: 100; margin-left: 5px; margin-right: 5px;" autocomplete="off">
-            <button id="do-search-button" class="btn btn-sm" title="Search">Search</button>
+            <button id="do-search-button" class="btn btn-sm" title="Search (enter)" style="padding: 4px;">
+              <img src="/images/icons/search-20.png" alt="Search"/>
+            </button>
 
             &nbsp;
 
             <button id="save-search-button" class="btn btn-sm" title="Save search" style="padding: 4px;">
               <img src="/images/icons/save.png" alt="Save search"/>
             </button>
+
+            &nbsp;
+
+            <button id="close-search-button" class="btn btn-sm" title="Close search" style="padding: 4px;">
+              <img src="/images/icons/x.png" alt="Close search"/>
+            </button>
           </div>
         </div>
 
@@ -318,7 +326,7 @@
         <div style="display: flex; justify-content: space-between;">
           <button id="jump-to-note-button" class="btn btn-sm btn-primary">Jump <kbd>enter</kbd></button>
 
-          <button id="show-in-full-text-button" class="btn btn-sm">&lt;&lt; Show results in full text <kbd>ctrl+enter</kbd></button>
+          <button id="show-in-full-text-button" class="btn btn-sm">Search in full text <kbd>ctrl+enter</kbd></button>
         </div>
       </form>
     </div>