From e8541b6006cd6a00556957433c9de64c23ba0c84 Mon Sep 17 00:00:00 2001 From: Markus Heiser 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 --- searx/templates/oscar/messages/no_cookies.html | 5 ----- searx/templates/simple/messages/no_cookies.html | 5 +++++ searx/templates/simple/preferences.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 searx/templates/oscar/messages/no_cookies.html create mode 100644 searx/templates/simple/messages/no_cookies.html (limited to 'searx/templates') 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 %} - 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 %} + 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 %} {% else %} - {% include 'oscar/messages/no_cookies.html' %} + {% include 'simple/messages/no_cookies.html' %} {% endif %}

{{ _('Search URL of the currently saved preferences') }} :

-- cgit v1.2.3 From ad1aca682318657955369b1f2cb28a86bc25394c Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 30 Apr 2022 08:04:09 +0200 Subject: [theme] delete static/themes/oscar and templates/oscar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Markus Heiser templates/oscar# gelöscht: searx/static/themes/oscar/fonts/glyphicons-halflings-regular.ttf --- searx/templates/oscar/404.html | 9 - searx/templates/oscar/advanced.html | 17 - searx/templates/oscar/base.html | 114 ----- searx/templates/oscar/categories.html | 13 - searx/templates/oscar/index.html | 21 - searx/templates/oscar/info.html | 12 - searx/templates/oscar/infobox.html | 49 -- searx/templates/oscar/languages.html | 10 - searx/templates/oscar/macros.html | 145 ------ searx/templates/oscar/messages/first_time.html | 8 - .../oscar/messages/no_data_available.html | 5 - searx/templates/oscar/messages/no_results.html | 20 - .../oscar/messages/save_settings_successfull.html | 9 - searx/templates/oscar/messages/unknow_error.html | 9 - searx/templates/oscar/navbar.html | 9 - searx/templates/oscar/preferences.html | 509 --------------------- searx/templates/oscar/result_templates/code.html | 18 - .../templates/oscar/result_templates/default.html | 38 -- searx/templates/oscar/result_templates/files.html | 55 --- searx/templates/oscar/result_templates/images.html | 36 -- .../oscar/result_templates/key-value.html | 19 - searx/templates/oscar/result_templates/map.html | 76 --- .../templates/oscar/result_templates/products.html | 22 - .../templates/oscar/result_templates/torrent.html | 25 - searx/templates/oscar/result_templates/videos.html | 29 -- searx/templates/oscar/results.html | 196 -------- searx/templates/oscar/search.html | 25 - searx/templates/oscar/search_full.html | 19 - searx/templates/oscar/stats.html | 157 ------- searx/templates/oscar/time-range.html | 19 - 30 files changed, 1693 deletions(-) delete mode 100644 searx/templates/oscar/404.html delete mode 100644 searx/templates/oscar/advanced.html delete mode 100644 searx/templates/oscar/base.html delete mode 100644 searx/templates/oscar/categories.html delete mode 100644 searx/templates/oscar/index.html delete mode 100644 searx/templates/oscar/info.html delete mode 100644 searx/templates/oscar/infobox.html delete mode 100644 searx/templates/oscar/languages.html delete mode 100644 searx/templates/oscar/macros.html delete mode 100644 searx/templates/oscar/messages/first_time.html delete mode 100644 searx/templates/oscar/messages/no_data_available.html delete mode 100644 searx/templates/oscar/messages/no_results.html delete mode 100644 searx/templates/oscar/messages/save_settings_successfull.html delete mode 100644 searx/templates/oscar/messages/unknow_error.html delete mode 100644 searx/templates/oscar/navbar.html delete mode 100644 searx/templates/oscar/preferences.html delete mode 100644 searx/templates/oscar/result_templates/code.html delete mode 100644 searx/templates/oscar/result_templates/default.html delete mode 100644 searx/templates/oscar/result_templates/files.html delete mode 100644 searx/templates/oscar/result_templates/images.html delete mode 100644 searx/templates/oscar/result_templates/key-value.html delete mode 100644 searx/templates/oscar/result_templates/map.html delete mode 100644 searx/templates/oscar/result_templates/products.html delete mode 100644 searx/templates/oscar/result_templates/torrent.html delete mode 100644 searx/templates/oscar/result_templates/videos.html delete mode 100644 searx/templates/oscar/results.html delete mode 100644 searx/templates/oscar/search.html delete mode 100644 searx/templates/oscar/search_full.html delete mode 100644 searx/templates/oscar/stats.html delete mode 100644 searx/templates/oscar/time-range.html (limited to 'searx/templates') diff --git a/searx/templates/oscar/404.html b/searx/templates/oscar/404.html deleted file mode 100644 index cdb31db73..000000000 --- a/searx/templates/oscar/404.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "oscar/base.html" %} -{% block content %} -
-

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

- {% autoescape false %} -

{{ _('Go to %(search_page)s.', search_page='{}'.format(url_for('index'), _('search page'))) }}

