From 2149e88bdd64a66d867ad1f5c46e6aa0977d837a Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 2 Jun 2023 15:30:02 +0200 Subject: [mod] template preferences: split into elements (no functional change) HINT: this patch has no functional change / it is the preparation for following changes and bugfixes Over the years, the preferences template became an unmanageable beast. To make the source code more readable the monolith is splitted into elements. The splitting into elements also has the advantage that a new template can make use of them. The reversed checkbox is a quirk that is only used in the prefereces and must be eliminated in the long term. For this the macro 'checkbox_onoff_reversed' was added to the preferences.html template. The 'checkbox' macro is also a quirk of the preferences.html we don't want to use in other templates (it is an input-checkbox in a HTML form that was misused for status display). Signed-off-by: Markus Heiser --- searx/templates/simple/preferences/answerers.html | 43 ++++++++++ .../templates/simple/preferences/autocomplete.html | 17 ++++ .../simple/preferences/center_alignment.html | 12 +++ searx/templates/simple/preferences/cookies.html | 45 +++++++++++ .../templates/simple/preferences/doi_resolver.html | 16 ++++ searx/templates/simple/preferences/engines.html | 93 ++++++++++++++++++++++ searx/templates/simple/preferences/footer.html | 14 ++++ .../templates/simple/preferences/image_proxy.html | 12 +++ .../simple/preferences/infinite_scroll.html | 12 +++ searx/templates/simple/preferences/language.html | 27 +++++++ searx/templates/simple/preferences/method.html | 16 ++++ .../simple/preferences/query_in_title.html | 12 +++ .../simple/preferences/results_on_new_tab.html | 12 +++ searx/templates/simple/preferences/safesearch.html | 22 +++++ searx/templates/simple/preferences/theme.html | 35 ++++++++ searx/templates/simple/preferences/tokens.html | 11 +++ searx/templates/simple/preferences/ui_locale.html | 16 ++++ 17 files changed, 415 insertions(+) create mode 100644 searx/templates/simple/preferences/answerers.html create mode 100644 searx/templates/simple/preferences/autocomplete.html create mode 100644 searx/templates/simple/preferences/center_alignment.html create mode 100644 searx/templates/simple/preferences/cookies.html create mode 100644 searx/templates/simple/preferences/doi_resolver.html create mode 100644 searx/templates/simple/preferences/engines.html create mode 100644 searx/templates/simple/preferences/footer.html create mode 100644 searx/templates/simple/preferences/image_proxy.html create mode 100644 searx/templates/simple/preferences/infinite_scroll.html create mode 100644 searx/templates/simple/preferences/language.html create mode 100644 searx/templates/simple/preferences/method.html create mode 100644 searx/templates/simple/preferences/query_in_title.html create mode 100644 searx/templates/simple/preferences/results_on_new_tab.html create mode 100644 searx/templates/simple/preferences/safesearch.html create mode 100644 searx/templates/simple/preferences/theme.html create mode 100644 searx/templates/simple/preferences/tokens.html create mode 100644 searx/templates/simple/preferences/ui_locale.html (limited to 'searx/templates/simple/preferences') diff --git a/searx/templates/simple/preferences/answerers.html b/searx/templates/simple/preferences/answerers.html new file mode 100644 index 000000000..b2770c2f5 --- /dev/null +++ b/searx/templates/simple/preferences/answerers.html @@ -0,0 +1,43 @@ +
{{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + + {{- '' -}} + + + {%- for answerer in answerers -%} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + + {%- endfor -%} + + {{- '' -}} + {{- '' -}} + + {%- for plugin in plugins -%} + {%- if plugin.preference_section == 'query' -%} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + + {%- endif -%} + {%- endfor -%} +
{{ _('Allow') }}{{ _('Keywords') }}{{ _('Name') }}{{ _('Description') }}{{ _('Examples') }}
+ {{- _("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_onoff_reversed('plugin_' + plugin.id, plugin.id not in allowed_plugins) -}}{{ plugin.query_keywords|join(', ') }}{{ _(plugin.name) }}{{ _(plugin.description) }}{{ plugin.query_examples }}
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/autocomplete.html b/searx/templates/simple/preferences/autocomplete.html new file mode 100644 index 000000000..17ee22953 --- /dev/null +++ b/searx/templates/simple/preferences/autocomplete.html @@ -0,0 +1,17 @@ +
{{- '' -}} + {{- _('Autocomplete') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('Find stuff as you type') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/center_alignment.html b/searx/templates/simple/preferences/center_alignment.html new file mode 100644 index 000000000..983a3957b --- /dev/null +++ b/searx/templates/simple/preferences/center_alignment.html @@ -0,0 +1,12 @@ +
{{- '' -}} + {{ _('Center Alignment') }}{{- '' -}} +

{{- '' -}} + {{- '' -}} +

{{- '' -}} +
+ {{- _('Displays results in the center of the page (Oscar layout).') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/cookies.html b/searx/templates/simple/preferences/cookies.html new file mode 100644 index 000000000..f84251ef6 --- /dev/null +++ b/searx/templates/simple/preferences/cookies.html @@ -0,0 +1,45 @@ +

+ {{- _('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 'simple/messages/no_cookies.html' %} +{% endif %} +

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

{{- '' -}} +
{{- '' -}} +
+    {{- url_for('index', _external=True) -}}?preferences={{- preferences_url_params|e -}}
+    {%- raw -%}&q=%s{%- endraw -%}
+  
{{- '' -}} +
{{- '' -}} +

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

+

+ {{- _('URL to restore your preferences in another browser') -}}:{{- '' -}} +

{{- '' -}} +
{{- '' -}} +
+    {{- url_for('preferences', _external=True) -}}?preferences={{- preferences_url_params|e -}}
+    &save=1{{- '' -}}
+  
{{- '' -}} +
{{- '' -}} +

+ {{- _('Specifying custom settings in the preferences URL can be used to sync preferences across devices.') -}} +

diff --git a/searx/templates/simple/preferences/doi_resolver.html b/searx/templates/simple/preferences/doi_resolver.html new file mode 100644 index 000000000..a53e964f9 --- /dev/null +++ b/searx/templates/simple/preferences/doi_resolver.html @@ -0,0 +1,16 @@ +
{{- '' -}} + {{- _('Open Access DOI resolver') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('Select service used by DOI rewrite') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/engines.html b/searx/templates/simple/preferences/engines.html new file mode 100644 index 000000000..66610024f --- /dev/null +++ b/searx/templates/simple/preferences/engines.html @@ -0,0 +1,93 @@ +{%- set ns = namespace(checked=true) -%} +{%- for categ in categories_as_tabs + [DEFAULT_CATEGORY] -%} + + {{- tab_header('enginetab', 'category_' + categ, _(categ), ns.checked ) -}} + + {%- set ns.checked = false -%} + {%- if categ == DEFAULT_CATEGORY -%} +

+ {{- _('This tab does not exists in the user interface, but you can search in these engines by its !bangs.') -}} + {{- ' ' -}} +

+ {%- endif -%} +
{{- '' -}} + {{- '' -}} + + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {%- if enable_metrics -%} + + {%- endif -%} + + {%- if enable_metrics -%} + + {%- endif -%} + {{- '' -}} + + {%- for group, group_bang, 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 -%} + {%- set engine_id = 'engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_') -%} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {{- '' -}} + {%- if enable_metrics -%} + {{- engine_time(search_engine.name) -}} + {%- endif -%} + {{- '' -}} + {%- if enable_metrics -%} + {{- engine_reliability(search_engine.name) -}} + {%- endif -%} + + {%- endif -%} + {%- endfor -%} + {%- endfor -%} +
{{- _("Allow") -}}{{- _("Engine name") -}}{{ _("!bang") -}}{{- _("Supports selected language") -}}{{- _("SafeSearch") -}}{{- _("Time range") -}}{{- _("Response time") -}}{{- _("Max time") -}}{{- _("Reliability") }}
{{- _(group) -}} + {%- if group_bang -%} + {{- group_bang -}} + {%- endif -%}
+ {{- checkbox_onoff_reversed(engine_id, (search_engine.name, categ) in disabled_engines) -}} + + {%- if search_engine.enable_http -%} + {{- icon_big('warning', 'No HTTPS') -}} + {%- endif -%} + + {{- engine_about(search_engine) -}} + {{- '' -}} + {{ '!' + shortcuts[search_engine.name] }}{{- '' -}} + + {{- checkbox(None, supports[search_engine.name]['supports_selected_language'], true) -}} + + {{- checkbox(None, supports[search_engine.name]['safesearch'], true) -}} + + {{- checkbox(None, supports[search_engine.name]['time_range_support'], true) -}} + + {{- search_engine.timeout -}} +
{{- '' -}} +
+ + {{- tab_footer() -}} + +{%- endfor -%} diff --git a/searx/templates/simple/preferences/footer.html b/searx/templates/simple/preferences/footer.html new file mode 100644 index 000000000..57a0ddaf8 --- /dev/null +++ b/searx/templates/simple/preferences/footer.html @@ -0,0 +1,14 @@ +

+ {{- _('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.") -}} +

{{- '' -}} + +{{- '' -}} + +
{{- '' -}} + {{ _('Reset defaults') }}{{- '' -}} +
{{- '' -}} + +
{{- '' -}} + {{ _('Back') }}{{- '' -}} +
diff --git a/searx/templates/simple/preferences/image_proxy.html b/searx/templates/simple/preferences/image_proxy.html new file mode 100644 index 000000000..c636a3172 --- /dev/null +++ b/searx/templates/simple/preferences/image_proxy.html @@ -0,0 +1,12 @@ +
{{- '' -}} + {{ _('Image proxy') }}{{- '' -}} +

{{- '' -}} + {{- '' -}} +

+
+ {{- _('Proxying image results through SearXNG') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/infinite_scroll.html b/searx/templates/simple/preferences/infinite_scroll.html new file mode 100644 index 000000000..df91b5f2e --- /dev/null +++ b/searx/templates/simple/preferences/infinite_scroll.html @@ -0,0 +1,12 @@ +
{{- '' -}} + {{ _('Infinite scroll') }}{{- '' -}} +

{{- '' -}} + {{- '' -}} +

{{- '' -}} +
+ {{- _('Automatically load next page when scrolling to bottom of current page') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/language.html b/searx/templates/simple/preferences/language.html new file mode 100644 index 000000000..809c516df --- /dev/null +++ b/searx/templates/simple/preferences/language.html @@ -0,0 +1,27 @@ +
{{- '' -}} + {{- _('Search language') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('What language do you prefer for search?') }} {{- ' ' -}} + {{- _('Choose Auto-detect to let SearXNG detect the language of your query.') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/method.html b/searx/templates/simple/preferences/method.html new file mode 100644 index 000000000..0e44b6435 --- /dev/null +++ b/searx/templates/simple/preferences/method.html @@ -0,0 +1,16 @@ +
{{- '' -}} + {{- _('HTTP Method') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('Change how forms are submitted, learn more about request methods') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/query_in_title.html b/searx/templates/simple/preferences/query_in_title.html new file mode 100644 index 000000000..12d0e5577 --- /dev/null +++ b/searx/templates/simple/preferences/query_in_title.html @@ -0,0 +1,12 @@ +
{{- '' -}} + {{ _("Query in the page's title") }} +

{{- '' -}} + {{- '' -}} +

{{- '' -}} +
+ {{- _("When enabled, the result page's title contains your query. Your browser can record this title") -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/results_on_new_tab.html b/searx/templates/simple/preferences/results_on_new_tab.html new file mode 100644 index 000000000..c0d6c51a5 --- /dev/null +++ b/searx/templates/simple/preferences/results_on_new_tab.html @@ -0,0 +1,12 @@ +
{{- '' -}} + {{ _('Results on new tabs') }}{{- '' -}} +

{{- '' -}} + {{- '' -}} +

{{- '' -}} +
+ {{- _('Open result links on new browser tabs') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/safesearch.html b/searx/templates/simple/preferences/safesearch.html new file mode 100644 index 000000000..1e33da3c8 --- /dev/null +++ b/searx/templates/simple/preferences/safesearch.html @@ -0,0 +1,22 @@ +
{{- '' -}} + {{- _('SafeSearch') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('Filter content') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/theme.html b/searx/templates/simple/preferences/theme.html new file mode 100644 index 000000000..f75bb24b7 --- /dev/null +++ b/searx/templates/simple/preferences/theme.html @@ -0,0 +1,35 @@ +
{{- '' -}} + {{- _('Theme') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('Change SearXNG layout') -}} +
{{- '' -}} +
{{- '' -}} + +
{{- '' -}} + {{- _('Theme style') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('Choose auto to follow your browser settings') -}} +
{{- '' -}} +
{{- '' -}} + +{%- include 'simple/preferences/center_alignment.html' -%} diff --git a/searx/templates/simple/preferences/tokens.html b/searx/templates/simple/preferences/tokens.html new file mode 100644 index 000000000..11d85c75f --- /dev/null +++ b/searx/templates/simple/preferences/tokens.html @@ -0,0 +1,11 @@ +
{{- '' -}} + {{- _('Engine tokens') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('Access tokens for private engines') -}} +
{{- '' -}} +
{{- '' -}} diff --git a/searx/templates/simple/preferences/ui_locale.html b/searx/templates/simple/preferences/ui_locale.html new file mode 100644 index 000000000..99f79cc8b --- /dev/null +++ b/searx/templates/simple/preferences/ui_locale.html @@ -0,0 +1,16 @@ +
{{- '' -}} + {{- _('Interface language') -}}{{- '' -}} +
{{- '' -}} + {{- '' -}} +
{{- '' -}} +
+ {{- _('Change the language of the layout') -}} +
{{- '' -}} +
{{- '' -}} -- cgit v1.2.3