41ce76e · searx · git.iko.soy

git.iko.soy/searx

Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration

commit41ce76e9c90258d97566c1f2bcf7902449c0fff0 authorPydo <pydo@tutanota.com> dateMon 5 Sep 2016, 14:56 (10 years ago) parent2c2123b 465d472

27 files changed+82−43

compare with master

unifiedsplit

searx/preferences.py+2−1

@@ -227,7 +227,8 @@ class Preferences(object):

227227 'safesearch': MapSetting(settings['search']['safe_search'], map={'0': 0,

228228 '1': 1,

229229 '2': 2}),

230− 'theme': EnumStringSetting(settings['ui']['default_theme'], choices=themes)}

230+ 'theme': EnumStringSetting(settings['ui']['default_theme'], choices=themes),

231+ 'results_on_new_tab': MapSetting(False, map={'0': False, '1': True})}

231232

232233 self.engines = EnginesSetting('engines', choices=engines)

233234 self.plugins = PluginsSetting('plugins', choices=plugins)

searx/templates/courgette/404.html+3−1

@@ -2,6 +2,8 @@

22{% block content %}

33<div class="center">

44 <h1>{{ _('Page not found') }}</h1>

5− <p>{{ _('Go to <a href="/">search page</a>.') }}</p>

5+ {% autoescape false %}

6+ <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.decode('utf-8').format(url_for('index'), _('search page'))) }}</p>

7+ {% endautoescape %}

68</div>

79{% endblock %}

searx/templates/courgette/result_templates/code.html+2−2

@@ -1,8 +1,8 @@

11<div class="result {{ result.class }}">

2− <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 }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

2+ <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 }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>

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>

5− {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}" rel="noreferrer">{{ result.repository }}</a></p>{% endif %}

5+ {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a></p>{% endif %}

66 <div dir="ltr">

77 {{ result.codelines|code_highlighter(result.code_language)|safe }}

88 </div>

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

@@ -5,7 +5,7 @@

55 {% endif %}

77 <div>

8− <h3 class="result_title"><a href="{{ result.url }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

8+ <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ 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>

1111 <p class="url">{{ result.pretty_url }}&lrm;</p>

searx/templates/courgette/result_templates/images.html+2−2

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

11<div class="image_result">

22 <p>

3− <a href="{{ result.img_src }}" rel="noreferrer"><img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

4− <span class="url"><a href="{{ result.url }}" rel="noreferrer" class="small_font">{{ _('original context') }}</a></span>

3+ <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

4+ <span class="url"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="small_font">{{ _('original context') }}</a></span>

55 </p>

66</div>

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

@@ -5,7 +5,7 @@

55 {% endif %}

77 <div>

8− <h3 class="result_title"><a href="{{ result.url }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

8+ <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ 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>

1111 <p class="url">{{ result.pretty_url }}&lrm;</p>

searx/templates/courgette/result_templates/torrent.html+2−2

@@ -2,12 +2,12 @@

22 {% if "icon_"~result.engine~".ico" in favicons %}

33 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />

44 {% endif %}

5− <h3 class="result_title"><a href="{{ result.url }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

5+ <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>

66 {% if result.content %}<span class="content">{{ result.content|safe }}</span><br />{% endif %}

77 <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span><br />

88 <span>

99 {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %}

10− {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile" rel="noreferrer">{{ _('torrent file') }}</a>{% endif %}

10+ {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ _('torrent file') }}</a>{% endif %}

1111 </span>

1212 <p class="url">{{ result.pretty_url }}&lrm;</p>

1313</div>

searx/templates/courgette/result_templates/videos.html+2−2

@@ -3,8 +3,8 @@

33 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />

44 {% endif %}

6− <h3 class="result_title"><a href="{{ result.url }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

6+ <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>

77 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}

8− <a href="{{ result.url }}" rel="noreferrer"><img width="400" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

8+ <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img width="400" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