- {% endautoescape %} -
-{% endblock %} diff --git a/searx/templates/oscar/advanced.html b/searx/templates/oscar/advanced.html deleted file mode 100644 index 0b13d50d6..000000000 --- a/searx/templates/oscar/advanced.html +++ /dev/null @@ -1,17 +0,0 @@ - - -
- {% include 'oscar/categories.html' %} - -
-
- {%- include 'oscar/time-range.html' -%} -
-
- {%- include 'oscar/languages.html' -%} -
-
-
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html deleted file mode 100644 index dbc0699df..000000000 --- a/searx/templates/oscar/base.html +++ /dev/null @@ -1,114 +0,0 @@ -{% from 'oscar/macros.html' import icon %} - - - - - - - - - - {% block meta %}{% endblock %} - {% block title %}{% endblock %}{{ instance_name }} - - {% if preferences.get_value('oscar-style') -%} - {{' '}} - {%- else -%} - {{' '}} - {%- endif %} - - {% set templates = results|map(attribute='template')|unique|list -%} - {%- set load_leaflet = 'map.html' in templates -%} - {%- if load_leaflet -%} - {{' '}} - {%- endif %} - - {%- for css in styles %} - - {% endfor %} - - - - {% block styles %} - {% endblock %} - {% block head %} - {% endblock %} - - - - - - {% include 'oscar/navbar.html' %} - -
- {% if errors %} - - {% endif %} - - {% block site_alert_error %} - {% endblock %} - {% block site_alert_warning %} - {% endblock %} - {% block site_alert_info %} - {% endblock %} - {% block site_alert_success %} - {% endblock %} - - {% block content %} - {% endblock %} - -
- - - - {% if load_leaflet %}{{" "}}{{ "\n" }}{% endif %} - {% if autocomplete %}{{" "}}{{ "\n" }}{% endif %} - - - {% for script in scripts %} - {{""}} - {% endfor %} - - - diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html deleted file mode 100644 index 39d1e1d33..000000000 --- a/searx/templates/oscar/categories.html +++ /dev/null @@ -1,13 +0,0 @@ -
-{%- if rtl -%} - {% for category in categories_as_tabs | reverse -%} - {{- '' -}} - - {%- endfor %} -{%- else -%} - {% for category in categories_as_tabs -%} - {{- '' -}} - - {%- endfor %} -{%- endif -%} -
diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html deleted file mode 100644 index 0e7e7863a..000000000 --- a/searx/templates/oscar/index.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "oscar/base.html" %} -{% block content %} -
-
{{- "" -}} -
- {%- if cookies['oscar-style'] == 'pointhi' -%} -

searx logoSearXNG

- {%- else -%} - - {%- endif -%} -
{{- "" -}} -
-
-
- {% include 'oscar/search_full.html' %} -
-
-
-{% endblock %} diff --git a/searx/templates/oscar/info.html b/searx/templates/oscar/info.html deleted file mode 100644 index c12446a08..000000000 --- a/searx/templates/oscar/info.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "oscar/base.html" %} -{% block title %}{{ active_page.title }} - {% endblock %} -{% block content %} - -{{ active_page.html | safe }} -{% endblock %} diff --git a/searx/templates/oscar/infobox.html b/searx/templates/oscar/infobox.html deleted file mode 100644 index 8a12b8074..000000000 --- a/searx/templates/oscar/infobox.html +++ /dev/null @@ -1,49 +0,0 @@ -{% from 'oscar/macros.html' import result_link with context %} -
-
{{- "" -}} -
-
- {% for engine in infobox.engines %} - {{ engine }} - {% endfor %} -
-

{{ infobox.infobox }}

{{- "" -}} - {% for u in infobox.urls %}{% if u.official %} {{ u.url }}{% endif %}{% endfor %} -
-
- -
- {% if infobox.img_src %}{% endif %} - - {% if infobox.content %}

{{ infobox.content | safe }}

{% endif %} - - {% if infobox.attributes -%} - - {% for attribute in infobox.attributes -%} - {{- "" -}} - - {%- if attribute.image -%} - - {%- else -%} - - {%- endif -%} - - {% endfor -%} -
{{ attribute.label }}{{ attribute.image.alt }}{{ attribute.value }}
- {% endif %} - - {% if infobox.urls -%} -
{{- "\n" -}} - - {%- for url in infobox.urls -%} -

{{ result_link(url.url, url.title) }}

- {% endfor -%} -
{{- "" -}} -
- {% endif %} -
- -
diff --git a/searx/templates/oscar/languages.html b/searx/templates/oscar/languages.html deleted file mode 100644 index c0ecb440e..000000000 --- a/searx/templates/oscar/languages.html +++ /dev/null @@ -1,10 +0,0 @@ -{% from 'oscar/macros.html' import custom_select_class %} - - diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html deleted file mode 100644 index 2b27cfd28..000000000 --- a/searx/templates/oscar/macros.html +++ /dev/null @@ -1,145 +0,0 @@ - -{% macro icon(action, alt) -%} - -{%- endmacro %} - - -{% macro draw_favicon(favicon) -%} - {{ favicon }} -{%- endmacro %} - -{%- macro result_link(url, title, classes='', id='') -%} -{{ title }} -{%- endmacro -%} - - -{% macro result_header(result, favicons, id) -%} -

