516105c · searx · git.iko.soy

searx/static/themes/courgette/css/style-rtl.css+1−1

@@ -1 +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}

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}.engine-table{text-align:right}

searx/static/themes/courgette/less/style-rtl.less+4

@@ -35,4 +35,8 @@

3535#pagination form + form {

3636 float: left;

3737 margin-top: -2em;

38+}

39+

40+.engine-table {

41+ text-align:right;

3842}

searx/templates/courgette/about.html+1−1

@@ -1,7 +1,7 @@

11{% extends 'courgette/base.html' %}

22{% block content %}

33{% include 'courgette/github_ribbon.html' %}

4−<div class="row">

4+<div class="row"{% if rtl %} dir="ltr"{% endif %}>

55 <h1>About <a href="{{ url_for('index') }}">searx</a></h1>

66

77 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.

searx/templates/courgette/preferences.html+1−1

@@ -95,7 +95,7 @@

9595 <fieldset>

9696 <legend>{{ _('Currently used search engines') }}</legend>

9797

98− <table>

98+ <table class="engine-table">

9999 <tr>

100100 <th>{{ _('Engine name') }}</th>

101101 <th>{{ _('Category') }}</th>

searx/templates/default/about.html+1−1

@@ -1,7 +1,7 @@

11{% extends 'default/base.html' %}

22{% block content %}

33{% include 'default/github_ribbon.html' %}

4−<div class="row">

4+<div class="row"{% if rtl %} dir="ltr"{% endif %}>

55 <h1>About <a href="{{ url_for('index') }}">searx</a></h1>

66

77 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.

searx/templates/default/result_templates/code.html+1−1

@@ -1,6 +1,6 @@

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 }} <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 %}

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 }} <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 }} <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/oscar/about.html+1−1

@@ -2,7 +2,7 @@

22{% block site_alert_warning_nojs %} {% endblock %}

33{% block title %}{{ _('about') }} - {% endblock %}

44{% block content %}

5−<div>

5+<div{% if rtl %} dir="ltr"{% endif %}>

66 <h1>About <a href="{{ url_for('index') }}">searx</a></h1>

77

88 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.

searx/templates/oscar/macros.html+8−8

@@ -36,26 +36,26 @@

3636 <p class="text-muted">{{ result.pretty_url }}</p>

3737{%- endmacro %}

3838

39−{% macro preferences_item_header(info, label) -%}

40− {% if not rtl %}

39+{% macro preferences_item_header(info, label, rtl) -%}

40+ {% if rtl %}

4141 <div class="row form-group">

42− <label class="col-sm-3 col-md-2">{{ label }}</label>

42+ <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>

4343 <div class="col-sm-4 col-md-4">

4444 {% else %}

4545 <div class="row form-group">

46− <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>

46+ <label class="col-sm-3 col-md-2">{{ label }}</label>

4747 <div class="col-sm-4 col-md-4">

4848 {% endif %}

4949{%- endmacro %}

5050

51−{% macro preferences_item_footer(info, label) -%}

52− {% if not rtl %}

51+{% macro preferences_item_footer(info, label, rtl) -%}

52+ {% if rtl %}

5353 </div>

54− <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>

54+ <label class="col-sm-3 col-md-2">{{ label }}</label>

5555 </div>

5656 {% else %}

5757 </div>

58− <label class="col-sm-3 col-md-2">{{ label }}</label>

58+ <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>

5959 </div>

6060 {% endif %}

6161{%- endmacro %}

searx/templates/oscar/preferences.html+14−14

@@ -41,73 +41,73 @@

4141 </div>

4242 {% set language_label = _('Search language') %}

4343 {% set language_info = _('What language do you prefer for search?') %}

44− {{ preferences_item_header(language_info, language_label) }}

