From df9cf9d09bf4496a9e5d799bd99437a3224a06d4 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Tue, 10 Feb 2015 15:23:56 +0100
Subject: Merge branch 'rtl' of github.com:Cqoicebordel/searx

---
 searx/templates/oscar/preferences.html | 163 +++++++++++++++++----------------
 1 file changed, 83 insertions(+), 80 deletions(-)

(limited to 'searx/templates/oscar/preferences.html')

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 @@
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;">
+    <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
       <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
       <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
     </ul>
@@ -26,96 +27,94 @@
             <fieldset>
             <div class="container-fluid">
                 <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                    {% if rtl %}
                     <div class="col-sm-11 col-md-10">
                         {% include 'oscar/categories.html' %}
                     </div>
-                </div>
-                <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('Search language') }}</label>
-                    <div class="col-sm-4 col-md-4">
-                        <select class="form-control" name='language'>
-                            <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
-                            {% for lang_id,lang_name,country_name in language_codes %}
-                            <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <span class="col-sm-5 col-md-6 help-block">{{ _('What language do you prefer for search?') }}</span>
-                </div>
-                <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('Interface language') }}</label>
-                    <div class="col-sm-4 col-md-4">
-                        <select class="form-control" name='locale'>
-                            {% for locale_id,locale_name in locales.items() %}
-                            <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
-                            {% endfor %}
-                        </select>
+                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                    {% else %}
+                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                    <div class="col-sm-11 col-md-10">
+                        {% include 'oscar/categories.html' %}
                     </div>
-                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change the language of the layout') }}</span>
+                    {% endif %}
                 </div>
-                <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('Autocomplete') }}</label>
-                    <div class="col-sm-4 col-md-4">
+                {% set language_label = _('Search language') %}
+                {% set language_info = _('What language do you prefer for search?') %}
+                {{ preferences_item_header(language_info, language_label) }}
+                    <select class="form-control" name='language'>
+                        <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
+                        {% for lang_id,lang_name,country_name in language_codes %}
+                        <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
+                        {% endfor %}
+                    </select>
+                {{ preferences_item_footer(language_info, language_label) }}
 
-                        <select class="form-control" name="autocomplete">
-                            <option value=""> - </option>
-                            {% for backend in autocomplete_backends %}
-                            <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <span class="col-sm-5 col-md-6 help-block">{{ _('Find stuff as you type') }}</span>
-                </div>
-                <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('Image proxy') }}</label>
-                    <div class="col-sm-4 col-md-4">
-                        <select class="form-control" name='image_proxy'>
-                            <option value="1" {% if image_proxy  %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
-                            <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
-                        </select>
-                    </div>
-                    <span class="col-sm-5 col-md-6 help-block">{{ _('Proxying image results through searx') }}</span>
-                </div>
-                <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('Method') }}</label>
-                    <div class="col-sm-4 col-md-4">
-                        <select class="form-control" name='method'>
-                            <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
-                            <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
-                        </select>
-                    </div>
-                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') }}</span>
-                </div>
-                <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('SafeSearch') }}</label>
-                    <div class="col-sm-4 col-md-4">
-                        <select class="form-control" name='safesearch'>
-                            <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
-                            <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
-                            <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
-                        </select>
-                    </div>
-                    <span class="col-sm-5 col-md-6 help-block">{{ _('Filter explicite content') }}</span>
-                </div>
-                <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('Themes') }}</label>
-                    <div class="col-sm-4 col-md-4">
-                        <select class="form-control" name="theme">
-                            {% for name in themes %}
-                            <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change searx layout') }}</span>
-                </div>
+                {% set locale_label = _('Interface language') %}
+                {% set locale_info = _('Change the language of the layout') %}
+                {{ preferences_item_header(locale_info, locale_label) }}
+                    <select class="form-control" name='locale'>
+                        {% for locale_id,locale_name in locales.items() %}
+                        <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
+                        {% endfor %}
+                    </select>
+                {{ preferences_item_footer(locale_info, locale_label) }}
+
+                {% set autocomplete_label = _('Autocomplete') %}
+                {% set autocomplete_info = _('Find stuff as you type') %}
+                {{ preferences_item_header(autocomplete_info, autocomplete_label) }}
+                    <select class="form-control" name="autocomplete">
+                        <option value=""> - </option>
+                        {% for backend in autocomplete_backends %}
+                        <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
+                        {% endfor %}
+                    </select>
+                {{ preferences_item_footer(autocomplete_info, autocomplete_label) }}
+
+                {% set image_proxy_label = _('Image proxy') %}
+                {% set image_proxy_info = _('Proxying image results through searx') %}
+                {{ preferences_item_header(image_proxy_info, image_proxy_label) }}
+                    <select class="form-control" name='image_proxy'>
+                        <option value="1" {% if image_proxy  %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
+                        <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
+                    </select>
+                {{ preferences_item_footer(image_proxy_info, image_proxy_label) }}
+
+                {% set method_label = _('Method') %}
+                {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %}
+                {{ preferences_item_header(method_info, method_label) }}
+                    <select class="form-control" name='method'>
+                        <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
+                        <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
+                    </select>
+                {{ preferences_item_footer(method_info, method_label) }}
+
+                {% set safesearch_label = _('SafeSearch') %}
+                {% set safesearch_info = _('Filter content') %}
+                {{ preferences_item_header(safesearch_info, safesearch_label) }}
+                    <select class="form-control" name='safesearch'>
+                        <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
+                        <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
+                        <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
+                    </select>
+                {{ preferences_item_footer(safesearch_info, safesearch_label) }}
+
+                {% set theme_label = _('Themes') %}
+                {% set theme_info = _('Change searx layout') %}
+                {{ preferences_item_header(theme_info, theme_label) }}
+                    <select class="form-control" name="theme">
+                        {% for name in themes %}
+                        <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
+                        {% endfor %}
+                    </select>
+                {{ preferences_item_footer(theme_info, theme_label) }}
             </div>
             </fieldset>
         </div>
         <div class="tab-pane active_if_nojs" id="tab_engine">
 
             <!-- Nav tabs -->
-            <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;">
+            <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
                 {% for (categ,search_engines) in categs %}
                 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
                 {% endfor %}
@@ -136,7 +135,9 @@
                     {% for search_engine in search_engines %}
                         {% if not search_engine.private %}
                             <div class="row">
+                                {% if not rtl %}
                                 <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
+                                {% endif %}
                                 <div class="col-xs-6 col-sm-4 col-md-4">
                                     <div class="checkbox">
                                     <input class="hidden" type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} />
@@ -144,6 +145,9 @@
                                     <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
                                     </div>
                                 </div>
+                                {% if rtl %}
+                                <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</div>
+                                {% endif %}
                             </div>
                         {% endif %}
                     {% endfor %}
@@ -154,7 +158,6 @@
             </div>
         </div>
     </div>
-
     <p class="text-muted" style="margin:20px 0;">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }}
     <br />
     {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
-- 
cgit v1.2.3