{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }}{% endif %}{% if result.url %}{{ result_link(result.url, result.title|safe, id=id) }}{% else %}{{ result.title|safe}}{% endif %}

-{%- endmacro %} - - -{% macro result_sub_header(result, id) -%} - {%- if result.publishedDate %}{% endif -%} - {%- if result.magnetlink %} • {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink", id) }}{% endif -%} - {%- if result.torrentfile %} • {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile", id) }}{% endif -%} - {%- if result.metadata %}
{{ result.metadata|safe }}
{% endif -%} -{%- endmacro %} - - -{% macro result_footer(result, id) -%} -
{{- "" -}} -
- {%- for engine in result.engines -%} - {{ engine }} - {%- endfor -%} - {%- if result.url -%} - {%- if result.cached_url -%} - {{ result_link(result.cached_url, icon('link') + _('cached'), "text-info", id) }} - {%- elif not result.is_onion -%} - {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }} - {%- endif -%} - {%- endif -%} - {%- if proxify and proxify_results -%} - {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }} - {%- endif -%} -
- {%- if result.pretty_url -%} - - {%- endif -%} -{%- endmacro %} - - -{% macro result_footer_nocache(result) -%} -
{{- "" -}} -
- {%- for engine in result.engines -%} - {{ engine }} - {%- endfor -%} - {%- if proxify and proxify_results -%} - {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }} - {%- endif -%} -
{{- "" -}} - -{%- endmacro %} - - -{% macro result_footer_rtl(result, id) -%} -
- {%- for engine in result.engines -%} - {{ engine }} - {%- endfor -%} - {%- if result.url -%} - {%- if result.cached_url -%} - {{ result_link(result.cached_url, icon('link') + _('cached'), "text-info", id) }} - {%- elif not result.is_onion -%} - {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }} - {%- endif -%} - {%- endif -%} - {%- if proxify and proxify_results -%} - {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }} - {%- endif -%} - {%- if result.pretty_url -%} - - {%- endif -%} -{%- endmacro %} - - -{% macro result_footer_nocache_rtl(result) -%} -
- {%- for engine in result.engines -%} - {{ engine }} - {%- endfor -%} - {%- if proxify and proxify_results -%} - {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }} - {%- endif -%} - -{%- endmacro %} - -{% macro preferences_item_header(info, label, rtl, id) -%} - {%- if rtl -%} -
{{- "" -}} - {{- "" -}} - {{ info }}{{- "" -}} -
- {%- else -%} -
{{- "" -}} - {{- "" -}} -
- {%- endif -%} -{%- endmacro %} - -{% macro preferences_item_footer(info, label, rtl) -%} - {%- if rtl -%} -
{{- "" -}} -
- {%- else -%} -
- {{ info }}{{- "" -}} -
- {%- endif -%} -{%- endmacro %} - -{% macro custom_select_class(rtl) -%} -custom-select{% if rtl %}-rtl{% endif %} -{%- endmacro %} - -{% macro checkbox_toggle(id, blocked) -%} -
{{- "" -}} - {{- "" -}} - {{- "" -}} - {{- "" -}} -
{{- "" -}} -{%- endmacro %} - -{% macro support_toggle(supports) -%} - {%- if supports == '?' -%} - {{- "" -}} - {%- elif supports -%} - {{- "" -}} - {%- else -%} - {{- "" -}} - {%- endif -%} -{%- endmacro %} diff --git a/searx/templates/oscar/messages/first_time.html b/searx/templates/oscar/messages/first_time.html deleted file mode 100644 index 8b29d7020..000000000 --- a/searx/templates/oscar/messages/first_time.html +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/searx/templates/oscar/messages/no_data_available.html b/searx/templates/oscar/messages/no_data_available.html deleted file mode 100644 index aee791766..000000000 --- a/searx/templates/oscar/messages/no_data_available.html +++ /dev/null @@ -1,5 +0,0 @@ -{% from 'oscar/macros.html' import icon %} - diff --git a/searx/templates/oscar/messages/no_results.html b/searx/templates/oscar/messages/no_results.html deleted file mode 100644 index 16026daad..000000000 --- a/searx/templates/oscar/messages/no_results.html +++ /dev/null @@ -1,20 +0,0 @@ -{% from 'oscar/macros.html' import icon %} -{% if unresponsive_engines %} - -{% else %} - -{% endif %} diff --git a/searx/templates/oscar/messages/save_settings_successfull.html b/searx/templates/oscar/messages/save_settings_successfull.html deleted file mode 100644 index 63e578c70..000000000 --- a/searx/templates/oscar/messages/save_settings_successfull.html +++ /dev/null @@ -1,9 +0,0 @@ -{% from 'oscar/macros.html' import icon %} - diff --git a/searx/templates/oscar/messages/unknow_error.html b/searx/templates/oscar/messages/unknow_error.html deleted file mode 100644 index 3c4c9c15d..000000000 --- a/searx/templates/oscar/messages/unknow_error.html +++ /dev/null @@ -1,9 +0,0 @@ -{% from 'oscar/macros.html' import icon %} - diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html deleted file mode 100644 index f5401c382..000000000 --- a/searx/templates/oscar/navbar.html +++ /dev/null @@ -1,9 +0,0 @@ -
{{- "" -}} - {{- "" -}} - {{ instance_name }}{{- "" -}} - {{- "" -}} - {{- "" -}} - {{ _('about') }}{{- "" -}} - {{ _('preferences') }}{{- "" -}} - {{- "" -}} -
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html deleted file mode 100644 index 1a5219b07..000000000 --- a/searx/templates/oscar/preferences.html +++ /dev/null @@ -1,509 +0,0 @@ -{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle, support_toggle, custom_select_class %} -{% extends "oscar/base.html" %} -{%- macro engine_about(search_engine, id) -%} -{% if search_engine.about is defined or stats[search_engine.name]['result_count'] > 0 %} -{% set about = search_engine.about %} - -{%- endif -%} -{%- endmacro %} - -{%- macro engine_time(engine_name, css_align_class) -%} -{{- "" -}} - {%- if stats[engine_name].time != None -%} - {{- stats[engine_name].time -}}{{- "" -}} - {{- "" -}} - - {%- endif -%} - -{%- endmacro -%} - -{%- macro engine_reliability(engine_name, css_align_class) -%} -{% set r = reliabilities.get(engine_name, {}).get('reliablity', None) %} -{% set checker_result = reliabilities.get(engine_name, {}).get('checker', []) %} -{% set errors = reliabilities.get(engine_name, {}).get('errors', []) %} -{% if r != None %} - {% if r <= 50 %}{% set label = 'danger' %} - {% elif r < 80 %}{% set label = 'warning' %} - {% elif r < 90 %}{% set label = 'default' %} - {% else %}{% set label = 'success' %} - {% endif %} -{% else %} - {% set r = '' %} -{% endif %} -{% if checker_result or errors %} -{{- "" -}} - {{- "" -}} - - {{ icon('exclamation-sign', 'The engine is not reliabled') }} {{ r -}} - {{- "" -}} - {{- "" -}} - {{- "" -}} - -{%- else -%} -{{ r }} -{%- endif -%} -{%- endmacro -%} - -{%- macro plugin_of_category(plugin_category) -%} -{%- for plugin in plugins -%} - {%- if plugin.preference_section == plugin_category -%} - {{- preferences_item_header(_(plugin.description), _(plugin.name), rtl, 'plugin_' + plugin.id) -}} - {{- checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) -}} - {{- preferences_item_footer(_(plugin.description), _(plugin.name), rtl) -}} - {%- endif -%} -{%- endfor -%} -{% endmacro %} - -{%- block title %}{{ _('preferences') }} - {% endblock -%} - -{% block content %} - -
- -