44+ {{ 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>

4747 {% for lang_id,lang_name,country_name in language_codes %}

4848 <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>

4949 {% endfor %}

5050 </select>

51− {{ preferences_item_footer(language_info, language_label) }}

51+ {{ preferences_item_footer(language_info, language_label, rtl) }}

5252

5353 {% set locale_label = _('Interface language') %}

5454 {% set locale_info = _('Change the language of the layout') %}

55− {{ preferences_item_header(locale_info, locale_label) }}

55+ {{ preferences_item_header(locale_info, locale_label, rtl) }}

5656 <select class="form-control" name='locale'>

5757 {% for locale_id,locale_name in locales.items() %}

5858 <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>

5959 {% endfor %}

6060 </select>

61− {{ preferences_item_footer(locale_info, locale_label) }}

61+ {{ preferences_item_footer(locale_info, locale_label, rtl) }}

6262

6363 {% set autocomplete_label = _('Autocomplete') %}

6464 {% set autocomplete_info = _('Find stuff as you type') %}

65− {{ preferences_item_header(autocomplete_info, autocomplete_label) }}

65+ {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }}

6666 <select class="form-control" name="autocomplete">

6767 <option value=""> - </option>

6868 {% for backend in autocomplete_backends %}

6969 <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>

7070 {% endfor %}

7171 </select>

72− {{ preferences_item_footer(autocomplete_info, autocomplete_label) }}

72+ {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }}

7373

7474 {% set image_proxy_label = _('Image proxy') %}

7575 {% set image_proxy_info = _('Proxying image results through searx') %}

76− {{ preferences_item_header(image_proxy_info, image_proxy_label) }}

76+ {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }}

7777 <select class="form-control" name='image_proxy'>

7878 <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>

7979 <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>

8080 </select>

81− {{ preferences_item_footer(image_proxy_info, image_proxy_label) }}

81+ {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }}

8282

8383 {% set method_label = _('Method') %}

8484 {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %}

85− {{ preferences_item_header(method_info, method_label) }}

85+ {{ preferences_item_header(method_info, method_label, rtl) }}

8686 <select class="form-control" name='method'>

8787 <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>

8888 <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>

8989 </select>

90− {{ preferences_item_footer(method_info, method_label) }}

90+ {{ preferences_item_footer(method_info, method_label, rtl) }}

9191

9292 {% set safesearch_label = _('SafeSearch') %}

9393 {% set safesearch_info = _('Filter content') %}

94− {{ preferences_item_header(safesearch_info, safesearch_label) }}

94+ {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }}

9595 <select class="form-control" name='safesearch'>

9696 <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>

9797 <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>

9898 <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>

9999 </select>

100− {{ preferences_item_footer(safesearch_info, safesearch_label) }}

100+ {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }}

101101

102102 {% set theme_label = _('Themes') %}

103103 {% set theme_info = _('Change searx layout') %}

104− {{ preferences_item_header(theme_info, theme_label) }}

104+ {{ preferences_item_header(theme_info, theme_label, rtl) }}

105105 <select class="form-control" name="theme">

106106 {% for name in themes %}

107107 <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>

108108 {% endfor %}

109109 </select>

110− {{ preferences_item_footer(theme_info, theme_label) }}

110+ {{ preferences_item_footer(theme_info, theme_label, rtl) }}

111111 </div>

112112 </fieldset>

113113 </div>

searx/templates/oscar/result_templates/map.html+1−1

@@ -40,7 +40,7 @@

4040{% endif %}

4141

4242{% if result.osm and (result.osm.type and result.osm.id) %}

43− <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}">

43+ <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}"{% if rtl %} dir="ltr"{% endif %}>

4444 <div class="text-center" id="result-overpass-table-loading-{{ index }}"><img src="{{ url_for('static', filename='img/loader.gif') }}" alt="Loading ..."/></div>

4545 <table class="table table-striped table-condensed hidden" id="result-overpass-table-{{ index }}">

4646 <tr><th>key</th><th>value</th></tr>

searx/webapp.py−1

@@ -412,7 +412,6 @@ def about():

412412 """Render about page"""

413413 return render(

414414 'about.html',

415− rtl=False,

416415 )

417416

418417