From 8e9ad1ccc296c220d61f12926c94d98baa83e3ca Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Wed, 22 Dec 2021 15:51:26 +0100 Subject: [enh] introduce categories_as_tabs Previously all categories were displayed as search engine tabs. This commit changes that so that only the categories listed under categories_as_tabs in settings.yml are displayed. This lets us introduce more categories without cluttering up the UI. Categories not displayed as tabs can still be searched with !bangs. --- searx/templates/simple/preferences.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates/simple/preferences.html') diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 8f602cd1b..5f289c580 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -274,7 +274,7 @@ {{ tab_header('maintab', 'engines', _('Engines')) }}

{{ _('Currently used search engines') }}

{{ tabs_open() }} - {% for categ in all_categories %} + {% for categ in categories_as_tabs %} {{ tab_header('enginetab', 'category' + categ, _(categ)) }}
-- cgit v1.2.3 From 31e206361fac911d84e1f19dcf3f0ce80883d625 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Tue, 28 Dec 2021 14:51:21 +0100 Subject: [enh] group engines in preference tabs --- searx/templates/simple/preferences.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'searx/templates/simple/preferences.html') diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 5f289c580..1d565c238 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -289,7 +289,11 @@ - {% for search_engine in engines_by_category[categ] %} + {% 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 %} {% set engine_id = 'engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_') %} @@ -305,6 +309,7 @@ {% endif %} {% endfor %} + {% endfor %}
{{ _("Max time") }} {{ _("Reliability") }}
{{_(group)}}
{{ tab_footer() }} -- cgit v1.2.3 From 20a5e43e35f14da8699a2e4c9c73b2e21d7af10e Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Sat, 25 Dec 2021 19:34:07 +0100 Subject: [enh] display language of engines in preferences --- searx/templates/simple/preferences.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'searx/templates/simple/preferences.html') diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 1d565c238..9ad076579 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -298,7 +298,13 @@ {% set engine_id = 'engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_') %} {{ checkbox_onoff(engine_id, (search_engine.name, categ) in disabled_engines) }} - {% if search_engine.enable_http %}{{ icon_big('warning', 'No HTTPS') }}{% endif %} {{ search_engine.name }} {{ engine_about(search_engine) }} + {% if search_engine.enable_http %}{{ icon_big('warning', '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) }} + {{ shortcuts[search_engine.name] }} {{ checkbox(engine_id + '_supported_languages', supports[search_engine.name]['supports_selected_language'], true, true) }} {{ checkbox(engine_id + '_safesearch', supports[search_engine.name]['safesearch'], true, true) }} -- cgit v1.2.3 From a12cb6a8073c048348235a91628cc63667660549 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Mon, 27 Dec 2021 02:27:48 +0100 Subject: [simple] improve styling of subcategory table headers in preferences --- searx/templates/simple/preferences.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates/simple/preferences.html') diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 9ad076579..b4676d131 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -291,7 +291,7 @@ {% for group, engines in engines_by_category[categ] | group_engines_in_tab %} {% if loop.length > 1 %} - {{_(group)}} + {{_(group)}} {% endif %} {% for search_engine in engines %} {% if not search_engine.private %} -- cgit v1.2.3 From ab90e2ac49778153409397d4a2c34e9051963a0f Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Tue, 28 Dec 2021 16:12:54 +0100 Subject: [enh] show categories not in any tab category in "Other" preferences tab Previously we didn't have a good place to put search engines that don't fit into any of the tab categories. This commit automatically puts search engines that don't belong to any tab category in an "other" category, that is only displayed in the user preferences (and not above search results). --- searx/templates/simple/preferences.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates/simple/preferences.html') diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index b4676d131..bec478f26 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -274,7 +274,7 @@ {{ tab_header('maintab', 'engines', _('Engines')) }}

{{ _('Currently used search engines') }}

{{ tabs_open() }} - {% for categ in categories_as_tabs %} + {% for categ in categories_as_tabs + [OTHER_CATEGORY] %} {{ tab_header('enginetab', 'category' + categ, _(categ)) }}
-- cgit v1.2.3 From abe53946d43754fef96a1cd727ae97250c008184 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Mon, 3 Jan 2022 21:37:17 +0100 Subject: [enh] display help text for "Other" engines tab in preferences --- searx/templates/simple/preferences.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'searx/templates/simple/preferences.html') diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index bec478f26..043f9d634 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -276,6 +276,9 @@ {{ tabs_open() }} {% for categ in categories_as_tabs + [OTHER_CATEGORY] %} {{ tab_header('enginetab', 'category' + categ, _(categ)) }} + {% if categ == OTHER_CATEGORY %} +

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

+ {% endif %}
-- cgit v1.2.3