99 <p class="url">{{ result.pretty_url }}&lrm;</p>

1010</div>

searx/templates/default/404.html+3−1

@@ -2,6 +2,8 @@

22{% block content %}

33<div class="center">

44 <h1>{{ _('Page not found') }}</h1>

5− <p>{{ _('Go to <a href="/">search page</a>.') }}</p>

5+ {% autoescape false %}

6+ <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.decode('utf-8').format(url_for('index'), _('search page'))) }}</p>

7+ {% endautoescape %}

68</div>

79{% endblock %}

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

@@ -24,7 +24,7 @@

2424 <div class="urls">

2525 <ul>

2626 {% for url in infobox.urls %}

27− <li class="url"><bdi><a href="{{ url.url }}" rel="noreferrer">{{ url.title }}</a></bdi></li>

27+ <li class="url"><bdi><a href="{{ url.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ url.title }}</a></bdi></li>

2828 {% endfor %}

2929 </ul>

3030 </div>

searx/templates/default/preferences.html+9

@@ -80,6 +80,15 @@

8080 </select>

8181 </p>

8282 </fieldset>

83+ <fieldset>

84+ <legend>{{ _('Results on new tabs') }}</legend>

85+ <p>

86+ <select name='results_on_new_tab'>

87+ <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option>

88+ <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option>

89+ </select>

90+ </p>

91+ </fieldset>

8392 <fieldset>

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

8594

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

@@ -1,9 +1,9 @@

11<div class="result {{ result.class }}">

2− <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 }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

3− <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" rel="noreferrer">{{ _('cached') }}</a></p>

2+ <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 }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>

3+ <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ _('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>

6− {% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}" rel="noreferrer">{{ result.repository }}</a></p>{% endif %}

6+ {% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a></p>{% endif %}

88 <div dir="ltr">

99 {{ result.codelines|code_highlighter(result.code_language)|safe }}

searx/templates/default/result_templates/default.html+2−2

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

11<div class="result {{ result.class }}">

2− <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 }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

3− <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" rel="noreferrer">{{ _('cached') }}</a>

2+ <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 }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>

44 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>

66</div>

searx/templates/default/result_templates/images.html+2−2

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

11<div class="image_result">

22 <p>

4− <span class="url"><a href="{{ result.url }}" rel="noreferrer" class="small_font">{{ _('original context') }}</a></span>

55 </p>

66</div>

searx/templates/default/result_templates/map.html+2−2

@@ -5,8 +5,8 @@

55 {% endif %}

77 <div>

8− <h3 class="result_title"><a href="{{ result.url }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

9− <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" rel="noreferrer">{{ _('cached') }}</a>

8+ <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>

9+ <p class="url">{{ result.pretty_url }}&lrm; <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ _('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+2−2

@@ -2,12 +2,12 @@

22 {% if "icon_"~result.engine~".ico" in favicons %}

33 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />

44 {% endif %}

5− <h3 class="result_title"><a href="{{ result.url }}" rel="noreferrer">{{ result.title|safe }}</a></h3>

5+ <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>

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

10− {% if result.torrentfile %}<a href="{{ result.torrentfile }}" rel="noreferrer" class="torrentfile">{{ _('torrent file') }}</a>{% endif %} -

10+ {% if result.torrentfile %}<a href="{{ result.torrentfile }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="torrentfile">{{ _('torrent file') }}</a>{% endif %} -

1111 <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span>

1212 </p>

1313</div>

searx/templates/default/result_templates/videos.html+2−2

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

11<div class="result">

33 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}

4− <a href="{{ result.url }}" rel="noreferrer"><img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

4+ <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>

55 <p class="url">{{ result.url }}&lrm;</p>

66</div>

searx/templates/oscar/404.html+3−1

@@ -2,6 +2,8 @@

22{% block content %}

33<div class="text-center">

44 <h1>{{ _('Page not found') }}</h1>

5− <p>{{ _('Go to <a href="/">search page</a>.') }}</p>

