From 31bb9381267acc112fc046995b3824bf5aded2a6 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Sun, 8 May 2022 10:11:00 +0200 Subject: [PATCH] Remove theme choice: move searx/templates/simple to searx/templates --- searx/preferences.py | 7 +------ searx/settings.yml | 2 -- searx/settings_defaults.py | 1 - searx/static/themes/simple/gruntfile.js | 4 ++-- searx/templates/{simple => }/404.html | 2 +- searx/templates/{simple => }/base.html | 4 ++-- searx/templates/{simple => }/categories.html | 2 +- .../{simple => }/filters/languages.html | 0 .../{simple => }/filters/safesearch.html | 0 .../{simple => }/filters/time_range.html | 0 searx/templates/{simple => }/icons.html | 0 searx/templates/index.html | 8 +++++++ searx/templates/{simple => }/info.html | 2 +- searx/templates/{simple => }/infobox.html | 0 searx/templates/{simple => }/macros.html | 2 +- .../{simple => }/messages/no_cookies.html | 2 +- .../{simple => }/messages/no_results.html | 2 +- searx/templates/{simple => }/new_issue.html | 0 searx/templates/{simple => }/opensearch.xml | 0 .../{simple => }/opensearch_response_rss.xml | 0 .../{simple => }/page_with_header.html | 2 +- searx/templates/{simple => }/preferences.html | 21 +++++-------------- .../{simple => }/result_templates/code.html | 2 +- .../result_templates/default.html | 2 +- .../{simple => }/result_templates/images.html | 0 .../result_templates/key-value.html | 0 .../{simple => }/result_templates/map.html | 4 ++-- .../templates/result_templates/products.html | 14 +++++++++++++ .../result_templates/torrent.html | 2 +- .../{simple => }/result_templates/videos.html | 2 +- searx/templates/{simple => }/results.html | 10 ++++----- searx/templates/{simple => }/search.html | 10 ++++----- .../{simple => }/searxng-wordmark.min.svg | 0 searx/templates/simple/index.html | 8 ------- .../templates/{simple => }/simple_search.html | 0 searx/templates/{simple => }/stats.html | 6 +++--- searx/webapp.py | 16 ++++---------- searx/webutils.py | 5 ----- searxng_extra/standalone_searx.py | 2 +- tests/robot/settings_robot.yml | 1 - tests/unit/settings/user_settings.yml | 1 - tests/unit/test_preferences.py | 2 +- tests/unit/test_webadapter.py | 6 +++--- utils/lib_static.sh | 4 ++-- 44 files changed, 69 insertions(+), 89 deletions(-) rename searx/templates/{simple => }/404.html (89%) rename searx/templates/{simple => }/base.html (97%) rename searx/templates/{simple => }/categories.html (96%) rename searx/templates/{simple => }/filters/languages.html (100%) rename searx/templates/{simple => }/filters/safesearch.html (100%) rename searx/templates/{simple => }/filters/time_range.html (100%) rename searx/templates/{simple => }/icons.html (100%) create mode 100644 searx/templates/index.html rename searx/templates/{simple => }/info.html (91%) rename searx/templates/{simple => }/infobox.html (100%) rename searx/templates/{simple => }/macros.html (98%) rename searx/templates/{simple => }/messages/no_cookies.html (82%) rename searx/templates/{simple => }/messages/no_results.html (95%) rename searx/templates/{simple => }/new_issue.html (100%) rename searx/templates/{simple => }/opensearch.xml (100%) rename searx/templates/{simple => }/opensearch_response_rss.xml (100%) rename searx/templates/{simple => }/page_with_header.html (86%) rename searx/templates/{simple => }/preferences.html (96%) rename searx/templates/{simple => }/result_templates/code.html (83%) rename searx/templates/{simple => }/result_templates/default.html (89%) rename searx/templates/{simple => }/result_templates/images.html (100%) rename searx/templates/{simple => }/result_templates/key-value.html (100%) rename searx/templates/{simple => }/result_templates/map.html (93%) create mode 100644 searx/templates/result_templates/products.html rename searx/templates/{simple => }/result_templates/torrent.html (92%) rename searx/templates/{simple => }/result_templates/videos.html (88%) rename searx/templates/{simple => }/results.html (97%) rename searx/templates/{simple => }/search.html (82%) rename searx/templates/{simple => }/searxng-wordmark.min.svg (100%) delete mode 100644 searx/templates/simple/index.html rename searx/templates/{simple => }/simple_search.html (100%) rename searx/templates/{simple => }/stats.html (97%) diff --git a/searx/preferences.py b/searx/preferences.py index fdb4f5008..0676f2e06 100644 --- a/searx/preferences.py +++ b/searx/preferences.py @@ -290,7 +290,7 @@ class PluginsSetting(BooleanChoices): class Preferences: """Validates and saves preferences to cookies""" - def __init__(self, themes: List[str], categories: List[str], engines: Dict[str, Engine], plugins: Iterable[Plugin]): + def __init__(self, categories: List[str], engines: Dict[str, Engine], plugins: Iterable[Plugin]): super().__init__() self.key_value_settings: Dict[str, Setting] = { @@ -340,11 +340,6 @@ class Preferences: '2': 2 } ), - 'theme': EnumStringSetting( - settings['ui']['default_theme'], - locked=is_locked('theme'), - choices=themes - ), 'results_on_new_tab': MapSetting( settings['ui']['results_on_new_tab'], locked=is_locked('results_on_new_tab'), diff --git a/searx/settings.yml b/searx/settings.yml index 63d6be3cd..adbe83460 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -91,8 +91,6 @@ ui: query_in_title: false # infinite_scroll: When true, automatically loads the next page when scrolling to bottom of the current page. infinite_scroll: false - # ui theme - default_theme: simple # center the results ? center_alignment: false # Default interface locale - leave blank to detect from browser information or diff --git a/searx/settings_defaults.py b/searx/settings_defaults.py index 3185dd7bd..7916aba94 100644 --- a/searx/settings_defaults.py +++ b/searx/settings_defaults.py @@ -180,7 +180,6 @@ SCHEMA = { 'static_path': SettingsDirectoryValue(str, os.path.join(searx_dir, 'static')), 'static_use_hash': SettingsValue(bool, False), 'templates_path': SettingsDirectoryValue(str, os.path.join(searx_dir, 'templates')), - 'default_theme': SettingsValue(str, 'simple'), 'default_locale': SettingsValue(str, ''), 'theme_args': { 'simple_style': SettingsValue(SIMPLE_STYLE, 'auto'), diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index 630cac212..257bc7642 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -145,7 +145,7 @@ module.exports = function (grunt) { svgo: ['--config', 'svg4web.svgo.js'] }, files: { - '<%= _templates %>/simple/searxng-wordmark.min.svg': '<%= _brand %>/searxng-wordmark.svg', + '<%= _templates %>/searxng-wordmark.min.svg': '<%= _brand %>/searxng-wordmark.svg', 'img/searxng.svg': '<%= _brand %>/searxng.svg', 'img/img_load_error.svg': '<%= _brand %>/img_load_error.svg' } @@ -192,7 +192,7 @@ module.exports = function (grunt) { 'heart-outline': 'node_modules/ionicons/dist/svg/heart-outline.svg', 'information-circle-outline': 'src/svg/information-circle-outline.svg', }, - dest: '../../../templates/simple/icons.html', + dest: '../../../templates/icons.html', }, }, }); diff --git a/searx/templates/simple/404.html b/searx/templates/404.html similarity index 89% rename from searx/templates/simple/404.html rename to searx/templates/404.html index 1a10514cc..0405b9bbf 100644 --- a/searx/templates/simple/404.html +++ b/searx/templates/404.html @@ -1,4 +1,4 @@ -{% extends "simple/base.html" %} +{% extends "base.html" %} {% block content %}

{{ _('Page not found') }}

diff --git a/searx/templates/simple/base.html b/searx/templates/base.html similarity index 97% rename from searx/templates/simple/base.html rename to searx/templates/base.html index a2464a1a5..55a3f842b 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/base.html @@ -28,7 +28,7 @@ -
+
{% if errors %}