From c54a0e81ff3c44c79d0d4cab3d4022efa0cbdcd5 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Wed, 3 Jun 2020 13:49:20 +0200 Subject: [enh] add shortcut column to search engines table in preferences - fixes #230 --- searx/templates/courgette/preferences.html | 4 +++- searx/templates/legacy/preferences.html | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html index 56a6e0202..c67f7662b 100644 --- a/searx/templates/courgette/preferences.html +++ b/searx/templates/courgette/preferences.html @@ -98,6 +98,7 @@ + @@ -106,7 +107,8 @@ {% if not search_engine.private %} - + +

{{ _('Allow') }} / {{ _('Block') }}

{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎

diff --git a/searx/templates/legacy/preferences.html b/searx/templates/legacy/preferences.html index f418dcd5b..414b3f6c0 100644 --- a/searx/templates/legacy/preferences.html +++ b/searx/templates/legacy/preferences.html @@ -95,6 +95,7 @@ + @@ -103,7 +104,8 @@ {% if not search_engine.private %} - + +

{{ _('Engine name') }}	{{ _('Shortcut') }}	{{ _('Category') }}	{{ _('Allow') }} / {{ _('Block') }}
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎	{{ search_engine.name }}	{{ shortcuts[search_engine.name] }}	{{ _(categ) }}	-- cgit v1.2.3-54-g00ecf From de1b08a941a6834a39159b9a2aa3ff3552df029f Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 4 Jun 2020 19:20:44 +0200 Subject: [enh] add unique class for each endpoint - closes #1133 --- searx/templates/courgette/base.html \| 2 +- searx/templates/legacy/base.html \| 2 +- searx/templates/oscar/base.html \| 2 +- searx/templates/simple/base.html \| 2 +- searx/webapp.py \| 1 + 5 files changed, 5 insertions(+), 4 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/courgette/base.html b/searx/templates/courgette/base.html index 8e272585c..f4c61dac2 100644 --- a/searx/templates/courgette/base.html +++ b/searx/templates/courgette/base.html @@ -29,7 +29,7 @@ searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %}; - + {% block content %} {% endblock %} diff --git a/searx/templates/legacy/base.html b/searx/templates/legacy/base.html index da19741cb..21fe42e16 100644 --- a/searx/templates/legacy/base.html +++ b/searx/templates/legacy/base.html @@ -20,7 +20,7 @@ {% endblock %} - + {% block content %} {% endblock %} diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 5eb4462e4..cd3d23df5 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -47,7 +47,7 @@ - + {% include 'oscar/navbar.html' %} diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index 71df123ea..650ef771c 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -32,7 +32,7 @@ {% endblock %} - + {% if errors %} diff --git a/searx/webapp.py b/searx/webapp.py index 46d4e949c..2ba8ccfb8 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -425,6 +425,7 @@ def render(template_name, override_theme=None, **kwargs): kwargs['brand'] = brand kwargs['scripts'] = set() + kwargs['endpoint'] = 'results' if 'q' in kwargs else request.endpoint for plugin in request.user_plugins: for script in plugin.js_dependencies: kwargs['scripts'].add(script) -- cgit v1.2.3-54-g00ecf