{{ _('Preferences') }}

-
- - - - - - -
-
-
-
- {% if 'categories' not in locked_preferences %} -
- {% if rtl %} -
- {% include 'oscar/categories.html' %} -
- - {% else %} - -
- {% include 'oscar/categories.html' %} -
- {% endif %} -
- {% endif %} - {% if 'language' not in locked_preferences %} - {% set language_label = _('Search language') %} - {% set language_info = _('What language do you prefer for search?') %} - {{ preferences_item_header(language_info, language_label, rtl, 'language') }} - {% include 'oscar/languages.html' %} - {{ preferences_item_footer(language_info, language_label, rtl) }} - {% endif %} - - {% if 'safesearch' not in locked_preferences %} - {% set safesearch_label = _('SafeSearch') %} - {% set safesearch_info = _('Filter content') %} - {{ preferences_item_header(safesearch_info, safesearch_label, rtl, 'safesearch') }} - - {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }} - {% endif %} - - {% if 'autocomplete' not in locked_preferences %} - {% set autocomplete_label = _('Autocomplete') %} - {% set autocomplete_info = _('Find stuff as you type') %} - {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl, 'autocomplete') }} - - {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }} - {% endif %} - - {{ plugin_of_category('general' )}} - - {% if 'doi_resolver' not in locked_preferences %} - {% set label = _('Open Access DOI resolver') %} - {% set info = _('Redirect to open-access versions of publications when available (plugin required)') %} - {{ preferences_item_header(info, label, rtl, 'doi_resolver') }} - - {{ preferences_item_footer(info, label, rtl) }} - {% endif %} - - {{ plugin_of_category('onion' )}} - - {% set label = _('Engine tokens') %} - {% set info = _('Access tokens for private engines') %} - {{ preferences_item_header(info, label, rtl, 'tokens') }} - - {{ preferences_item_footer(info, label, rtl) }} -
-
-
-
- -
-
- {% if 'locale' not in locked_preferences %} - {% set locale_label = _('Interface language') %} - {% set locale_info = _('Change the language of the layout') %} - {{ preferences_item_header(locale_info, locale_label, rtl, 'locale') }} - - {{ preferences_item_footer(locale_info, locale_label, rtl) }} - {% endif %} - - {% if 'theme' not in locked_preferences %} - {% set theme_label = _('Theme') %} - {% set theme_info = _('Change SearXNG layout') %} - {{ preferences_item_header(theme_info, theme_label, rtl, 'theme') }} - - {{ preferences_item_footer(theme_info, theme_label, rtl) }} - {% endif %} - - {% if 'oscar-style' not in locked_preferences %} - {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl, 'oscar_style') }} - - {{ preferences_item_footer(_('Choose style for this theme'), _('Style'), rtl) }} - {% endif %} - - {% set label = _('Show advanced settings') %} - {% set info = _('Show advanced settings panel in the home page by default') %} - {{ preferences_item_header(info, label, rtl, 'advanced_search') }} - - {{ preferences_item_footer(info, label, rtl) }} - - {% if 'results_on_new_tab' not in locked_preferences %} - {% set label = _('Results on new tabs') %} - {% set info = _('Open result links on new browser tabs') %} - {{ preferences_item_header(info, label, rtl, 'results_on_new_tab') }} - - {{ preferences_item_footer(info, label, rtl) }} - {% endif %} - - {% if 'infinite_scroll' not in locked_preferences %} - {% set label = _('Infinite scroll') %} - {% set info = _('Automatically load next page when scrolling to bottom of current page') %} - {{ preferences_item_header(info, label, rtl, 'infinite_scroll') }} - - {{ preferences_item_footer(info, label, rtl) }} - {% endif %} - - {{ plugin_of_category('ui' )}} -
-
-
-
- -
-
- {% if 'method' not in locked_preferences %} - {% set method_label = _('HTTP Method') %} - {% set method_info = _('Change how forms are submited, learn more about request methods') %} - {{ preferences_item_header(method_info, method_label, rtl, 'method') }} - - {{ preferences_item_footer(method_info, method_label, rtl) }} - {% endif %} - - {% if 'image_proxy' not in locked_preferences %} - {% set image_proxy_label = _('Image proxy') %} - {% set image_proxy_info = _('Proxying image results through SearXNG') %} - {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl, 'image_proxy') }} - - {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }} - {% endif %} - - {% if 'query_in_title' not in locked_preferences %} - {% set query_in_title_label = _("Query in the page's title") %} - {% set query_in_title_info = _("When enabled, the result page's title contains your query. Your browser can record this title") %} - {{ preferences_item_header(query_in_title_info, query_in_title_label, rtl, 'query_in_title') }} - - {{ preferences_item_footer(query_in_title_info, query_in_title_label, rtl) }} - {% endif %} - - {{ plugin_of_category('privacy' )}} -
-
-
-
- - - - - - -
- -
-

