From b3651b72acbf22f9a99e65f04343a8eb491392a1 Mon Sep 17 00:00:00 2001
From: obfuscated-loop <codemailbox@protonmail.com>
Date: Wed, 22 Nov 2023 23:15:37 +0000
Subject: [PATCH] [mod] Move static preference URLs back to General in
 Preferences and apply CSS

---
 .../themes/simple/src/less/definitions.less   |  2 ++
 .../themes/simple/src/less/preferences.less   | 10 +++++++
 searx/templates/simple/preferences.html       |  1 +
 .../templates/simple/preferences/cookies.html | 26 +------------------
 .../simple/preferences/url_card.html          | 26 +++++++++++++++++++
 5 files changed, 40 insertions(+), 25 deletions(-)
 create mode 100644 searx/templates/simple/preferences/url_card.html

diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less
index 45d5c878d..debf1d2cf 100644
--- a/searx/static/themes/simple/src/less/definitions.less
+++ b/searx/static/themes/simple/src/less/definitions.less
@@ -94,6 +94,7 @@
   --color-toolkit-kbd-background: #000;
   --color-toolkit-dialog-border: #ddd;
   --color-toolkit-dialog-background: #fff;
+  --color-toolkit-card-background: #f4f4f4;
   --color-toolkit-tabs-label-border: #fff;
   --color-toolkit-tabs-section-border: #ddd;
   --color-toolkit-select-background: #e1e1e1;
@@ -206,6 +207,7 @@
   --color-toolkit-kbd-background: #fff;
   --color-toolkit-dialog-border: #555;
   --color-toolkit-dialog-background: #1e1e22;
+  --color-toolkit-card-background: #17181a;
   --color-toolkit-tabs-label-border: #222;
   --color-toolkit-tabs-section-border: #555;
   --color-toolkit-select-background: #313338;
diff --git a/searx/static/themes/simple/src/less/preferences.less b/searx/static/themes/simple/src/less/preferences.less
index c22e4af38..537e81cc2 100644
--- a/searx/static/themes/simple/src/less/preferences.less
+++ b/searx/static/themes/simple/src/less/preferences.less
@@ -190,6 +190,16 @@ table {
       width: 100%;
     }
   }
+
+  div.saved_prefs_url_card {
+    background-color: var(--color-toolkit-card-background);
+    border-radius: 10px;
+    padding: 10px;
+
+    h4:nth-of-type(1) {
+      margin-top: 2px;
+    }
+  }
 }
 
 @media screen and (max-width: @tablet) {
diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html
index 9dab84fd1..fb33494f6 100644
--- a/searx/templates/simple/preferences.html
+++ b/searx/templates/simple/preferences.html
@@ -181,6 +181,7 @@
       {%- include 'simple/preferences/doi_resolver.html' -%}
     {%- endif -%}
     {%- include 'simple/preferences/tokens.html' -%}
+    {%- include 'simple/preferences/url_card.html' -%}
     {{- tab_footer() -}}
 
 
diff --git a/searx/templates/simple/preferences/cookies.html b/searx/templates/simple/preferences/cookies.html
index f84251ef6..09c91a592 100644
--- a/searx/templates/simple/preferences/cookies.html
+++ b/searx/templates/simple/preferences/cookies.html
@@ -18,28 +18,4 @@
   </table>
 {%- else -%}
   {% include 'simple/messages/no_cookies.html' %}
-{% endif %}
-<h4>
-  {{- _('Search URL of the currently saved preferences') -}}:{{- '' -}}
-</h4>{{- '' -}}
-<div class="selectable_url">{{- '' -}}
-  <pre>
-    {{- url_for('index', _external=True) -}}?preferences={{- preferences_url_params|e -}}
-    {%- raw -%}&amp;q=%s{%- endraw -%}
-  </pre>{{- '' -}}
-</div>{{- '' -}}
-<p class="small_font">
-  {{- _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') -}}
-</p>
-<h4>
-  {{- _('URL to restore your preferences in another browser') -}}:{{- '' -}}
-</h4>{{- '' -}}
-<div class="selectable_url">{{- '' -}}
-  <pre>
-    {{- url_for('preferences', _external=True) -}}?preferences={{- preferences_url_params|e -}}
-    &amp;save=1{{- '' -}}
-  </pre>{{- '' -}}
-</div>{{- '' -}}
-<p class="small_font">
-  {{- _('Specifying custom settings in the preferences URL can be used to sync preferences across devices.') -}}
-</p>
+{% endif %}
\ No newline at end of file
diff --git a/searx/templates/simple/preferences/url_card.html b/searx/templates/simple/preferences/url_card.html
new file mode 100644
index 000000000..2be80c1a8
--- /dev/null
+++ b/searx/templates/simple/preferences/url_card.html
@@ -0,0 +1,26 @@
+<div class="saved_prefs_url_card">
+  <h4>
+    {{- _('Search URL of the currently saved preferences') -}}:{{- '' -}}
+  </h4>{{- '' -}}
+  <div class="selectable_url">{{- '' -}}
+    <pre>
+      {{- url_for('index', _external=True) -}}?preferences={{- preferences_url_params|e -}}
+      {%- raw -%}&amp;q=%s{%- endraw -%}
+    </pre>{{- '' -}}
+  </div>{{- '' -}}
+  <p class="small_font">
+    {{- _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') -}}
+  </p>
+  <h4>
+    {{- _('URL to restore your preferences in another browser') -}}:{{- '' -}}
+  </h4>{{- '' -}}
+  <div class="selectable_url">{{- '' -}}
+    <pre>
+      {{- url_for('preferences', _external=True) -}}?preferences={{- preferences_url_params|e -}}
+      &amp;save=1{{- '' -}}
+    </pre>{{- '' -}}
+  </div>{{- '' -}}
+  <p class="small_font">
+    {{- _('Specifying custom settings in the preferences URL can be used to sync preferences across devices.') -}}
+  </p>
+</div>
\ No newline at end of file