diff --git a/searx/static/themes/courgette/css/style-rtl.css b/searx/static/themes/courgette/css/style-rtl.css index 38c4153a6..a725ac1e8 100644 --- a/searx/static/themes/courgette/css/style-rtl.css +++ b/searx/static/themes/courgette/css/style-rtl.css @@ -1 +1 @@ -.q{padding:.5em 1em .5em 3em}#search_submit{left:0;right:auto}.result .favicon{float:right;margin-left:.5em;margin-right:0}#sidebar{right:auto;left:0}#results{padding:0 32px 0 272px}.search.center{padding-right:0;padding-left:17em}.right{right:auto;left:0}#pagination form+form{float:left;margin-top:-2em} \ No newline at end of file +.q{padding:.5em 1em .5em 3em}#search_submit{left:0;right:auto}.result .favicon{float:right;margin-left:.5em;margin-right:0}#sidebar{right:auto;left:0}#results{padding:0 32px 0 272px}.search.center{padding-right:0;padding-left:17em}.right{right:auto;left:0}#pagination form+form{float:left;margin-top:-2em}.engine-table{text-align:right} \ No newline at end of file diff --git a/searx/static/themes/courgette/less/style-rtl.less b/searx/static/themes/courgette/less/style-rtl.less index 13a34f124..3e357d3d8 100644 --- a/searx/static/themes/courgette/less/style-rtl.less +++ b/searx/static/themes/courgette/less/style-rtl.less @@ -35,4 +35,8 @@ #pagination form + form { float: left; margin-top: -2em; +} + +.engine-table { + text-align:right; } \ No newline at end of file diff --git a/searx/templates/courgette/about.html b/searx/templates/courgette/about.html index 1c2e0635d..2945e1f7b 100644 --- a/searx/templates/courgette/about.html +++ b/searx/templates/courgette/about.html @@ -1,7 +1,7 @@ {% extends 'courgette/base.html' %} {% block content %} {% include 'courgette/github_ribbon.html' %} -
+

About searx

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users. diff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html index 379d68601..efa0f65fa 100644 --- a/searx/templates/courgette/preferences.html +++ b/searx/templates/courgette/preferences.html @@ -95,7 +95,7 @@

{{ _('Currently used search engines') }} - +
diff --git a/searx/templates/default/about.html b/searx/templates/default/about.html index 01d6f444e..1b5fc34c0 100644 --- a/searx/templates/default/about.html +++ b/searx/templates/default/about.html @@ -1,7 +1,7 @@ {% extends 'default/base.html' %} {% block content %} {% include 'default/github_ribbon.html' %} -
+

About searx

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users. diff --git a/searx/templates/default/result_templates/code.html b/searx/templates/default/result_templates/code.html index 0aba4684d..751fb3b56 100644 --- a/searx/templates/default/result_templates/code.html +++ b/searx/templates/default/result_templates/code.html @@ -1,6 +1,6 @@

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

-

{{ result.pretty_url }} cached

+

{{ result.pretty_url }} {{ _('cached') }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

{% if result.repository %}

{{ result.repository }}

{% endif %} diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index b7f9d3557..167db888b 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,6 +1,6 @@

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

-

{{ result.pretty_url }} cached +

{{ result.pretty_url }} {{ _('cached') }} {% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index 159e472b5..b0eda2be5 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -6,7 +6,7 @@

{{ result.title|safe }}

-

{{ result.pretty_url }} cached +

{{ result.pretty_url }} {{ _('cached') }} {% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html index 6f9572546..e1f378294 100644 --- a/searx/templates/oscar/about.html +++ b/searx/templates/oscar/about.html @@ -2,7 +2,7 @@ {% block site_alert_warning_nojs %} {% endblock %} {% block title %}{{ _('about') }} - {% endblock %} {% block content %} -
+

About searx

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users. diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index f2222c610..42721a812 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -36,26 +36,26 @@

{{ result.pretty_url }}

{%- endmacro %} -{% macro preferences_item_header(info, label) -%} - {% if not rtl %} +{% macro preferences_item_header(info, label, rtl) -%} + {% if rtl %}
- + {{ info }}
{% else %}
- {{ info }} +
{% endif %} {%- endmacro %} -{% macro preferences_item_footer(info, label) -%} - {% if not rtl %} +{% macro preferences_item_footer(info, label, rtl) -%} + {% if rtl %}
- {{ info }} +
{% else %}
- + {{ info }}
{% endif %} {%- endmacro %} diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index 066524f48..b98100e8e 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -41,73 +41,73 @@
{% set language_label = _('Search language') %} {% set language_info = _('What language do you prefer for search?') %} - {{ preferences_item_header(language_info, language_label) }} + {{ preferences_item_header(language_info, language_label, rtl) }} - {{ preferences_item_footer(language_info, language_label) }} + {{ preferences_item_footer(language_info, language_label, rtl) }} {% set locale_label = _('Interface language') %} {% set locale_info = _('Change the language of the layout') %} - {{ preferences_item_header(locale_info, locale_label) }} + {{ preferences_item_header(locale_info, locale_label, rtl) }} - {{ preferences_item_footer(locale_info, locale_label) }} + {{ preferences_item_footer(locale_info, locale_label, rtl) }} {% set autocomplete_label = _('Autocomplete') %} {% set autocomplete_info = _('Find stuff as you type') %} - {{ preferences_item_header(autocomplete_info, autocomplete_label) }} + {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }} - {{ preferences_item_footer(autocomplete_info, autocomplete_label) }} + {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }} {% set image_proxy_label = _('Image proxy') %} {% set image_proxy_info = _('Proxying image results through searx') %} - {{ preferences_item_header(image_proxy_info, image_proxy_label) }} + {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }} - {{ preferences_item_footer(image_proxy_info, image_proxy_label) }} + {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }} {% set method_label = _('Method') %} {% set method_info = _('Change how forms are submited, learn more about request methods') %} - {{ preferences_item_header(method_info, method_label) }} + {{ preferences_item_header(method_info, method_label, rtl) }} - {{ preferences_item_footer(method_info, method_label) }} + {{ preferences_item_footer(method_info, method_label, rtl) }} {% set safesearch_label = _('SafeSearch') %} {% set safesearch_info = _('Filter content') %} - {{ preferences_item_header(safesearch_info, safesearch_label) }} + {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }} - {{ preferences_item_footer(safesearch_info, safesearch_label) }} + {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }} {% set theme_label = _('Themes') %} {% set theme_info = _('Change searx layout') %} - {{ preferences_item_header(theme_info, theme_label) }} + {{ preferences_item_header(theme_info, theme_label, rtl) }} - {{ preferences_item_footer(theme_info, theme_label) }} + {{ preferences_item_footer(theme_info, theme_label, rtl) }}
diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 2e679e84d..822c7cdea 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -40,7 +40,7 @@ {% endif %} {% if result.osm and (result.osm.type and result.osm.id) %} -
+
Loading ...
{{ _('Engine name') }} {{ _('Category') }}
diff --git a/searx/webapp.py b/searx/webapp.py index 77b4507e9..b12a08db5 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -412,7 +412,6 @@ def about(): """Render about page""" return render( 'about.html', - rtl=False, )