- - -

-
- - {% for categ in categories_as_tabs + [OTHER_CATEGORY] %} - -
- {% if categ == OTHER_CATEGORY %} -

{{_('This tab does not show up for search results, but you can search the engines listed here via bangs.')}}

- {% endif %} -
-
-
- - - {% if not rtl %} - - - - - - - - - - {% else %} - - - - - - - - - - {% endif %} - - {% for group, engines in engines_by_category[categ] | group_engines_in_tab %} - {% if loop.length > 1 %} - - {% endif %} - {% for search_engine in engines %} - {% if not search_engine.private %} - - {% if not rtl %} - - - - - - - {{ engine_time(search_engine.name, 'text-right') }} - - {{ engine_reliability(search_engine.name, 'text-right ') }} - {% else %} - {{ engine_reliability(search_engine.name, 'text-left') }} - - {{ engine_time(search_engine.name, 'text-left') }} - - - - - - - {% endif %} - - {% endif %} - {% endfor %} - {% endfor %} -
{{ _("Allow") }}{{ _("Engine name") }}{{ _("Shortcut") }}{{ _("Selected language") }}{{ _("SafeSearch") }}{{ _("Time range") }}{{ _("Response time") }}{{ _("Max time") }}{{ _("Reliability") }}{{ _("Reliability") }}{{ _("Max time") }}{{ _("Response time") }}{{ _("Time range") }}{{ _("SafeSearch") }}{{ _("Selected language") }}{{ _("Shortcut") }}{{ _("Engine name") }}{{ _("Allow") }}
{{_(group)}}
- {{- checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) -}} - - {%- if search_engine.enable_http %}{{ icon('exclamation-sign', 'No HTTPS') }}{% endif -%} - {{- search_engine.name -}} - {%- if search_engine.about and search_engine.about.language %} - ({{search_engine.about.language | upper}}) - {%- endif %} - - {{- engine_about(search_engine, 'tooltip_' + categ + '_' + search_engine.name) -}} - {{ shortcuts[search_engine.name] }}{{ support_toggle(supports[search_engine.name]['supports_selected_language']) }}{{ support_toggle(supports[search_engine.name]['safesearch']) }}{{ support_toggle(supports[search_engine.name]['time_range_support']) }}{% if stats[search_engine.name]['warn_timeout'] %}{{ icon('exclamation-sign') }} {% endif %}{{ search_engine.timeout }}{{ search_engine.timeout }}{% if stats[search_engine.name]['warn_time'] %} {{ icon('exclamation-sign')}}{% endif %}{{ support_toggle(supports[search_engine.name]['time_range_support']) }}{{ support_toggle(supports[search_engine.name]['safesearch']) }}{{ support_toggle(supports[search_engine.name]['supports_selected_language']) }}{{ shortcuts[search_engine.name] }}{% if search_engine.enable_http %}{{ icon('exclamation-sign', 'No HTTPS') }}{% endif %}{{ search_engine.name }}{{ engine_about(search_engine) }} - {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} -
-
-
-
-
- {% endfor %} -
-
-
- - {% if answerers %} - - - - {{ _('Allow') }} - {{ _('Keywords') }} - {{ _('Name') }} - {{ _('Description') }} - {{ _('Examples') }} - - - - - - {% for answerer in answerers %} - - - - - - - - {% endfor %} - - - - - {%- for plugin in plugins -%} - {%- if plugin.preference_section == 'query' -%} - - - - - - - - {%- endif -%} - {%- endfor -%} - -
{{ _("This is the list of SearXNG's instant answering modules.") }}
{{ answerer.keywords|join(', ') }}{{ answerer.info.name }}{{ answerer.info.description }}{{ answerer.info.examples|join(', ') }}
{{ _('This is the list of plugins.') }}
{{- checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) -}}{{ plugin.query_keywords|join(', ') }}{{ _(plugin.name) }}{{ _(plugin.description) }}{{ plugin.query_examples }}
- {% endif %} -
-
- -

