diff --git a/src/main/resources/static/css/dark/style.css b/src/main/resources/static/css/dark/style.css index 621c7e215749f6beab06cd09f4023c239a068235..744ce7f06df67653e86b2c0a425c7e8a91c2a236 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 332b7c9cc3ec54062685377936751e7e690ef757..804126a3bb787abf9bfff0948c41388f5c7865b7 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 b5354a992a482b25ec35a3bca589d6c61d66b8a8..012a310b3a78bdaf282e5ef0f3f6d5f60506fe74 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 4309369a366345a5e3726df73d4ffe68c8d8246f..6f4c845f3ffa761b7b2467e68e0cae9f680cd7fa 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>