From df9cf9d09bf4496a9e5d799bd99437a3224a06d4 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 10 Feb 2015 15:23:56 +0100 Subject: Merge branch 'rtl' of github.com:Cqoicebordel/searx --- searx/templates/oscar/base.html | 2 +- searx/templates/oscar/categories.html | 22 ++- searx/templates/oscar/macros.html | 31 ++++ searx/templates/oscar/navbar.html | 19 +++ searx/templates/oscar/preferences.html | 163 +++++++++++---------- searx/templates/oscar/result_templates/code.html | 6 +- .../templates/oscar/result_templates/default.html | 6 +- searx/templates/oscar/result_templates/map.html | 6 +- .../templates/oscar/result_templates/torrent.html | 6 +- searx/templates/oscar/result_templates/videos.html | 4 + searx/templates/oscar/results.html | 22 +++ searx/templates/oscar/search_full.html | 4 + 12 files changed, 205 insertions(+), 86 deletions(-) (limited to 'searx/templates/oscar') diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 57c4d5593..df5c53965 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -1,5 +1,5 @@ - + diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html index f38cce5bd..834cffcce 100644 --- a/searx/templates/oscar/categories.html +++ b/searx/templates/oscar/categories.html @@ -1,6 +1,16 @@
+{% if rtl %} +{% for category in categories | reverse %} + +{% endfor %} +{% else %} {% for category in categories %} + {{ _(category) }} + {% endfor %} +{% endif %}
diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 9b253ad93..f2222c610 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -28,3 +28,34 @@ {{ result.engine }}

{{ result.pretty_url }}

{%- endmacro %} + + +{% macro result_footer_rtl(result) -%} +
+ {{ result.engine }} +

{{ result.pretty_url }}

+{%- endmacro %} + +{% macro preferences_item_header(info, label) -%} + {% if not rtl %} +
+ +
+ {% else %} +
+ {{ info }} +
+ {% endif %} +{%- endmacro %} + +{% macro preferences_item_footer(info, label) -%} + {% if not rtl %} +
+ {{ info }} +
+ {% else %} +
+ +
+ {% endif %} +{%- endmacro %} diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html index db0d7818f..0c92b09dd 100644 --- a/searx/templates/oscar/navbar.html +++ b/searx/templates/oscar/navbar.html @@ -1,6 +1,24 @@ diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index ecb483ebb..066524f48 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -1,3 +1,4 @@ +{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl %} {% extends "oscar/base.html" %} {% block title %}{{ _('preferences') }} - {% endblock %} {% block site_alert_warning_nojs %} @@ -12,7 +13,7 @@
-