on master help sign in
Merge pull request #235 from Cqoicebordel/rtl-fixes

Some RTL fixes

commita8e870fbb6eafe027cd7bea68f9c4c8c22d89558 authorAdam Tauber <asciimoo@gmail.com> dateFri 13 Feb 2015, 11:02 (12 years ago) parentec2516b77ba28c
17 files changed+29−23
searx/templates/courgette/preferences.html+2−2 searx/templates/courgette/result_templates/code.html+3−1 searx/templates/courgette/result_templates/default.html+1−1 searx/templates/courgette/result_templates/map.html+1−1 searx/templates/courgette/result_templates/torrent.html+1−1 searx/templates/courgette/result_templates/videos.html+1−1 searx/templates/courgette/results.html+1−1 searx/templates/default/preferences.html+2−2 searx/templates/default/result_templates/code.html+4−2 searx/templates/default/result_templates/default.html+1−1 searx/templates/default/result_templates/map.html+1−1 searx/templates/default/result_templates/torrent.html+1−1 searx/templates/default/result_templates/videos.html+1−1 searx/templates/oscar/macros.html+3−3 searx/templates/oscar/preferences.html+2−2 searx/templates/oscar/result_templates/code.html+2 searx/templates/oscar/results.html+2−2
searx/templates/courgette/preferences.html+2−2
@@ -14,7 +14,7 @@
1414 <p>
1515 <select name='language'>
1616 <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
17− {% for lang_id,lang_name,country_name in language_codes %}
17+ {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %}
1818 <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
1919 {% endfor %}
2020 </select>
@@ -24,7 +24,7 @@
2424 <legend>{{ _('Interface language') }}</legend>
2525 <p>
2626 <select name='locale'>
27− {% for locale_id,locale_name in locales.items() %}
27+ {% for locale_id,locale_name in locales.items() | sort %}
2828 <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
2929 {% endfor %}
3030 </select>
searx/templates/courgette/result_templates/code.html+3−1
@@ -3,7 +3,9 @@
33 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
44 <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>
55 {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
6+ <div dir="ltr">
67 {{ result.codelines|code_highlighter(result.code_language)|safe }}
8+ </div>
79
8− <p class="url">{{ result.pretty_url }}</p>
10+ <p class="url">{{ result.pretty_url }}&lrm;</p>
911</div>
searx/templates/courgette/result_templates/default.html+1−1
@@ -8,6 +8,6 @@
88 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
99 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
1010 <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
11− <p class="url">{{ result.pretty_url }}</p>
11+ <p class="url">{{ result.pretty_url }}&lrm;</p>
1212 </div>
1313</div>
searx/templates/courgette/result_templates/map.html+1−1
@@ -8,6 +8,6 @@
88 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
99 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
1010 <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
11− <p class="url">{{ result.pretty_url }}</p>
11+ <p class="url">{{ result.pretty_url }}&lrm;</p>
1212 </div>
1313</div>
searx/templates/courgette/result_templates/torrent.html+1−1
@@ -9,5 +9,5 @@
99 {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %}
1010 {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile">{{ _('torrent file') }}</a>{% endif %}
1111 </span>
12− <p class="url">{{ result.pretty_url }}</p>
12+ <p class="url">{{ result.pretty_url }}&lrm;</p>
1313</div>
searx/templates/courgette/result_templates/videos.html+1−1
@@ -6,5 +6,5 @@
66 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
77 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
88 <a href="{{ result.url }}"><img width="400" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
9− <p class="url">{{ result.pretty_url }}</p>
9+ <p class="url">{{ result.pretty_url }}&lrm;</p>
1010</div>
searx/templates/courgette/results.html+1−1
@@ -13,7 +13,7 @@
1313 <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&amp;pageno={{ pageno }}{% if selected_categories %}&amp;category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly />
1414 </div>
1515 <div id="apis">
16− {{ _('Download results') }}
16+ {{ _('Download results') }}<br />
1717 {% for output_type in ('csv', 'json', 'rss') %}
1818 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
1919 <div class="left">
searx/templates/default/preferences.html+2−2
@@ -15,7 +15,7 @@
1515 <p>
1616 <select name='language'>
1717 <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
18− {% for lang_id,lang_name,country_name in language_codes %}
18+ {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %}
1919 <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
2020 {% endfor %}
2121 </select>
@@ -25,7 +25,7 @@
2525 <legend>{{ _('Interface language') }}</legend>
2626 <p>
2727 <select name='locale'>
28− {% for locale_id,locale_name in locales.items() %}
28+ {% for locale_id,locale_name in locales.items() | sort %}
2929 <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
3030 {% endfor %}
3131 </select>
searx/templates/default/result_templates/code.html+4−2
@@ -1,9 +1,11 @@
11<div class="result {{ result.class }}">
22 <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
3− <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a></p>
3+ <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a></p>
44 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
55 <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>
66 {% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
7−
7+
8+ <div dir="ltr">
89 {{ result.codelines|code_highlighter(result.code_language)|safe }}
10+ </div>
911</div>
searx/templates/default/result_templates/default.html+1−1
@@ -1,6 +1,6 @@
11<div class="result {{ result.class }}">
22 <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
3− <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a>
3+ <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a>
44 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>
55 <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>
66</div>
searx/templates/default/result_templates/map.html+1−1
@@ -6,7 +6,7 @@
66
77 <div>
88 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
9− <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a>
9+ <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a>
1010 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>
1111 <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>
1212 </div>
searx/templates/default/result_templates/torrent.html+1−1
@@ -3,7 +3,7 @@
33 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
44 {% endif %}
55 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
6− <p class="url">{{ result.pretty_url }}</p>
6+ <p class="url">{{ result.pretty_url }}&lrm;</p>
77 {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}
88 <p>
99 {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %}
searx/templates/default/result_templates/videos.html+1−1
@@ -2,5 +2,5 @@
22 <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
33 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
44 <a href="{{ result.url }}"><img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
5− <p class="url">{{ result.url }}</p>
5+ <p class="url">{{ result.url }}&lrm;</p>
66</div>
searx/templates/oscar/macros.html+3−3
@@ -33,13 +33,14 @@
3333{% macro result_footer_rtl(result) -%}
3434 <div class="clearfix"></div>
3535 <span class="label label-default pull-left">{{ result.engine }}</span>
36− <p class="text-muted">{{ result.pretty_url }}</p>
36+ <p class="text-muted">{{ result.pretty_url }}&lrm;</p>
3737{%- endmacro %}
3838
3939{% macro preferences_item_header(info, label, rtl) -%}
4040 {% if rtl %}
4141 <div class="row form-group">
42− <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>
42+ <label class="col-sm-3 col-md-2 pull-right">{{ label }}</label>
43+ <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>
4344 <div class="col-sm-4 col-md-4">
4445 {% else %}
4546 <div class="row form-group">
@@ -51,7 +52,6 @@
5152{% macro preferences_item_footer(info, label, rtl) -%}
5253 {% if rtl %}
5354 </div>
54− <label class="col-sm-3 col-md-2">{{ label }}</label>
5555 </div>
5656 {% else %}
5757 </div>
searx/templates/oscar/preferences.html+2−2
@@ -44,7 +44,7 @@
4444 {{ preferences_item_header(language_info, language_label, rtl) }}
4545 <select class="form-control" name='language'>
4646 <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
47− {% for lang_id,lang_name,country_name in language_codes %}
47+ {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %}
4848 <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
4949 {% endfor %}
5050 </select>
@@ -54,7 +54,7 @@
5454 {% set locale_info = _('Change the language of the layout') %}
5555 {{ preferences_item_header(locale_info, locale_label, rtl) }}
5656 <select class="form-control" name='locale'>
57− {% for locale_id,locale_name in locales.items() %}
57+ {% for locale_id,locale_name in locales.items() | sort %}
5858 <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
5959 {% endfor %}
6060 </select>
searx/templates/oscar/result_templates/code.html+2
@@ -7,7 +7,9 @@
77
88{% if result.repository %}<p class="result-content">{{ icon('file') }} <a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
99
10+<div dir="ltr">
1011{{ result.codelines|code_highlighter(result.code_language)|safe }}
12+</div>
1113
1214{% if rtl %}
1315{{ result_footer_rtl(result) }}
searx/templates/oscar/results.html+2−2
@@ -91,7 +91,7 @@
9191 </div>
9292 <div class="panel-body">
9393 {% for suggestion in suggestions %}
94− <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">
94+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} suggestion_item">
9595 <input type="hidden" name="q" value="{{ suggestion }}">
9696 <button type="submit" class="btn btn-default btn-xs">{{ suggestion }}</button>
9797 </form>
@@ -115,7 +115,7 @@
115115 <label>{{ _('Download results') }}</label>
116116 <div class="clearfix"></div>
117117 {% for output_type in ('csv', 'json', 'rss') %}
118− <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-left result_download">
118+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} result_download">
119119 <input type="hidden" name="q" value="{{ q }}">
120120 <input type="hidden" name="format" value="{{ output_type }}">
121121 {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1">{% endfor %}