searxng · dalf · May 8, 2022 · May 13, 2022 · May 13, 2022 · return42
diff --git a/docs/admin/api.rst b/docs/admin/api.rst
@@ -24,7 +24,6 @@ Sample response
        "images",
      ],
      "default_locale": "",
-     "default_theme": "simple",
      "engines": [
        {
          "categories": [

diff --git a/docs/admin/engines/nosql-engines.rst b/docs/admin/engines/nosql-engines.rst
@@ -18,12 +18,12 @@ All of the engines above are just commented out in the :origin:`settings.yml
 dependencies before using them.
 
 By default, the engines use the ``key-value`` template for displaying results /
-see :origin:`simple <searx/templates/simple/result_templates/key-value.html>`
-theme.  If you are not satisfied with the original result layout, you can use
-your own template, set ``result_template`` attribute to ``{template_name}`` and
-place the templates at::
+see :origin:`simple <searx/templates/result_templates/key-value.html>`.
+If you are not satisfied with the original result layout, you can use your own
+template, set ``result_template`` attribute to ``{template_name}`` and place
+the templates at::
 
-  searx/templates/{theme_name}/result_templates/{template_name}
+  searx/templates/result_templates/{template_name}
 
 Futhermore, if you do not wish to expose these engines on a public instance, you
 can still add them and limit the access by setting ``tokens`` as described in

diff --git a/docs/admin/engines/settings.rst b/docs/admin/engines/settings.rst
@@ -232,7 +232,6 @@ Global Settings
      query_in_title: false
      infinite_scroll: false
      center_alignment: false
-     default_theme: simple
      theme_args:
        simple_style: auto
 
@@ -254,9 +253,6 @@ Global Settings
   side of the screen.  This setting only affects the *desktop layout*
   (:origin:`min-width: @tablet <searx/static/themes/simple/src/less/definitions.less>`)
 
-``default_theme`` :
-  Name of the theme you want to use by default on your SearXNG instance.
-
 ``theme_args.simple_style``:
   Style of simple theme: ``auto``, ``light``, ``dark``
 

diff --git a/docs/admin/engines/sql-engines.rst b/docs/admin/engines/sql-engines.rst
@@ -30,12 +30,12 @@ engines, e.g. ``database:`` ...
      query_str: ...
 
 By default, the engines use the ``key-value`` template for displaying results /
-see :origin:`simple <searx/templates/simple/result_templates/key-value.html>`
-theme.  If you are not satisfied with the original result layout, you can use
+see :origin:`simple <searx/templates/result_templates/key-value.html>`.
+If you are not satisfied with the original result layout, you can use
 your own template, set ``result_template`` attribute to ``{template_name}`` and
 place the templates at::
 
-  searx/templates/{theme_name}/result_templates/{template_name}
+  searx/templates/result_templates/{template_name}
 
 If you do not wish to expose these engines on a public instance, you can still
 add them and limit the access by setting ``tokens`` as described in section

diff --git a/docs/dev/quickstart.rst b/docs/dev/quickstart.rst
@@ -25,7 +25,7 @@ choose a meaningful commit message and we are happy to receive your pull
 request. To not end in *wild west* we have some directives, please pay attention
 to our ":ref:`how to contribute`" guideline.
 
-If you implement themes, you will need to setup a :ref:`make node.env` once:
+If you implement theme, you will need to setup a :ref:`make node.env` once:
 
 .. code:: sh
 

diff --git a/docs/dev/search_api.rst b/docs/dev/search_api.rst
@@ -75,15 +75,6 @@ Parameters
   Filter search results of engines which support safe search.  See if an engine
   supports safe search in the preferences page of an instance.
 
-``theme`` : default ``simple``
-  [ ``simple`` ]
-
-  Theme of instance.
-
-  Please note, available themes depend on an instance.  It is possible that an
-  instance administrator deleted, created or renamed themes on their instance.
-  See the available options in the preferences page of the instance.
-
 ``enabled_plugins`` : optional
   List of enabled plugins.
 

diff --git a/searx/preferences.py b/searx/preferences.py
@@ -290,7 +290,7 @@ def transform_form_items(self, items):
 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 @@ def __init__(self, themes: List[str], categories: List[str], engines: Dict[str,
                     '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
@@ -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
@@ -180,7 +180,6 @@ def apply_schema(settings, schema, path_list):
         '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
@@ -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 → searx/templates/404.html b/searx/templates/simple/404.html → searx/templates/404.html
@@ -1,4 +1,4 @@
-{% extends "simple/base.html" %}
+{% extends "base.html" %}
 {% block content %}
 <div class="center">
     <h1>{{ _('Page not found') }}</h1>

diff --git a/searx/templates/simple/base.html → searx/templates/base.html b/searx/templates/simple/base.html → searx/templates/base.html
@@ -28,7 +28,7 @@
   <link rel="icon" href="{{ url_for('static', filename='img/favicon.svg') }}" type="image/svg+xml">
 </head>
 <body class="{{ endpoint }}_endpoint" >
-  <main id="main_{{  self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}" class="{{body_class}}">
+  <main id="main_{{  self._TemplateReference__context.name|replace(".html", "") }}" class="{{body_class}}">
     {% if errors %}
         <div class="dialog-error" role="alert">
             <a href="#" class="close" aria-label="close" title="close">×</a>
@@ -41,7 +41,7 @@
     {% endif %}
 
     <nav id="links_on_top">
-      {%- from 'simple/icons.html' import icon_big -%}
+      {%- from 'icons.html' import icon_big -%}
       {%- block linkto_about -%}
         <a href="{{ url_for('info', pagename='about') }}" class="link_on_top_about">{{ icon_big('information-circle-outline') }}<span>{{ _('About') }}</span></a>
       {%- endblock -%}

diff --git a/searx/templates/simple/categories.html → searx/templates/categories.html b/searx/templates/simple/categories.html → searx/templates/categories.html
@@ -1,4 +1,4 @@
-{% from 'simple/icons.html' import icon_big %}
+{% from 'icons.html' import icon_big %}
 {%- set category_icons = {
     'general': 'search-outline',
     'images': 'image-outline',

diff --git a/...x/templates/simple/filters/languages.html → searx/templates/filters/languages.html b/...x/templates/simple/filters/languages.html → searx/templates/filters/languages.html
diff --git a/.../templates/simple/filters/safesearch.html → searx/templates/filters/safesearch.html b/.../templates/simple/filters/safesearch.html → searx/templates/filters/safesearch.html
diff --git a/.../templates/simple/filters/time_range.html → searx/templates/filters/time_range.html b/.../templates/simple/filters/time_range.html → searx/templates/filters/time_range.html
diff --git a/searx/templates/simple/icons.html → searx/templates/icons.html b/searx/templates/simple/icons.html → searx/templates/icons.html
diff --git a/searx/templates/index.html b/searx/templates/index.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% from 'icons.html' import icon_big %}
+{% block content %}
+<div class="index">
+    <div class="title"><h1>SearXNG</h1></div>
+    {% include 'simple_search.html' %}
+</div>
+{% endblock %}
diff --git a/searx/templates/simple/info.html → searx/templates/info.html b/searx/templates/simple/info.html → searx/templates/info.html
@@ -1,4 +1,4 @@
-{% extends 'simple/page_with_header.html' %}
+{% extends 'page_with_header.html' %}
 {% block title %}{{ active_page.title }} - {% endblock %}
 {% block linkto_about %}{% endblock %}
 {% block linkto_donate %}{% endblock %}

diff --git a/searx/templates/simple/infobox.html → searx/templates/infobox.html b/searx/templates/simple/infobox.html → searx/templates/infobox.html
diff --git a/searx/templates/simple/macros.html → searx/templates/macros.html b/searx/templates/simple/macros.html → searx/templates/macros.html
@@ -1,4 +1,4 @@
-{% from 'simple/icons.html' import icon_small %}
+{% from 'icons.html' import icon_small %}
 
 <!-- Draw favicon -->
 {% macro draw_favicon(favicon) -%}

diff --git a/...templates/simple/messages/no_cookies.html → searx/templates/messages/no_cookies.html b/...templates/simple/messages/no_cookies.html → searx/templates/messages/no_cookies.html
@@ -1,4 +1,4 @@
-{% from 'simple/icons.html' import icon %}
+{% from '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.') }}

diff --git a/...templates/simple/messages/no_results.html → searx/templates/messages/no_results.html b/...templates/simple/messages/no_results.html → searx/templates/messages/no_results.html
@@ -1,4 +1,4 @@
-{% from 'simple/icons.html' import icon_big %}
+{% from 'icons.html' import icon_big %}
 {% if unresponsive_engines %}
 <div class="dialog-error" role="alert">
   {{ icon_big('warning') }}

diff --git a/searx/templates/simple/new_issue.html → searx/templates/new_issue.html b/searx/templates/simple/new_issue.html → searx/templates/new_issue.html
diff --git a/searx/templates/simple/opensearch.xml → searx/templates/opensearch.xml b/searx/templates/simple/opensearch.xml → searx/templates/opensearch.xml
diff --git a/...plates/simple/opensearch_response_rss.xml → searx/templates/opensearch_response_rss.xml b/...plates/simple/opensearch_response_rss.xml → searx/templates/opensearch_response_rss.xml
diff --git a/searx/templates/simple/page_with_header.html → searx/templates/page_with_header.html b/searx/templates/simple/page_with_header.html → searx/templates/page_with_header.html
@@ -1,5 +1,5 @@
 {% set body_class = "page_with_header" %}
-{% extends "simple/base.html" %}
+{% extends "base.html" %}
 {% block header %}
 <a href="{{ url_for('index') }}"><img class="logo" src="{{ url_for('static', filename='img/searxng.png') }}" alt="SearXNG"></a>
 {% endblock %}
diff --git a/searx/templates/simple/preferences.html → searx/templates/preferences.html b/searx/templates/simple/preferences.html → searx/templates/preferences.html
@@ -1,7 +1,7 @@
-{% from 'simple/macros.html' import tabs_open, tabs_close, tab_header, tab_footer, checkbox_onoff, checkbox %}
-{% from 'simple/icons.html' import icon_big %}
+{% from 'macros.html' import tabs_open, tabs_close, tab_header, tab_footer, checkbox_onoff, checkbox %}
+{% from 'icons.html' import icon_big %}
 
-{% extends "simple/page_with_header.html" %}
+{% extends "page_with_header.html" %}
 
 {%- macro plugin_preferences(section) -%}
 {%- for plugin in plugins -%}
@@ -107,7 +107,7 @@ <h1>{{ _('Preferences') }}</h1>
     <fieldset>
       <legend>{{ _('Default categories') }}</legend>
       {% set display_tooltip = false %}
-      {% include 'simple/categories.html' %}
+      {% include 'categories.html' %}
     </fieldset>
     {% endif %}
     {% if 'language' not in locked_preferences %}
@@ -191,17 +191,6 @@ <h1>{{ _('Preferences') }}</h1>
     </fieldset>
     {% endif %}
     {% if 'theme' not in locked_preferences %}
-    <fieldset>
-      <legend id="pref_theme">{{ _('Theme') }}</legend>
-      <p class="value">
-        <select name="theme" aria-labelledby="pref_theme">
-          {%- for name in themes -%}
-          <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
-          {%- endfor -%}
-        </select>
-      </p>
-      <div class="description">{{ _('Change SearXNG layout') }}</div>
-    </fieldset>
     <fieldset>
       <legend id="pref_simple_style">{{ _('Theme style') }}</legend>
       <p class="value">
@@ -409,7 +398,7 @@ <h1>{{ _('Preferences') }}</h1>
        {% endfor %}
      </table>
      {% else %}
-        {% include 'simple/messages/no_cookies.html' %}
+        {% include 'messages/no_cookies.html' %}
      {% endif %}
      <h4>{{ _('Search URL of the currently saved preferences') }} :</h4>
      <div class="selectable_url">

diff --git a/...mplates/simple/result_templates/code.html → searx/templates/result_templates/code.html b/...mplates/simple/result_templates/code.html → searx/templates/result_templates/code.html
@@ -1,4 +1,4 @@
-{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %}
+{% from 'macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %}
 
 {{ result_header(result, favicons, image_proxify) -}}
 {{- result_sub_header(result) -}}

diff --git a/...ates/simple/result_templates/default.html → ...x/templates/result_templates/default.html b/...ates/simple/result_templates/default.html → ...x/templates/result_templates/default.html
@@ -1,4 +1,4 @@
-{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %}
+{% from 'macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %}
 
 {{ result_header(result, favicons, image_proxify) -}}
 {{- result_sub_header(result) -}}

diff --git a/...lates/simple/result_templates/images.html → searx/templates/result_templates/images.html b/...lates/simple/result_templates/images.html → searx/templates/result_templates/images.html
diff --git a/...es/simple/result_templates/key-value.html → ...templates/result_templates/key-value.html b/...es/simple/result_templates/key-value.html → ...templates/result_templates/key-value.html
diff --git a/...emplates/simple/result_templates/map.html → searx/templates/result_templates/map.html b/...emplates/simple/result_templates/map.html → searx/templates/result_templates/map.html
@@ -1,5 +1,5 @@
-{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %}
-{% from 'simple/icons.html' import icon_small %}
+{% from 'macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %}
+{% from 'icons.html' import icon_small %}
 
 {{ result_header(result, favicons, image_proxify) -}}
 {{- result_sub_header(result) -}}

diff --git a/searx/templates/result_templates/products.html b/searx/templates/result_templates/products.html
@@ -0,0 +1,14 @@
+{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_footer_rtl with context %}
+
+{{ result_header(result, favicons, image_proxify) -}}
+{{- result_sub_header(result) -}}
+{% if result.price %}<div class="result_price">{{ result.price }}</div></br>{% endif %}
+{% if result.shipping %}<div class="result_shipping">{{ result.shipping }}</div></br>{% endif %}
+{% if result.source_country %}<div class="result_source_country">{{ result.source_country }}</div></br>{% endif %}
+{%- if result.content %}
+  <p class="content">
+    {{ result.content }}
+  </p>
+{% endif -%}
+{{- result_sub_footer(result, proxify) -}}
+{{- result_footer(result) }}
diff --git a/...ates/simple/result_templates/torrent.html → ...x/templates/result_templates/torrent.html b/...ates/simple/result_templates/torrent.html → ...x/templates/result_templates/torrent.html
@@ -1,4 +1,4 @@
-{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_link with context %}
+{% from 'macros.html' import result_header, result_sub_header, result_sub_footer, result_footer, result_link with context %}
 
 {{ result_header(result, favicons, image_proxify) -}}
 {{- result_sub_header(result) -}}

diff --git a/...lates/simple/result_templates/videos.html → searx/templates/result_templates/videos.html b/...lates/simple/result_templates/videos.html → searx/templates/result_templates/videos.html
@@ -1,4 +1,4 @@
-{% from 'simple/macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %}
+{% from 'macros.html' import result_header, result_sub_header, result_sub_footer, result_footer with context %}
 
 {{ result_header(result, favicons, image_proxify) }}
 {{ result_sub_header(result) }}

diff --git a/searx/templates/simple/results.html → searx/templates/results.html b/searx/templates/simple/results.html → searx/templates/results.html
@@ -1,5 +1,5 @@
-{% extends "simple/base.html" %}
-{% from 'simple/icons.html' import icon, icon_big, icon_small %}
+{% extends "base.html" %}
+{% from 'icons.html' import icon, icon_big, icon_small %}
 {% macro engine_data_form(engine_data) -%}
     {% for engine_name, kv_data in engine_data.items() %}
         {% for k, v in kv_data.items() %}
@@ -10,7 +10,7 @@
 {% block title %}{% if query_in_title %}{{- q|e }} - {% endif %}{% endblock %}
 {% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q|e }}" href="{{ url_for('search', _external=True) }}?q={{ q|urlencode }}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}&amp;pageno={{ pageno }}&amp;time_range={{ time_range }}&amp;language={{ current_language }}&amp;safesearch={{ safesearch }}&amp;format=rss">{% endblock %}
 {% block content %}
-{% include 'simple/search.html' %}
+{% include 'search.html' %}
 
 {% if results and results|map(attribute='template')|unique|list|count == 1 %}
   {% set only_template = 'only_template_' + results[0]['template']|default('default')|replace('.html', '') %}
@@ -58,7 +58,7 @@
         {% if infoboxes %}
         <div id="infoboxes">
            {% for infobox in infoboxes -%}
-             {% include 'simple/infobox.html' %}
+             {% include 'infobox.html' %}
            {%- endfor %}
         </div>
         {% endif %}
@@ -145,7 +145,7 @@ <h4 id="corrections-title">{{ _('Try searching for:') }}</h4>
         {% if result.close_group and not only_template %}</div>{% endif %}
     {% endfor %}
     {% if not results and not answers %}
-        {% include 'simple/messages/no_results.html' %}
+        {% include 'messages/no_results.html' %}
     {% endif %}
     </div>
     <div id="backToTop">

diff --git a/searx/templates/simple/search.html → searx/templates/search.html b/searx/templates/simple/search.html → searx/templates/search.html
@@ -2,7 +2,7 @@
   <div id="search_header">
     <a id="search_logo" href="{{ url_for('index') }}" tabindex="0" title="{{ _('Display the front page') }}">
       <span hidden>SearXNG</span>
-      {% include 'simple/searxng-wordmark.min.svg' without context %}
+      {% include 'searxng-wordmark.min.svg' without context %}
     </a>
     <div id="search_view">
       <div class="search_box">
@@ -12,12 +12,12 @@
       </div>
     </div>
     {% set display_tooltip = true %}
-    {% include 'simple/categories.html' %}
+    {% include 'categories.html' %}
   </div>
   <div class="search_filters">
-    {% include 'simple/filters/languages.html' %}
-    {% include 'simple/filters/time_range.html' %}
-    {% include 'simple/filters/safesearch.html' %}
+    {% include 'filters/languages.html' %}
+    {% include 'filters/time_range.html' %}
+    {% include 'filters/safesearch.html' %}
   </div>
   <input type="hidden" name="theme" value="{{ theme }}" >
   {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %}

diff --git a/...templates/simple/searxng-wordmark.min.svg → searx/templates/searxng-wordmark.min.svg b/...templates/simple/searxng-wordmark.min.svg → searx/templates/searxng-wordmark.min.svg
diff --git a/searx/templates/simple/index.html b/searx/templates/simple/index.html
diff --git a/searx/templates/simple/simple_search.html → searx/templates/simple_search.html b/searx/templates/simple/simple_search.html → searx/templates/simple_search.html
diff --git a/searx/templates/simple/stats.html → searx/templates/stats.html b/searx/templates/simple/stats.html → searx/templates/stats.html
@@ -1,7 +1,7 @@
-{% from 'simple/icons.html' import icon_big %}
-{% from 'simple/new_issue.html' import new_issue with context %}
+{% from 'icons.html' import icon_big %}
+{% from 'new_issue.html' import new_issue with context %}
 
-{% extends "simple/page_with_header.html" %}
+{% extends "page_with_header.html" %}
 
 {%- macro th_sort(column_order, column_name) -%}
     {% if selected_engine_name %}