From e8541b6006cd6a00556957433c9de64c23ba0c84 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sat, 30 Apr 2022 08:01:53 +0200
Subject: [theme] peel out oscar from SearXNG development

This is the first step of removing oscar theme

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/preferences.py                            | 5 -----
 searx/settings.yml                              | 2 --
 searx/settings_defaults.py                      | 2 --
 searx/templates/oscar/messages/no_cookies.html  | 5 -----
 searx/templates/simple/messages/no_cookies.html | 5 +++++
 searx/templates/simple/preferences.html         | 2 +-
 6 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 searx/templates/oscar/messages/no_cookies.html
 create mode 100644 searx/templates/simple/messages/no_cookies.html

(limited to 'searx')

diff --git a/searx/preferences.py b/searx/preferences.py
index e493dadc0..cd943af66 100644
--- a/searx/preferences.py
+++ b/searx/preferences.py
@@ -362,11 +362,6 @@ class Preferences:
                 locked=is_locked('doi_resolver'),
                 choices=DOI_RESOLVERS
             ),
-            'oscar-style': EnumStringSetting(
-                settings['ui']['theme_args']['oscar_style'],
-                locked=is_locked('oscar-style'),
-                choices=['', 'logicodev', 'logicodev-dark', 'pointhi']
-            ),
             'simple_style': EnumStringSetting(
                 settings['ui']['theme_args']['simple_style'],
                 locked=is_locked('simple_style'),
diff --git a/searx/settings.yml b/searx/settings.yml
index c476b1321..6e5556d0c 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -86,8 +86,6 @@ ui:
   # Open result links in a new tab by default
   # results_on_new_tab: false
   theme_args:
-    # default style of oscar
-    oscar_style: logicodev
     # style of simple theme: auto, light, dark
     simple_style: auto
 
diff --git a/searx/settings_defaults.py b/searx/settings_defaults.py
index e3efb8544..7110fce93 100644
--- a/searx/settings_defaults.py
+++ b/searx/settings_defaults.py
@@ -18,7 +18,6 @@ searx_dir = abspath(dirname(__file__))
 logger = logging.getLogger('searx')
 OUTPUT_FORMATS = ['html', 'csv', 'json', 'rss']
 LANGUAGE_CODES = ['all'] + list(l[0] for l in languages)
-OSCAR_STYLE = ('logicodev', 'logicodev-dark', 'pointhi')
 SIMPLE_STYLE = ('auto', 'light', 'dark')
 CATEGORIES_AS_TABS = {
     'general': {},
@@ -181,7 +180,6 @@ SCHEMA = {
         'default_theme': SettingsValue(str, 'simple'),
         'default_locale': SettingsValue(str, ''),
         'theme_args': {
-            'oscar_style': SettingsValue(OSCAR_STYLE, 'logicodev'),
             'simple_style': SettingsValue(SIMPLE_STYLE, 'auto'),
         },
         'results_on_new_tab': SettingsValue(bool, False),
diff --git a/searx/templates/oscar/messages/no_cookies.html b/searx/templates/oscar/messages/no_cookies.html
deleted file mode 100644
index 9bebc8ad1..000000000
--- a/searx/templates/oscar/messages/no_cookies.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% from 'oscar/macros.html' import icon %}
-<div class="alert alert-info fade in" role="alert">
-    <strong class="lead">{{ icon('info-sign') }} {{ _('Information!') }}</strong>
-    {{ _('currently, there are no cookies defined.') }}
-</div>
diff --git a/searx/templates/simple/messages/no_cookies.html b/searx/templates/simple/messages/no_cookies.html
new file mode 100644
index 000000000..a9898b4e3
--- /dev/null
+++ b/searx/templates/simple/messages/no_cookies.html
@@ -0,0 +1,5 @@
+{% from 'simple/icons.html' import icon %}
+<div class="alert alert-info fade in" role="alert">
+    <strong class="lead">{{ icon('info-sign') }} {{ _('Information!') }}</strong>
+    {{ _('currently, there are no cookies defined.') }}
+</div>
diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html
index fef003d5e..2278237b5 100644
--- a/searx/templates/simple/preferences.html
+++ b/searx/templates/simple/preferences.html
@@ -399,7 +399,7 @@
        {% endfor %}
      </table>
      {% else %}
-        {% include 'oscar/messages/no_cookies.html' %}
+        {% include 'simple/messages/no_cookies.html' %}
      {% endif %}
      <h4>{{ _('Search URL of the currently saved preferences') }} :</h4>
      <div class="selectable_url">
-- 
cgit v1.2.3