- {{ search_engine.name }} ({{ shortcuts[search_engine.name] }})
+ {{ search_engine.name }}
+ {{ shortcuts[search_engine.name] }}
{{ _(categ) }}
+
{% if result.publishedDate %}
{{ result.publishedDate }} {% endif %}
{% if result.img_src %}
diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html
index 5f2ead63f..1cbedc32b 100644
--- a/searx/templates/courgette/result_templates/default.html
+++ b/searx/templates/courgette/result_templates/default.html
@@ -1,4 +1,4 @@
-
+
{% if "icon_"~result.engine~".ico" in favicons %}
diff --git a/searx/templates/courgette/result_templates/images.html b/searx/templates/courgette/result_templates/images.html
index 49acb3b61..e8ac5072b 100644
--- a/searx/templates/courgette/result_templates/images.html
+++ b/searx/templates/courgette/result_templates/images.html
@@ -1,4 +1,4 @@
-
+
{{ _('original context') }}
+
{% for key, value in result.items() %}
{% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}
diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html
index 5f2ead63f..1cbedc32b 100644
--- a/searx/templates/courgette/result_templates/map.html
+++ b/searx/templates/courgette/result_templates/map.html
@@ -1,4 +1,4 @@
-
+
{% if "icon_"~result.engine~".ico" in favicons %}
diff --git a/searx/templates/courgette/result_templates/torrent.html b/searx/templates/courgette/result_templates/torrent.html
index 7f94a221e..8b9a68fa9 100644
--- a/searx/templates/courgette/result_templates/torrent.html
+++ b/searx/templates/courgette/result_templates/torrent.html
@@ -1,4 +1,4 @@
-
+
{% if "icon_"~result.engine~".ico" in favicons %}
{% endif %}
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html
index b3e19e024..576c483eb 100644
--- a/searx/templates/courgette/result_templates/videos.html
+++ b/searx/templates/courgette/result_templates/videos.html
@@ -1,4 +1,4 @@
-
+
{% if "icon_"~result.engine~".ico" in favicons %}
{% endif %}
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/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 @@
{{ _('Engine name') }}
+ {{ _('Shortcut') }}
{{ _('Category') }}
{{ _('Allow') }} / {{ _('Block') }}
@@ -103,7 +104,8 @@
{% if not search_engine.private %}
- {{ search_engine.name }} ({{ shortcuts[search_engine.name] }})
+ {{ search_engine.name }}
+ {{ shortcuts[search_engine.name] }}
{{ _(categ) }}
+
{{ result.pretty_url }} {{ _('cached') }}
{% if result.publishedDate %}
{{ result.publishedDate }}
{% endif %}
diff --git a/searx/templates/legacy/result_templates/default.html b/searx/templates/legacy/result_templates/default.html
index da091174d..13e2d2913 100644
--- a/searx/templates/legacy/result_templates/default.html
+++ b/searx/templates/legacy/result_templates/default.html
@@ -1,4 +1,4 @@
-
+
{% if "icon_"~result.engine~".ico" in favicons %}{{ result.title|safe }}
{{ result.pretty_url }} {{ _('cached') }}
{% if result.publishedDate %}{{ result.publishedDate }} {% endif %}
diff --git a/searx/templates/legacy/result_templates/images.html b/searx/templates/legacy/result_templates/images.html
index 00f62abcc..514cdf8bc 100644
--- a/searx/templates/legacy/result_templates/images.html
+++ b/searx/templates/legacy/result_templates/images.html
@@ -1,4 +1,4 @@
-
+
{{ _('original context') }}
+
{% for key, value in result.items() %}
{% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}
{% continue %}
diff --git a/searx/templates/legacy/result_templates/map.html b/searx/templates/legacy/result_templates/map.html
index 0200e0f6b..6937ba459 100644
--- a/searx/templates/legacy/result_templates/map.html
+++ b/searx/templates/legacy/result_templates/map.html
@@ -1,4 +1,4 @@
-
+
{% if "icon_"~result.engine~".ico" in favicons %}
diff --git a/searx/templates/legacy/result_templates/torrent.html b/searx/templates/legacy/result_templates/torrent.html
index 068e05373..f251496bf 100644
--- a/searx/templates/legacy/result_templates/torrent.html
+++ b/searx/templates/legacy/result_templates/torrent.html
@@ -1,4 +1,4 @@
-
+
{% if "icon_"~result.engine~".ico" in favicons %}
{% endif %}
diff --git a/searx/templates/legacy/result_templates/videos.html b/searx/templates/legacy/result_templates/videos.html
index 727f44c71..50f4d1e98 100644
--- a/searx/templates/legacy/result_templates/videos.html
+++ b/searx/templates/legacy/result_templates/videos.html
@@ -1,4 +1,4 @@
-
+
{% if "icon_"~result.engine~".ico" in favicons %}{{ result.title|safe }}
{% if result.publishedDate %}
{{ result.publishedDate }} {% endif %}
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/oscar/infobox.html b/searx/templates/oscar/infobox.html
index 9802f11e2..de595b922 100644
--- a/searx/templates/oscar/infobox.html
+++ b/searx/templates/oscar/infobox.html
@@ -16,7 +16,11 @@
{%- if attribute.image -%}
{%- else -%}
-
{{ attribute.value }}
+ {% if attribute.label == 'Instance of' %}
+
{{ attribute.value.id }}
+ {% else %}
+
{{ attribute.value }}
+ {%- endif -%}
{%- endif -%}
{% endfor -%}
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 43e3e26d9..fc4efadfa 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -72,6 +72,8 @@
{% endfor %}
+
{{ _('RSS subscription') }}
+
@@ -100,7 +102,7 @@
{%- endif %}
{% for result in results -%}
-
+
{%- set index = loop.index -%}
{%- if result.template -%}
{% include get_result_template('oscar', result['template']) %}
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/templates/simple/macros.html b/searx/templates/simple/macros.html
index f0b36276c..cacbbec9f 100644
--- a/searx/templates/simple/macros.html
+++ b/searx/templates/simple/macros.html
@@ -26,7 +26,7 @@
{% macro result_header(result, favicons, image_proxify) -%}
-
+
{%- if result.img_src %}{{ result_open_link(result.url) }}{{ result_link(result.url, result.title|safe) }}
diff --git a/searx/webapp.py b/searx/webapp.py
index f3f5f21b8..2ba8ccfb8 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -355,17 +355,12 @@ def render(template_name, override_theme=None, **kwargs):
if (engine_name, category) not in disabled_engines)
if 'categories' not in kwargs:
- kwargs['categories'] = ['general']
- kwargs['categories'].extend(x for x in
- sorted(categories.keys())
- if x != 'general'
- and x in enabled_categories)
+ kwargs['categories'] = [x for x in
+ _get_ordered_categories()
+ if x in enabled_categories]
if 'all_categories' not in kwargs:
- kwargs['all_categories'] = ['general']
- kwargs['all_categories'].extend(x for x in
- sorted(categories.keys())
- if x != 'general')
+ kwargs['all_categories'] = _get_ordered_categories()
if 'selected_categories' not in kwargs:
kwargs['selected_categories'] = []
@@ -430,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)
@@ -443,6 +439,17 @@ def render(template_name, override_theme=None, **kwargs):
'{}/{}'.format(kwargs['theme'], template_name), **kwargs)
+def _get_ordered_categories():
+ ordered_categories = []
+ if 'categories_order' not in settings['ui']:
+ ordered_categories = ['general']
+ ordered_categories.extend(x for x in sorted(categories.keys()) if x != 'general')
+ return ordered_categories
+ ordered_categories = settings['ui']['categories_order']
+ ordered_categories.extend(x for x in sorted(categories.keys()) if x not in ordered_categories)
+ return ordered_categories
+
+
@app.before_request
def pre_request():
request.start_time = time()
 }})
 }} "{{ result.title|striptags }}")
{{ result_close_link() }}{% endif -%}
{%- if result.thumbnail %}{{ result_open_link(result.url) }} }} "{{ result.title|striptags }}")
{{ result_close_link() }}{% endif -%}