- {{ _('This is the list of cookies and their values SearXNG is storing on your computer.') }}
- {{ _('With that list, you can assess SearXNG transparency.') }}
-

- {% if cookies %} - - - - - - - {% for cookie in cookies %} - - - - - {% endfor %} -
{{ _('Cookie name') }}{{ _('Value') }}
{{ cookie }}{{ cookies[cookie] }}
- {% else %} - {% include 'oscar/messages/no_cookies.html' %} - {% endif %} -
-
- -

- {{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} - {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} -

- -

- {{ _('Search URL of the currently saved preferences') }} - ({{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }}): -

- - -
-
-{% endblock %} diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html deleted file mode 100644 index c7d93e2b3..000000000 --- a/searx/templates/oscar/result_templates/code.html +++ /dev/null @@ -1,18 +0,0 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context%} - -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} - -{% if result.content %}

{{ result.content|safe }}

{% endif %} - -{% if result.repository %}

{{ icon('file') }} {{ result.repository }}

{% endif %} - -
-{{ result.codelines|code_highlighter(result.code_language)|safe }} -
- -{% if rtl %} -{{ result_footer_rtl(result) }} -{% else %} -{{ result_footer(result) }} -{% endif %} diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html deleted file mode 100644 index ea202910d..000000000 --- a/searx/templates/oscar/result_templates/default.html +++ /dev/null @@ -1,38 +0,0 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %} - -{{- result_header(result, favicons, loop.index) -}} -{{- result_sub_header(result, loop.index) -}} - -{%- if result.iframe_src -%} - -{%- endif -%} - -{% if result.iframe_src -%} - -{%- endif -%} - -{%- if result.img_src or result.thumbnail -%} -
{{- "" -}} -
{{- "" -}} - - {%- if result.content %}

{{ result.content|safe }}

{% endif -%} -
{{- "" -}} -
-{%- else -%} -{%- if result.content %}

{{ result.content|safe }}

{% endif -%} -{%- endif -%} - -{% if result.audio_src -%} -
- -
-{%- endif %} - - -{%- if rtl -%} -{{ result_footer_rtl(result, loop.index) }} -{%- else -%} -{{ result_footer(result, loop.index) }} -{%- endif -%} diff --git a/searx/templates/oscar/result_templates/files.html b/searx/templates/oscar/result_templates/files.html deleted file mode 100644 index 52798f7d8..000000000 --- a/searx/templates/oscar/result_templates/files.html +++ /dev/null @@ -1,55 +0,0 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer_nocache, result_footer_nocache_rtl, icon with context %} - -{{- result_header(result, favicons) -}} -{{- result_sub_header(result) -}} - -{%- if result.embedded -%} - -{%- endif -%} - -{%- if result.embedded -%} -
- {{- result.embedded|safe -}} -
-{%- endif -%} - -{%- if result.abstract %}

