From 1b700738ebcd5327685f36bc32205a2d6169922e Mon Sep 17 00:00:00 2001
From: GazoilKerozen <72867517+GazoilKerozen@users.noreply.github.com>
Date: Mon, 30 Nov 2020 16:30:21 +0100
Subject: [PATCH] [fix] fix the reset button in the oscar theme (#2306)

Rely on javascript instead of type="clear"

Close #2009
---
 .../themes/oscar/css/logicodev-dark.css       |  15 +++++++++++++++
 .../themes/oscar/css/logicodev-dark.min.css   | Bin 14977 -> 15165 bytes
 searx/static/themes/oscar/css/logicodev.css   |  15 +++++++++++++++
 .../static/themes/oscar/css/logicodev.min.css | Bin 11537 -> 11725 bytes
 searx/static/themes/oscar/js/searx.js         |   7 +++++++
 searx/static/themes/oscar/js/searx.min.js     | Bin 5649 -> 5722 bytes
 .../oscar/js/searx_src/element_modifiers.js   |   7 +++++++
 searx/templates/oscar/search.html             |   2 +-
 8 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/searx/static/themes/oscar/css/logicodev-dark.css b/searx/static/themes/oscar/css/logicodev-dark.css
index d3e61eaea..e767d57ae 100644
--- a/searx/static/themes/oscar/css/logicodev-dark.css
+++ b/searx/static/themes/oscar/css/logicodev-dark.css
@@ -175,6 +175,10 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
   font-size: 10px;
   float: right;
 }
+.result-abstract {
+  margin-top: 0.5em;
+  margin-bottom: 0.8em;
+}
 .external-link {
   color: #068922;
   font-size: 12px;
@@ -238,6 +242,17 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
 .result-torrent .leechers {
   color: #f35e77;
 }
+.result-metadata {
+  clear: both;
+  margin: 1em;
+}
+.result-metadata td {
+  padding-right: 1em;
+  color: #a4a4a4;
+}
+.result-metadata td:first-of-type {
+  color: #666666;
+}
 .result-map {
   clear: both;
 }
diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css b/searx/static/themes/oscar/css/logicodev-dark.min.css
index 6018b54ea49f536bce951a57e279cd242b1c105c..c4b09ae19cb5c08d439dc1e84802e3c3953e2cf9 100644
GIT binary patch
delta 200
zcmZoH-CMRHozti&wYW5=L^m<1xTGjCxuiNbu_!$=Pq!q$z)H_FHP;%-Ps%ST$<MXY
zvq;UId{0k&a}B2ubA4(_VoG93Vs&y(YGRQUP)P<<xs_pRZmk~F=v=5Wg_4x&g2a@R
z%)E5nqRjM+5|AqE<oulcA}i%Y6A;9v$0{wesJKKoKTWr!vLLk@s@}}ZtafuN&mUa?
D5NAuQ

delta 17
Ycmdm6)>yhBopbYSPIczZUc8@m0YujZ^#A|>

diff --git a/searx/static/themes/oscar/css/logicodev.css b/searx/static/themes/oscar/css/logicodev.css
index 45a2597ae..8e582750e 100644
--- a/searx/static/themes/oscar/css/logicodev.css
+++ b/searx/static/themes/oscar/css/logicodev.css
@@ -148,6 +148,10 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
   font-size: 10px;
   float: right;
 }
+.result-abstract {
+  margin-top: 0.5em;
+  margin-bottom: 0.8em;
+}
 .external-link {
   color: #068922;
   font-size: 12px;
@@ -211,6 +215,17 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
 .result-torrent .leechers {
   color: #f35e77;
 }
+.result-metadata {
+  clear: both;
+  margin: 1em;
+}
+.result-metadata td {
+  padding-right: 1em;
+  color: #a4a4a4;
+}
+.result-metadata td:first-of-type {
+  color: #666666;
+}
 .result-map {
   clear: both;
 }
diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css
index dff693bd585e91f4a2128bd30e0fc1e2d1104e40..c39f757d6a2042de25619713e750a8f2a1b5f592 100644
GIT binary patch
delta 196
zcmbOjbvAm#6)vNq)Z)^d65Yh4;*z4o<dW*##G>@fJl&G~0xLb!)Ld&QKPkVYBtO?m
z&muK<^Cd1#=K9o<#FWI6#Oman)WjkypmYXQsg+@BZmk~F*j%VGg_4x&g2a@R%)E5n
zqRjM+5|AqE<oulcA}i%Y6A;9v$0{wesJKKoKTWr!vLLk@s@}}ZtakG!UU_){K|)GD

delta 17
ZcmX>bJuzy-6|T)3-0IAmxATd~0{}y)20s7*

diff --git a/searx/static/themes/oscar/js/searx.js b/searx/static/themes/oscar/js/searx.js
index 8eb4d76c5..8208ce461 100644
--- a/searx/static/themes/oscar/js/searx.js
+++ b/searx/static/themes/oscar/js/searx.js
@@ -123,6 +123,13 @@ $(document).ready(function(){
      */
     $('#q.autofocus').focus();
 
+    /**
+     * Empty search bar when click on reset button
+     */
+    $("#clear_search").click(function () {
+	document.getElementById("q").value = "";
+    });
+
     /**
      * select full content on click if class="select-all-on-click"
      */
diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js
index d54cb4c4ce111d4207c2e9dcd74ea677f014347d..1e3b96a2ebffd2f45b0c6e83057408cda24ef367 100644
GIT binary patch
delta 102
zcmbQJb4zD}B&)H3uA$*XIce77)Wo8SjgA+Y-IbGbfb4jXKyrqXre1PRW^%ShT4`Q#
zNoIbYhGun2esXDUYF>$6dTNPlPAZ7$ROy+bp;QP|U6z<rnrf@0RJ)m%g+&Me451=p

delta 33
pcmcbmGf`)PB&&hBu7Tx5Icbi>;^fTC-2D8Fb{Cm9N3;AF1OT=$3wi(m

diff --git a/searx/static/themes/oscar/js/searx_src/element_modifiers.js b/searx/static/themes/oscar/js/searx_src/element_modifiers.js
index 31fe760d5..a113df9a3 100644
--- a/searx/static/themes/oscar/js/searx_src/element_modifiers.js
+++ b/searx/static/themes/oscar/js/searx_src/element_modifiers.js
@@ -21,6 +21,13 @@ $(document).ready(function(){
      */
     $('#q.autofocus').focus();
 
+    /**
+     * Empty search bar when click on reset button
+     */
+    $("#clear_search").click(function () {
+	document.getElementById("q").value = "";
+    });
+
     /**
      * select full content on click if class="select-all-on-click"
      */
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
index c82aab7ea..2b3758efd 100644
--- a/searx/templates/oscar/search.html
+++ b/searx/templates/oscar/search.html
@@ -6,7 +6,7 @@
         <input type="search" autofocus name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
         <span class="input-group-btn">
             <button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
-            <button type="reset" class="btn btn-default" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
+	    <button type="button" id="clear_search" class="btn btn-default hide_if_nojs" aria-label="{{ _('Clear search') }}">{{ icon('remove') }}</button>
         </span>
       </div>
     </div>