From 77ba28cf505e7f0cdde294e8ad10f9c07db43f6a Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Fri, 13 Feb 2015 01:03:18 +0100
Subject: Some RTL fixes - Pull the suggestions to the right in oscar - Add
 `&lrm;` to a few places to print good url - Always LTR code display - Order
 pref label and info in pref for mobile view

And add `sort` for ui languages and languages to find them more easily.
---
 searx/templates/courgette/preferences.html              | 4 ++--
 searx/templates/courgette/result_templates/code.html    | 4 +++-
 searx/templates/courgette/result_templates/default.html | 2 +-
 searx/templates/courgette/result_templates/map.html     | 2 +-
 searx/templates/courgette/result_templates/torrent.html | 2 +-
 searx/templates/courgette/result_templates/videos.html  | 2 +-
 searx/templates/courgette/results.html                  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'searx/templates/courgette')

diff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html
index efa0f65fa..2abfafb13 100644
--- a/searx/templates/courgette/preferences.html
+++ b/searx/templates/courgette/preferences.html
@@ -14,7 +14,7 @@
         <p>
             <select 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>
@@ -24,7 +24,7 @@
         <legend>{{ _('Interface language') }}</legend>
         <p>
             <select 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/courgette/result_templates/code.html b/searx/templates/courgette/result_templates/code.html
index 6721bd0fe..382ce2a56 100644
--- a/searx/templates/courgette/result_templates/code.html
+++ b/searx/templates/courgette/result_templates/code.html
@@ -3,7 +3,9 @@
     {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
     <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
     {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
+    <div dir="ltr">
     {{ result.codelines|code_highlighter(result.code_language)|safe }}
+	</div>
 
-    <p class="url">{{ result.pretty_url }}</p>
+    <p class="url">{{ result.pretty_url }}&lrm;</p>
 </div>
diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html
index efd9778dc..f5f5acef7 100644
--- a/searx/templates/courgette/result_templates/default.html
+++ b/searx/templates/courgette/result_templates/default.html
@@ -8,6 +8,6 @@
         <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
         {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
         <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
-        <p class="url">{{ result.pretty_url }}</p>
+        <p class="url">{{ result.pretty_url }}&lrm;</p>
     </div>
 </div>
\ No newline at end of file
diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html
index efd9778dc..f5f5acef7 100644
--- a/searx/templates/courgette/result_templates/map.html
+++ b/searx/templates/courgette/result_templates/map.html
@@ -8,6 +8,6 @@
         <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
         {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
         <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
-        <p class="url">{{ result.pretty_url }}</p>
+        <p class="url">{{ result.pretty_url }}&lrm;</p>
     </div>
 </div>
\ No newline at end of file
diff --git a/searx/templates/courgette/result_templates/torrent.html b/searx/templates/courgette/result_templates/torrent.html
index 607c1de02..b961eb09b 100644
--- a/searx/templates/courgette/result_templates/torrent.html
+++ b/searx/templates/courgette/result_templates/torrent.html
@@ -9,5 +9,5 @@
         {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %} 
         {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile">{{ _('torrent file') }}</a>{% endif %}
     </span>
-    <p class="url">{{ result.pretty_url }}</p>
+    <p class="url">{{ result.pretty_url }}&lrm;</p>
 </div>
\ No newline at end of file
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html
index 891b69f28..4e0174ba6 100644
--- a/searx/templates/courgette/result_templates/videos.html
+++ b/searx/templates/courgette/result_templates/videos.html
@@ -6,5 +6,5 @@
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
     <a href="{{ result.url }}"><img width="400" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
-    <p class="url">{{ result.pretty_url }}</p>
+    <p class="url">{{ result.pretty_url }}&lrm;</p>
 </div>
diff --git a/searx/templates/courgette/results.html b/searx/templates/courgette/results.html
index 6d603fdee..619c99763 100644
--- a/searx/templates/courgette/results.html
+++ b/searx/templates/courgette/results.html
@@ -13,7 +13,7 @@
             <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&amp;pageno={{ pageno }}{% if selected_categories %}&amp;category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly />
         </div>
         <div id="apis">
-            {{ _('Download results') }}
+            {{ _('Download results') }}<br />
             {% for output_type in ('csv', 'json', 'rss') %}
             <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
                 <div class="left">
-- 
cgit v1.2.3