{{ result.abstract|safe }}

{% endif -%} - -{%- if result.img_src -%} -
-
-{{ result.title|striptags }} -{%- if result.content %}

{{ result.content|safe }}

{% endif -%} -
-
-{%- else -%} -{%- if result.content %}

{{ result.content|safe }}

{% endif -%} -{%- endif -%} - - -{%- if result.author %}{% endif -%} - -{%- if result.filename %}{% endif -%} - -{%- if result.size %} -{%- endif -%} - -{%- if result.time %}{% endif -%} - -{%- if result.mtype %}{% endif -%} - - -{%- if rtl -%} -{{ result_footer_nocache_rtl(result) }} -{%- else -%} -{{ result_footer_nocache(result) }} -{%- endif -%} diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html deleted file mode 100644 index 96cdd53bb..000000000 --- a/searx/templates/oscar/result_templates/images.html +++ /dev/null @@ -1,36 +0,0 @@ -{%- from 'oscar/macros.html' import draw_favicon with context -%} - -{{- "" -}} - {{ result.title|striptags }}{{- "" -}} - -{{- "" -}} diff --git a/searx/templates/oscar/result_templates/key-value.html b/searx/templates/oscar/result_templates/key-value.html deleted file mode 100644 index 9d75682d4..000000000 --- a/searx/templates/oscar/result_templates/key-value.html +++ /dev/null @@ -1,19 +0,0 @@ -{% from 'oscar/macros.html' import result_footer, result_footer_rtl with context %} -
- - {% for key, value in result.items() %} - {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions', 'pretty_url', 'parsed_url'] %} - {% continue %} - {% endif %} - - - - {% endfor %} -
{{ key|upper }}: {{ value|truncate }}
- -{% if rtl %} -{{ result_footer_rtl(result) }} -{% else %} -{{ result_footer(result) }} -{% endif %} -
diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html deleted file mode 100644 index bcd1019ec..000000000 --- a/searx/templates/oscar/result_templates/map.html +++ /dev/null @@ -1,76 +0,0 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} - -{{- result_header(result, favicons, loop.index) -}} -{{- result_sub_header(result, loop.index) -}} - -
- -
- {%- if result.img_src -%}{%- endif -%} - - {%- if result.type_icon or result.type -%} -

- {%- if result.type_icon -%} - - {%- endif -%} - {{ result.type if result.type is not none else '' }} -

- {%- endif -%} - - {%- if result.content %}

{{ result.content|safe }}

{% endif -%} - - - {%- if result.address -%} - - - - - {%- endif %} - {%- for info in result.data -%} - - {%- endfor -%} - {%- for link in result.links -%} - - {%- endfor -%} -
- {{ result.address_label or _('address') }} - - {%- if result.address.name -%} - - {%- endif -%} - {%- if result.address.road -%} - - {%- if result.address.house_number %}{{ result.address.house_number }}, {% endif -%} - {{- result.address.road -}} -
- {%- endif -%} - {%- if result.address.locality -%} - {{ result.address.locality }} - {%- if result.address.postcode %}, {{ result.address.postcode }}{% endif -%} -
- {%- endif -%} - {%- if result.address.country -%} - {{ result.address.country }} - {%- endif -%} -
{{ info.label }}{{ info.value|safe }}
{{ link.label }}{{ link.url_label|safe }}
- -

- {%- if (result.latitude and result.longitude) or result.boundingbox -%} - - {%- endif -%} -

- -
- -{%- if (result.latitude and result.longitude) or result.boundingbox -%} -
-
-
-{%- endif -%} - -
-{%- if rtl -%} -{{- result_footer_rtl(result, loop.index) -}} -{% else %} -{{- result_footer(result, loop.index) -}} -{%- endif -%} diff --git a/searx/templates/oscar/result_templates/products.html b/searx/templates/oscar/result_templates/products.html deleted file mode 100644 index 590db0e05..000000000 --- a/searx/templates/oscar/result_templates/products.html +++ /dev/null @@ -1,22 +0,0 @@ -{% from 'oscar/macros.html' import draw_favicon, result_header, result_sub_header, result_footer_rtl, result_footer %} - -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} - -
-
- {{ result.title|striptags }} {{ result.engine }} -

- {% if result.price %}{{ result.price|safe }}
{% endif %} - {% if result.shipping %}{{ result.shipping|safe }}
{% endif %} - {% if result.source_country %}{{ result.source_country|safe }}
{% endif %} - {% if result.content %}{{ result.content|safe }}{% endif %} -

