From f496dc353d336ffe11dde161963d72366f0eee16 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 26 Jun 2016 01:57:43 +0200 Subject: [enh] oscar theme redesign added The original code made by @logico-dev (#559) --- searx/templates/oscar/base.html | 10 +++++++--- searx/templates/oscar/index.html | 9 ++++++++- searx/templates/oscar/macros.html | 12 ++++++++---- searx/templates/oscar/preferences.html | 7 +++++++ 4 files changed, 30 insertions(+), 8 deletions(-) (limited to 'searx/templates/oscar') diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index f63025ecc..649d91f4d 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -12,7 +12,11 @@ {% block title %}{% endblock %}{{ instance_name }} - + {% if cookies['oscar-style'] %} + + {% else %} + + {% endif %} {% for css in styles %} @@ -48,8 +52,8 @@ -
{% include 'oscar/navbar.html' %} +
{% block site_alert_error %} {% endblock %} @@ -75,7 +79,7 @@
{% block footer %} {% endblock %} -

{{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}

+

{{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}

diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html index e58aa073a..466c2b485 100644 --- a/searx/templates/oscar/index.html +++ b/searx/templates/oscar/index.html @@ -3,7 +3,14 @@
-

searx logosearx

+ {% if cookies['oscar-style'] == 'pointhi' %} +

searx logosearx

+ {% else %} +

+ searx logo + searx +

+ {% endif %}
diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index cf49ce81a..8cb44eb2d 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -17,7 +17,6 @@ {% macro result_sub_header(result) -%} {% if result.publishedDate %}{% endif %} - {{ icon('link') }} {{ _('cached') }} {% if result.magnetlink %} • {{ icon('magnet') }} {{ _('magnet link') }}{% endif %} {% if result.torrentfile %} • {{ icon('download-alt') }} {{ _('torrent file') }}{% endif %} {%- endmacro %} @@ -29,15 +28,20 @@ {% for engine in result.engines %} {{ engine }} {% endfor %} + {{ icon('link') }} {{ _('cached') }}
-

{{ result.pretty_url }}

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

{{ result.pretty_url }}‎

+ {% for engine in result.engines %} + {{ engine }} + {% endfor %} + {{ icon('link') }} {{ _('cached') }} +
+ {{ result.pretty_url }} {%- endmacro %} {% macro preferences_item_header(info, label, rtl) -%} diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index a2c493a02..18308bd23 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -110,6 +110,13 @@ {% endfor %} {{ preferences_item_footer(theme_info, theme_label, rtl) }} + + {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl) }} + + {{ preferences_item_footer(_('Choose style for this theme'), _('Style'), rtl) }}
-- cgit v1.2.3