From 45e70e0c13eefd544ccb1d960cadf8a8f37b58f2 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 4 May 2019 17:49:00 +0200
Subject: [PATCH] #274 - added button in navbar search

---
 src/main/resources/static/css/dark/style.css    | 4 ++++
 src/main/resources/static/css/style.css         | 4 ++++
 src/main/resources/static/js/main.js            | 5 +++++
 src/main/resources/templates/helpers/navbar.ftl | 3 ++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/static/css/dark/style.css b/src/main/resources/static/css/dark/style.css
index 621c7e215..744ce7f06 100644
--- a/src/main/resources/static/css/dark/style.css
+++ b/src/main/resources/static/css/dark/style.css
@@ -120,6 +120,10 @@ main {
     box-shadow: none;
 }
 
+.sidenav #buttonSearch {
+    right: 3rem;
+}
+
 .sidenav li > a, .sidenav-sub li > a {
     color: #FFFFFF;
     font-weight: 600;
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 332b7c9cc..804126a3b 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -139,6 +139,10 @@ main {
     color: #212121;
 }
 
+.sidenav #buttonSearch {
+    right: 3rem;
+}
+
 .btn, .btn-flat {
     text-transform: none;
     font-weight: 600;
diff --git a/src/main/resources/static/js/main.js b/src/main/resources/static/js/main.js
index b5354a992..012a310b3 100644
--- a/src/main/resources/static/js/main.js
+++ b/src/main/resources/static/js/main.js
@@ -30,6 +30,11 @@ $( document ).ready(function() {
         document.getElementById("login-password").focus();
     }
 
+    $("#buttonSearch").click(function()
+    {
+        document.getElementById("navbarSearchForm").submit();
+    });
+
     $("#buttonClearSearch").click(function()
     {
         document.getElementById("search").value = "";
diff --git a/src/main/resources/templates/helpers/navbar.ftl b/src/main/resources/templates/helpers/navbar.ftl
index 4309369a3..6f4c845f3 100644
--- a/src/main/resources/templates/helpers/navbar.ftl
+++ b/src/main/resources/templates/helpers/navbar.ftl
@@ -64,7 +64,7 @@
 <#macro itemSearch>
     <nav class="searchWrapper">
         <div class="nav-wrapper">
-            <form action="<@s.url '/search'/>" method="get">
+            <form id="navbarSearchForm" action="<@s.url '/search'/>" method="get">
                 <input type="hidden" name="searchName" value="true">
                 <input type="hidden" name="searchDescription" value="true">
                 <input type="hidden" name="searchCategory" value="true">
@@ -73,6 +73,7 @@
                 <div class="input-field">
                     <input id="search" class="text-color" name="searchText" type="search">
                     <label class="label-icon" for="search"><i class="material-icons">search</i></label>
+                    <i id="buttonSearch" class="material-icons">send</i>
                     <i id="buttonClearSearch" class="material-icons">close</i>
                 </div>
             </form>
-- 
GitLab