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/default/base.html        | 5 ++++-
 searx/templates/default/index.html       | 5 +++++
 searx/templates/default/preferences.html | 4 ++--
 searx/templates/default/results.html     | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'searx/templates/default')
diff --git a/searx/templates/default/base.html b/searx/templates/default/base.html
index 4bca6a7e0..fa96d9437 100644
--- a/searx/templates/default/base.html
+++ b/searx/templates/default/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
     <head>
         <meta charset="UTF-8" />
         <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
@@ -8,6 +8,9 @@
         <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />
         <title>{% block title %}{% endblock %}searx</title>
         <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />
+        {% if rtl %}
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/style-rtl.css') }}" type="text/css" media="screen" />
+        {% endif %}
         <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" />
         {% block styles %}
         {% endblock %}
diff --git a/searx/templates/default/index.html b/searx/templates/default/index.html
index 72fbec8ca..fc15a44b6 100644
--- a/searx/templates/default/index.html
+++ b/searx/templates/default/index.html
@@ -4,8 +4,13 @@
     <div class="title"><h1>searx</h1></div>
     {% include 'default/search.html' %}
     <p class="top_margin">
+    	{% if rtl %}
+    	<a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>
+    	{% endif %}
         <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a>
+        {% if not rtl %}
         <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>
+        {% endif %}
     </p>
 </div>
 {% include 'default/github_ribbon.html' %}
diff --git a/searx/templates/default/preferences.html b/searx/templates/default/preferences.html
index 8ac6a895c..43180fd5b 100644
--- a/searx/templates/default/preferences.html
+++ b/searx/templates/default/preferences.html
@@ -94,7 +94,7 @@
 
             {% if not search_engine.private %}
             <tr>
-                <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td>
+                <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
                 <td>{{ _(categ) }}</td>
                 <td class="engine_checkbox">
                     <input 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 %} />
@@ -113,7 +113,7 @@
     </p>
 
     <input type="submit" value="{{ _('save') }}" />
-    <div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
+    <div class="{% if rtl %}left{% else %}right{% endif %} preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
     </form>    
 </div>
 {% endblock %}
diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html
index c83bf5c5d..3f7712e53 100644
--- a/searx/templates/default/results.html
+++ b/searx/templates/default/results.html
@@ -72,7 +72,7 @@
     <div id="pagination">
         {% if pageno > 1 %}
             <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
-                <div class="left">
+                <div class="{% if rtl %}right{% else %}left{% endif %}">
                 <input type="hidden" name="q" value="{{ q }}" />
                 {% for category in selected_categories %}
                 <input type="hidden" name="category_{{ category }}" value="1"/>
@@ -83,7 +83,7 @@
             </form>
         {% endif %}
         <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
-            <div class="right">
+            <div class="{% if rtl %}left{% else %}right{% endif %}">
                 {% for category in selected_categories %}
                 <input type="hidden" name="category_{{ category }}" value="1"/>
                 {% endfor %}
-- 
cgit v1.2.3

