commit: 77ba28cf505e7f0cdde294e8ad10f9c07db43f6a parent ec2516b93db6343afc4bd86291082dfb64914595 Author: Cqoicebordel <Cqoicebordel@users.noreply.github.com> Date: Fri, 13 Feb 2015 01:03:18 +0100 Some RTL fixes - Pull the suggestions to the right in oscar - Add `‎` 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.Diffstat:
17 files changed, 29 insertions(+), 23 deletions(-)diff --git 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@@ -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 }}‎</p> </div>diff --git 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 }}‎</p> </div> </div> \ No newline at end of filediff --git 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 }}‎</p> </div> </div> \ No newline at end of filediff --git 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 }}‎</p> </div> \ No newline at end of filediff --git 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 }}‎</p> </div>diff --git 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 }}&pageno={{ pageno }}{% if selected_categories %}&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">diff --git a/searx/templates/default/preferences.html b/searx/templates/default/preferences.html@@ -15,7 +15,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> @@ -25,7 +25,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/default/result_templates/code.html b/searx/templates/default/result_templates/code.html@@ -1,9 +1,11 @@ <div class="result {{ result.class }}"> <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> - <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a></p> + <p class="url">{{ result.pretty_url }}‎ <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a></p> {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% 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="result-content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %} - + + <div dir="ltr"> {{ result.codelines|code_highlighter(result.code_language)|safe }} + </div> </div>diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html@@ -1,6 +1,6 @@ <div class="result {{ result.class }}"> <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> - <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> + <p class="url">{{ result.pretty_url }}‎ <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p> <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> </div>diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html@@ -6,7 +6,7 @@ <div> <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> + <p class="url">{{ result.pretty_url }}‎ <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p> <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> </div>diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html@@ -3,7 +3,7 @@ <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" /> {% endif %} <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - <p class="url">{{ result.pretty_url }}</p> + <p class="url">{{ result.pretty_url }}‎</p> {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %} <p> {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %}diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html@@ -2,5 +2,5 @@ <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> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %} <a href="{{ result.url }}"><img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> - <p class="url">{{ result.url }}</p> + <p class="url">{{ result.url }}‎</p> </div>diff --git 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 }}‎</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@@ -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@@ -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@@ -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 %}