-
-
- -{% if rtl %} -{{ result_footer_rtl(result) }} -{% else %} -{{ result_footer(result) }} -{% endif %} diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html deleted file mode 100644 index 9f6671549..000000000 --- a/searx/templates/oscar/result_templates/torrent.html +++ /dev/null @@ -1,25 +0,0 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} - -{{- result_header(result, favicons, loop.index) -}} -{{- result_sub_header(result, loop.index) -}} - -{%- if result.seed is defined %}

{{ icon('transfer') }} {{ _('Seeder') }} {{ result.seed }} • {{ _('Leecher') }} {{ result.leech }}{% endif -%} -{%- if result.filesize %}
{{ icon('floppy-disk') }} {{ _('Filesize') -}} - - {%- if result.filesize < 1024 %}{{ result.filesize }} {{ _('Bytes') -}} - {%- elif result.filesize < 1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024) }} {{ _('kiB') -}} - {%- elif result.filesize < 1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024) }} {{ _('MiB') -}} - {%- elif result.filesize < 1024*1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024) }} {{ _('GiB') -}} - {%- else %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024/1024) }} {{ _('TiB') }}{% endif -%} - {% endif -%} -{%- if result.files %}
{{ icon('file') }} {{ _('Number of Files') }} {{ result.files }}{% endif -%} - -{%- if result.content %}
{{ result.content|safe }}{% endif -%} - -

- -{%- if rtl -%} -{{ result_footer_rtl(result, loop.index) }} -{%- else -%} -{{ result_footer(result, loop.index) }} -{%- endif -%} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html deleted file mode 100644 index 975f75e2a..000000000 --- a/searx/templates/oscar/result_templates/videos.html +++ /dev/null @@ -1,29 +0,0 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} - -{{- result_header(result, favicons, loop.index) -}} -{{- result_sub_header(result, loop.index) -}} - -{%- if result.iframe_src -%} - -{%- endif -%} - -{% if result.iframe_src -%} -
- -
-{%- endif %} - -
{{- "" -}} -
{{- "" -}} - - {%- if result.author %}

{{ _('Author') }}: {{ result.author }}

{% endif -%} - {%- if result.length %}

{{ _('Length') }}: {{ result.length }}

{% endif -%} - {%- if result.content %}

{{ result.content|safe }}

{% endif -%} -
{{- "" -}} -
- -{%- if rtl -%} -{{ result_footer_rtl(result, loop.index) }} -{%- else -%} -{{ result_footer(result, loop.index) }} -{%- endif -%} diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html deleted file mode 100644 index ac7179158..000000000 --- a/searx/templates/oscar/results.html +++ /dev/null @@ -1,196 +0,0 @@ -{% extends "oscar/base.html" %} -{% macro search_form_attrs(pageno) -%} - {%- for category in selected_categories -%}{%- endfor -%} - {{- "" -}} - {{- "" -}} - {{- "" -}} - {{- "" -}} - {% if timeout_limit %}{% endif -%} -{%- endmacro %} -{% macro engine_data_form(engine_data) -%} - {% for engine_name, kv_data in engine_data.items() %} - {% for k, v in kv_data.items() %} - - {% endfor %} - {% endfor %} -{%- endmacro %} -{%- macro search_url() %}{{ url_for('search', _external=True) }}?q={{ q|urlencode }}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}{% if time_range %}&time_range={{ time_range }}{% endif %}{% if current_language != 'all' %}&language={{ current_language }}{% endif %}{% endmacro -%} - -{% block title %}{% if query_in_title %}{{- q|e }} - {% endif %}{% endblock %} -{% block meta %}{{" "}}{% endblock %} -{% block content %} - {% include 'oscar/search.html' %} - -
- - -
-

{{ _('Search results') }}

- - {% if corrections -%} -
-
- {{ _('Try searching for:') }} - {% for correction in corrections -%} - - {% endfor %} -
-
- {%- endif %} - - {% if answers -%} - {%- for answer in answers.values() %} -
- {% if answer.url %} - {{ answer.answer }} - {% else %} - {{ answer.answer }} - {% endif %} -
- {%- endfor %} - {%- endif %} - - {% for result in results -%} -
- {%- set index = loop.index -%} - {%- if result.template -%} - {% include get_result_template('oscar', result['template']) %} - {%- else -%} - {% include 'oscar/result_templates/default.html' %} - {%- endif -%} -
- {% endfor %} - - {% if not results and not answers -%} - {% include 'oscar/messages/no_results.html' %} - {% endif %} - -
- - {% if paging -%} - {% if rtl %} - -
- {% else %} - -
- {% endif %} - {% endif %} -
-
-{% endblock %} diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html deleted file mode 100644 index 2b3758efd..000000000 --- a/searx/templates/oscar/search.html +++ /dev/null @@ -1,25 +0,0 @@ -{% from 'oscar/macros.html' import icon %} - diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html deleted file mode 100644 index d3982304d..000000000 --- a/searx/templates/oscar/search_full.html +++ /dev/null @@ -1,19 +0,0 @@ -{% from 'oscar/macros.html' import icon %} - -