From ae99f9070c7d96385aaea6d5f3d56cab8d2b3f46 Mon Sep 17 00:00:00 2001 From: misnyo Date: Fri, 8 Sep 2017 20:33:14 +0200 Subject: [fix] static path fixed in templates and webapp, line endings fixed --- .../templates/courgette/result_templates/code.html | 22 +-- searx/templates/legacy/result_templates/code.html | 22 +-- searx/templates/oscar/macros.html | 175 ++++++++++----------- searx/templates/simple/macros.html | 3 +- 4 files changed, 110 insertions(+), 112 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/courgette/result_templates/code.html b/searx/templates/courgette/result_templates/code.html index 953617e84..d6dbd5ed7 100644 --- a/searx/templates/courgette/result_templates/code.html +++ b/searx/templates/courgette/result_templates/code.html @@ -1,11 +1,11 @@ -
-

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

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

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

- {% if result.repository %}

{{ result.repository }}

{% endif %} -
- {{ result.codelines|code_highlighter(result.code_language)|safe }} -
- -

{{ result.pretty_url }}‎

-
+
+

{{ result.title|safe }}

+ {% if result.publishedDate %}{{ result.publishedDate }}{% endif %} +

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+ {% if result.repository %}

{{ result.repository }}

{% endif %} +
+ {{ result.codelines|code_highlighter(result.code_language)|safe }} +
+ +

{{ result.pretty_url }}‎

+
diff --git a/searx/templates/legacy/result_templates/code.html b/searx/templates/legacy/result_templates/code.html index 9e3ed20af..fee6c8221 100644 --- a/searx/templates/legacy/result_templates/code.html +++ b/searx/templates/legacy/result_templates/code.html @@ -1,11 +1,11 @@ -
-

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

-

{{ result.pretty_url }}‎ {{ _('cached') }}

- {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} -

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

- {% if result.repository %}

{{ result.repository }}

{% endif %} - -
- {{ result.codelines|code_highlighter(result.code_language)|safe }} -
-
+
+

{{ result.title|safe }}

+

{{ result.pretty_url }}‎ {{ _('cached') }}

+ {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} +

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+ {% if result.repository %}

{{ result.repository }}

{% endif %} + +
+ {{ result.codelines|code_highlighter(result.code_language)|safe }} +
+
diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index e71091e70..c35a19158 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -1,88 +1,87 @@ - -{% macro icon(action) -%} - -{%- endmacro %} - - - -{% macro draw_favicon(favicon) -%} - {{ favicon }} -{%- endmacro %} - -{%- macro result_link(url, title, classes='') -%} -{{ title }} -{%- endmacro -%} - - -{% macro result_header(result, favicons) -%} -

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

-{%- endmacro %} - - -{% macro result_sub_header(result) -%} - {% if result.publishedDate %}{% endif %} - {% if result.magnetlink %} • {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}{% endif %} - {% if result.torrentfile %} • {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}{% endif %} -{%- endmacro %} - - -{% macro result_footer(result) -%} -
-
- {% for engine in result.engines %} - {{ engine }} - {% endfor %} - {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }} - {% if proxify %} - {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }} - {% endif %} -
-
{{ result.pretty_url }}
-{%- endmacro %} - - -{% macro result_footer_rtl(result) -%} -
- {% for engine in result.engines %} - {{ engine }} - {% endfor %} - {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }} - {% if proxify %} - {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }} - {% endif %} -
{{ result.pretty_url }}
-{%- endmacro %} - -{% macro preferences_item_header(info, label, rtl) -%} - {% if rtl %} -
- - {{ info }} -
- {% else %} -
- -
- {% endif %} -{%- endmacro %} - -{% macro preferences_item_footer(info, label, rtl) -%} - {% if rtl %} -
-
- {% else %} -
- {{ info }} -
- {% endif %} -{%- endmacro %} - -{% macro checkbox_toggle(id, blocked) -%} -
- - -
-{%- endmacro %} + +{% macro icon(action) -%} + +{%- endmacro %} + + +{% macro draw_favicon(favicon) -%} + {{ favicon }} +{%- endmacro %} + +{%- macro result_link(url, title, classes='') -%} +{{ title }} +{%- endmacro -%} + + +{% macro result_header(result, favicons) -%} +

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

