Merge pull request #235 from Cqoicebordel/rtl-fixes

Some RTL fixes

4 files changed, 9 insertions, 7 deletions

diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html
index 42721a812..1ba1617a9 100644
--- a/searx/templates/oscar/macros.html
+++ b/searx/templates/oscar/macros.html
@@ -33,13 +33,14 @@
 {% macro result_footer_rtl(result) -%}

     <div class="clearfix"></div>

     <span class="label label-default pull-left">{{ result.engine }}</span>

-    <p class="text-muted">{{ result.pretty_url }}</p>

+    <p class="text-muted">{{ result.pretty_url }}&lrm;</p>

 {%- endmacro %}

 

 {% macro preferences_item_header(info, label, rtl) -%}

     {% if rtl %}

     <div class="row form-group">

-        <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>

+        <label class="col-sm-3 col-md-2 pull-right">{{ label }}</label>

+        <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>

         <div class="col-sm-4 col-md-4">

     {% else %}

     <div class="row form-group">

@@ -51,7 +52,6 @@
 {% macro preferences_item_footer(info, label, rtl) -%}

     {% if rtl %}

         </div>

-        <label class="col-sm-3 col-md-2">{{ label }}</label>

     </div>

     {% else %}

         </div>

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index b98100e8e..126bdbd7b 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -44,7 +44,7 @@
                 {{ preferences_item_header(language_info, language_label, rtl) }}
                     <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 %}
+                        {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %}
                         <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
                         {% endfor %}
                     </select>
@@ -54,7 +54,7 @@
                 {% set locale_info = _('Change the language of the layout') %}
                 {{ preferences_item_header(locale_info, locale_label, rtl) }}
                     <select class="form-control" name='locale'>
-                        {% for locale_id,locale_name in locales.items() %}
+                        {% for locale_id,locale_name in locales.items() | sort %}
                         <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
                         {% endfor %}
                     </select>
diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html
index 0ec0983b3..6890c7851 100644
--- a/searx/templates/oscar/result_templates/code.html
+++ b/searx/templates/oscar/result_templates/code.html
@@ -7,7 +7,9 @@
 

 {% if result.repository %}<p class="result-content">{{ icon('file') }} <a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}

 

+<div dir="ltr">

 {{ result.codelines|code_highlighter(result.code_language)|safe }}

+</div>

 

 {% if rtl %}

 {{ result_footer_rtl(result) }}

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 8303573f0..a75825611 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -91,7 +91,7 @@
                 </div>

                 <div class="panel-body">

                     {% for suggestion in suggestions %}

-                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">

+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} suggestion_item">

                         <input type="hidden" name="q" value="{{ suggestion }}">

                         <button type="submit" class="btn btn-default btn-xs">{{ suggestion }}</button>

                     </form>

@@ -115,7 +115,7 @@
                     <label>{{ _('Download results') }}</label>

                     <div class="clearfix"></div>

                     {% for output_type in ('csv', 'json', 'rss') %}

-                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-left result_download">

+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} result_download">

                         <input type="hidden" name="q" value="{{ q }}">

                         <input type="hidden" name="format" value="{{ output_type }}">

                         {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1">{% endfor %}