5+ {% autoescape false %}

6+ <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.decode('utf-8').format(url_for('index'), _('search page'))) }}</p>

7+ {% endautoescape %}

68</div>

79{% endblock %}

searx/templates/oscar/infobox.html+2−1

@@ -1,3 +1,4 @@

1+{% from 'oscar/macros.html' import result_link with context %}

12<div class="panel panel-default infobox">

23 <div class="panel-heading">

34 <h4 class="panel-title infobox_part"><bdi>{{ infobox.infobox }}</bdi></h4>

@@ -25,7 +26,7 @@

2526 <div class="infobox_part">

2627 <bdi>

2728 {% for url in infobox.urls %}

28− <p class="btn btn-default btn-xs"><a href="{{ url.url }}" rel="noreferrer">{{ url.title }}</a></p>

29+ <p class="btn btn-default btn-xs">{{ result_link(url.url, url.title) }}</a></p>

2930 {% endfor %}

3031 </bdi>

3132 </div>

searx/templates/oscar/macros.html+10−6

@@ -9,16 +9,20 @@

99 <img width="32" height="32" class="favicon" src="static/themes/oscar/img/icons/{{ favicon }}.png" alt="{{ favicon }}" />

1010{%- endmacro %}

1111

12+{%- macro result_link(url, title, classes='') -%}

13+<a href="{{ url }}" {% if classes %}class="{{ classes }} "{% endif %}{% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ title }}</a>

14+{%- endmacro -%}

15+

1216

13−{% macro result_header(result, favicons) -%}

14− <h4 class="result_header">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}<a href="{{ result.url }}" rel="noreferrer">{{ result.title|safe }}</a></h4>

17+{% macro result_header(result, favicons) -%}

18+<h4 class="result_header">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result_link(result.url, result.title|safe) }}</h4>

1519{%- endmacro %}

1620

1721

1822{% macro result_sub_header(result) -%}

1923 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

20− {% if result.magnetlink %}<small> • <a href="{{ result.magnetlink }}" class="magnetlink">{{ icon('magnet') }} {{ _('magnet link') }}</a></small>{% endif %}

21− {% if result.torrentfile %}<small> • <a href="{{ result.torrentfile }}" class="torrentfile" rel="noreferrer">{{ icon('download-alt') }} {{ _('torrent file') }}</a></small>{% endif %}

24+ {% if result.magnetlink %}<small> • {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}</small>{% endif %}

25+ {% if result.torrentfile %}<small> • {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}</small>{% endif %}

2226{%- endmacro %}

2327

2428

@@ -28,7 +32,7 @@

2832 {% for engine in result.engines %}

2933 <span class="label label-default">{{ engine }}</span>

3034 {% endfor %}

31− <small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}" rel="noreferrer">{{ icon('link') }} {{ _('cached') }}</a></small>

35+ <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>

3236</div>

3337 <div class="text-muted"><small>{{ result.pretty_url }}</small></div>

3438{%- endmacro %}

@@ -39,7 +43,7 @@

3943 {% for engine in result.engines %}

4044 <span class="label label-default">{{ engine }}</span>

4145 {% endfor %}

42− <small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}" rel="noreferrer">{{ icon('link') }} {{ _('cached') }}</a></small>

46+ <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>

4347 <div class="text-muted"><small>{{ result.pretty_url }}</small></div>

4448{%- endmacro %}

4549

searx/templates/oscar/preferences.html+9

@@ -117,6 +117,15 @@