+{%- endmacro %} + + +{% macro result_sub_header(result) -%} + {% if result.publishedDate %}{% endif %} + {% if result.magnetlink %} • {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}{% endif %} + {% if result.torrentfile %} • {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}{% endif %} +{%- endmacro %} + + +{% macro result_footer(result) -%} +
+
+ {% for engine in result.engines %} + {{ engine }} + {% endfor %} + {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }} + {% if proxify %} + {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }} + {% endif %} +
+
{{ result.pretty_url }}
+{%- endmacro %} + + +{% macro result_footer_rtl(result) -%} +
+ {% for engine in result.engines %} + {{ engine }} + {% endfor %} + {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }} + {% if proxify %} + {{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }} + {% endif %} +
{{ result.pretty_url }}
+{%- endmacro %} + +{% macro preferences_item_header(info, label, rtl) -%} + {% if rtl %} +
+ + {{ info }} +
+ {% else %} +
+ +
+ {% endif %} +{%- endmacro %} + +{% macro preferences_item_footer(info, label, rtl) -%} + {% if rtl %} +
+
+ {% else %} +
+ {{ info }} +
+ {% endif %} +{%- endmacro %} + +{% macro checkbox_toggle(id, blocked) -%} +
+ + +
+{%- endmacro %} diff --git a/searx/templates/simple/macros.html b/searx/templates/simple/macros.html index 76c53a635..883503683 100644 --- a/searx/templates/simple/macros.html +++ b/searx/templates/simple/macros.html @@ -8,9 +8,8 @@ {%- endmacro %} - {% macro draw_favicon(favicon) -%} - {{ favicon }} + {{ favicon }} {%- endmacro %} {% macro result_open_link(url, classes='') -%} -- cgit v1.2.3 From 47ee15f5cee81ac1c68c07592349caecd2bf137a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Fri, 6 Oct 2017 21:50:59 +0200 Subject: preferences: make supported/not supported labels Also, Time range support display was missing from RTL locales. Now it is fixed. Closes #558 --- searx/templates/oscar/macros.html | 12 ++++++++++++ searx/templates/oscar/preferences.html | 31 +++++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) (limited to 'searx/templates') diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index c35a19158..6235bcc62 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -85,3 +85,15 @@ {%- endmacro %} + +{% macro support_toggle(supports) -%} + {% if supports %} + + {{ _("supported") }} + + {% else %} + + {{ _("not supported") }} + + {% endif %} +{%- endmacro %} diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index afb389e44..64706b06b 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -1,7 +1,8 @@ -{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle %} +{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle, support_toggle %} {% extends "oscar/base.html" %} {% block title %}{{ _('preferences') }} - {% endblock %} {% block content %} +

{{ _('Preferences') }}

@@ -148,7 +149,7 @@ {{ _("Allow") }} {{ _("Engine name") }} {{ _("Shortcut") }} - {{ _("Supports selected language") }} + {{ _("Selected language") }} {{ _("SafeSearch") }} {{ _("Time range") }} {{ _("Avg. time") }} @@ -156,8 +157,9 @@ {% else %} {{ _("Max time") }} {{ _("Avg. time") }} + {{ _("Time range") }} {{ _("SafeSearch") }} - {{ _("Supports selected language") }} + {{ _("Selected language") }} {{ _("Shortcut") }} {{ _("Engine name") }} {{ _("Allow") }} @@ -172,17 +174,18 @@ {{ search_engine.name }} {{ shortcuts[search_engine.name] }} - - - - {{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }} - {{ search_engine.timeout }} - {% else %} - {{ search_engine.timeout }} - {{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }} - - - {{ shortcuts[search_engine.name] }} + {{ support_toggle(current_language == 'all' or current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages) }} + {{ support_toggle(search_engine.safesearch==True) }} + {{ support_toggle(search_engine.time_range_support==True) }} + {{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }} + {{ search_engine.timeout }} + {% else %} + {{ search_engine.timeout }} + {{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }} + {{ support_toggle(search_engine.time_range_support==True) }} + {{ support_toggle(search_engine.safesearch==True) }} + {{ support_toggle(current_language == 'all' or current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages) }} + {{ shortcuts[search_engine.name] }} {{ search_engine.name }} {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} -- cgit v1.2.3 From 904a8e7e3f62b32c117ecddfeae39ef3f5e47d1f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 18 Oct 2017 23:44:11 -0400 Subject: Remove extra / in url_for parameter for oscar theme The `filename` parameter of the `url_for` function doesn't need a leading `/`, or else the resulting URL features a double-slash `//` that throws off searx 0.12.0 with Apache 2.4.25 on Debian, resulting in missing favicons. --- searx/templates/oscar/macros.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates') diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 6235bcc62..0ff957521 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -5,7 +5,7 @@ {% macro draw_favicon(favicon) -%} - {{ favicon }} + {{ favicon }} {%- endmacro %} {%- macro result_link(url, title, classes='') -%} -- cgit v1.2.3 From d506d87f60662ece723bae04e930b6b1d8d1f2d0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 18 Oct 2017 23:45:30 -0400 Subject: Remove / in url_for parameter for simple theme Same change as with the oscar theme. --- searx/templates/simple/macros.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates') diff --git a/searx/templates/simple/macros.html b/searx/templates/simple/macros.html index 883503683..f0b36276c 100644 --- a/searx/templates/simple/macros.html +++ b/searx/templates/simple/macros.html @@ -9,7 +9,7 @@ {% macro draw_favicon(favicon) -%} - {{ favicon }} + {{ favicon }} {%- endmacro %} {% macro result_open_link(url, classes='') -%} -- cgit v1.2.3