From 10cbd378c813fb94c829107d5d87c929ba754b4f Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Mon, 18 Jul 2022 17:41:17 +0200
Subject: [PATCH] Search is working on click and keyup

---
 .../web/themes/custom/pro1ka/js/script.js     | 33 +++++++++++++------
 .../custom/pro1ka/templates/page.html.twig    |  2 +-
 .../pro1ka/templates/parts/header.html.twig   |  2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
index f55031058..31adf9139 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
+++ b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
@@ -23,6 +23,11 @@
             jQuery('.searchform').css('top', '2%');
         }
 
+        // Sidebar menu
+        if(jQuery('.sidebar_menu .region-sidebar-menu').length < 1){
+          jQuery('.sidebar_menu').hide();
+        }
+
         // Prikaži polje za iskanje
         jQuery('.searchbutton').on('click', function(){
 
@@ -35,23 +40,25 @@
 
         // ISKANJE
         jQuery('#forma-iskanje-header').keyup(function(event){
-          if (event.keyCode == 13) {
-            var iskaniNiz = jQuery('#iskanje-input').val();
 
-            var action = jQuery('#forma-iskanje-header').attr('data-action');
+          if (event.keyCode == 13)
+            iskanjeBesede(jQuery('#iskanje-input').val());
 
-            window.location.href = action + '/search/vsebina?keys=' +iskaniNiz;
-          }
         });
 
         jQuery('#forma-iskanje-second').keyup(function(event){
-          if (event.keyCode == 13) {
-            var iskaniNiz = jQuery('#iskanje-input-second').val();
 
-            var action = jQuery('#forma-iskanje-second').attr('data-action');
+          if (event.keyCode == 13)
+            iskanjeBesede(jQuery('#iskanje-input-second').val())
 
-            window.location.href = action + '/search/vsebina?keys=' +iskaniNiz;
-          }
+        });
+
+        jQuery('#ikona-iskanje-input').on('click', function(){
+          iskanjeBesede(jQuery('#iskanje-input').val())
+        });
+
+        jQuery('#ikona-sikanje-second').on('click', function(){
+          iskanjeBesede(jQuery('#iskanje-input-second').val())
         });
 
         // Odjava v Drupalu
@@ -1115,4 +1122,10 @@ function odpriAaiLoginObvestilo(){
   }
 }
 
+function iskanjeBesede(iskanjeNiz){
+  var action = jQuery('#forma-iskanje-header').attr('data-action');
+
+  window.location.href = action + '/iskanje/' +iskaniNiz;
+}
+
 
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig
index b4985a53e..d101657ea 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig
@@ -36,7 +36,7 @@
               <div class="w-form ">
                 <div id="forma-iskanje-second" data-action="{{ site_url }}">
                   <input type="text" class="text-field w-input" maxlength="256" name="name" id="iskanje-input-second">
-                  <input type="submit" value="" data-wait="Please wait..." class="submit-button w-button">
+                  <input type="submit" value="" data-wait="Please wait..." id="ikona-sikanje-second" class="submit-button w-button">
                 </div>
               </div>
             {# end polje za iskanje#}
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig
index 1deb87f60..f658d7994 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/header.html.twig
@@ -11,7 +11,7 @@
         <div class="w-form">
           <div id="forma-iskanje-header" data-action="{{ site_url }}" style="display: flex;">
             <input type="text" class="text-field-2 w-input" maxlength="256" name="iskanje-input" placeholder="Kaj iščete?" id="iskanje-input">
-            <input type="submit" value="" data-wait="Please wait..." class="submit-button-2 w-button">
+            <input type="submit" value="" data-wait="Please wait..." id="ikona-iskanje-input" class="submit-button-2 w-button">
             <img src="/tema1ka/svg/icons-x.svg" loading="lazy" alt="" class="hide-search">
           </div>
         </div>