117117 <option value="pointhi" {% if cookies['oscar-style'] == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option>

118118 </select>

119119 {{ preferences_item_footer(_('Choose style for this theme'), _('Style'), rtl) }}

120+

121+ {% set label = _('Results on new tabs') %}

122+ {% set info = _('Open result links on new browser tabs') %}

123+ {{ preferences_item_header(info, label, rtl) }}

124+ <select class="form-control" name='results_on_new_tab'>

125+ <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option>

126+ <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option>

127+ </select>

128+ {{ preferences_item_footer(info, label, rtl) }}

120129 </div>

121130 </fieldset>

122131 </div>

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

@@ -5,7 +5,7 @@

66{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}

8−{% if result.repository %}<p class="result-content">{{ icon('file') }} <a href="{{ result.repository|safe }}" rel="noreferrer">{{ result.repository }}</a></p>{% endif %}

8+{% if result.repository %}<p class="result-content">{{ icon('file') }} <a href="{{ result.repository }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.repository }}</a></p>{% endif %}

1010<div dir="ltr">

1111{{ result.codelines|code_highlighter(result.code_language)|safe }}

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

@@ -1,4 +1,4 @@

1−{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}

1+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %}

33{{ result_header(result, favicons) }}

44{{ result_sub_header(result) }}

searx/templates/oscar/result_templates/images.html+3−3

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

11{% from 'oscar/macros.html' import draw_favicon %}

3−<a href="{{ result.img_src }}" rel="noreferrer" data-toggle="modal" data-target="#modal-{{ index }}">

3+<a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} data-toggle="modal" data-target="#modal-{{ index }}">

44 <img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="img-thumbnail">

55</a>

@@ -20,8 +20,8 @@

2020 <span class="label label-default pull-right">{{ result.engine }}</span>

2121 <p class="text-muted pull-left">{{ result.pretty_url }}</p>

2222 <div class="clearfix"></div>

23− <a href="{{ result.img_src }}" rel="noreferrer" class="btn btn-default">{{ _('Get image') }}</a>

24− <a href="{{ result.url }}" rel="noreferrer" class="btn btn-default">{{ _('View source') }}</a>

23+ <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('Get image') }}</a>

24+ <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('View source') }}</a>

2525 </div>

2626 </div>

2727 </div>

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

@@ -15,7 +15,7 @@

1515

1616<div class="container-fluid">

1717 <div class="row">

18− <a href="{{ result.url }}" rel="noreferrer"><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>

18+ <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>

1919 {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %}

2020 </div>

2121</div>

searx/templates/pix-art/404.html+3−1

@@ -2,6 +2,8 @@

22{% block content %}

33<div class="center">

44 <h1>{{ _('Page not found') }}</h1>

5− <p>{{ _('Go to <a href="/">search page</a>.') }}</p>

5+ {% autoescape false %}

6+ <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.decode('utf-8').format(url_for('index'), _('search page'))) }}</p>

7+ {% endautoescape %}

68</div>

79{% endblock %}

searx/webapp.py+8−1

@@ -320,6 +320,8 @@ def render(template_name, override_theme=None, **kwargs):

320320

321321 kwargs['instance_name'] = settings['general']['instance_name']

322322

323+ kwargs['results_on_new_tab'] = request.preferences.get_value('results_on_new_tab')

324+

323325 kwargs['scripts'] = set()

324326 for plugin in request.user_plugins:

325327 for script in plugin.js_dependencies:

@@ -338,7 +340,11 @@ def render(template_name, override_theme=None, **kwargs):

338340def pre_request():

339341 # merge GET, POST vars

340342 preferences = Preferences(themes, categories.keys(), engines, plugins)

341− preferences.parse_cookies(request.cookies)

343+ try:

344+ preferences.parse_cookies(request.cookies)

345+ except:

346+ # TODO throw error message to the user

347+ logger.warning('Invalid config')

342348 request.preferences = preferences

343349

344350 request.form = dict(request.form.items())

@@ -553,6 +559,7 @@ def preferences():

553559 lang = request.preferences.get_value('language')

554560 disabled_engines = request.preferences.engines.get_disabled()

555561 allowed_plugins = request.preferences.plugins.get_enabled()

562+ results_on_new_tab = request.preferences.get_value('results_on_new_tab')

556563

557564 # stats for preferences page

558565 stats = {}