on master help sign in
Merge branch 'master' into new-readme
3f660e1Markus Heiser
searx/templates/courgette/result_templates/code.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result {{ result.class }}">
1+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
2 <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>
2 <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>
3 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
3 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
4 <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>
4 <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>
searx/templates/courgette/result_templates/default.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result {{ result.class }}">
1+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
2
2
3 {% if "icon_"~result.engine~".ico" in favicons %}
3 {% if "icon_"~result.engine~".ico" in favicons %}
4 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
searx/templates/courgette/result_templates/images.html+1−1
@@ -1,4 +1,4 @@
1−<div class="image_result">
1+<div class="image_result{% for e in result.engines %} {{ e }}{% endfor %}">
2 <p>
2 <p>
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>
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>
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>
searx/templates/courgette/result_templates/key-value.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result">
1+<div class="result{% for e in result.engines %} {{ e }}{% endfor %}">
2<table>
2<table>
3 {% for key, value in result.items() %}
3 {% for key, value in result.items() %}
4 {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}
4 {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}
searx/templates/courgette/result_templates/map.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result {{ result.class }}">
1+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
2
2
3 {% if "icon_"~result.engine~".ico" in favicons %}
3 {% if "icon_"~result.engine~".ico" in favicons %}
4 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
searx/templates/courgette/result_templates/torrent.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result torrent_result">
1+<div class="result torrent_result{% for e in result.engines %} {{ e }}{% endfor %}">
2 {% if "icon_"~result.engine~".ico" in favicons %}
2 {% if "icon_"~result.engine~".ico" in favicons %}
3 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
3 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4 {% endif %}
4 {% endif %}
searx/templates/courgette/result_templates/videos.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result">
1+<div class="result{% for e in result.engines %} {{ e }}{% endfor %}">
2 {% if "icon_"~result.engine~".ico" in favicons %}
2 {% if "icon_"~result.engine~".ico" in favicons %}
3 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
3 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4 {% endif %}
4 {% endif %}
searx/templates/legacy/result_templates/code.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result {{ result.class }}">
1+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
2 <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>
2 <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>
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>
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>
4 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
4 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
searx/templates/legacy/result_templates/default.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result {{ result.class }}">
1+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
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>
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>
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>
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>
4 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>
4 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>
searx/templates/legacy/result_templates/images.html+1−1
@@ -1,4 +1,4 @@
1−<div class="image_result">
1+<div class="image_result{% for e in result.engines %} {{ e }}{% endfor %}">
2 <p>
2 <p>
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>
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>
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>
searx/templates/legacy/result_templates/key-value.html+1−1
@@ -1,4 +1,4 @@
1−<table class="result-table">
1+<table class="result-table{% for e in result.engines %} {{ e }}{% endfor %}">
2 {% for key, value in result.items() %}
2 {% for key, value in result.items() %}
3 {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}
3 {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}
4 {% continue %}
4 {% continue %}
searx/templates/legacy/result_templates/map.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result {{ result.class }}">
1+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
2
2
3 {% if "icon_"~result.engine~".ico" in favicons %}
3 {% if "icon_"~result.engine~".ico" in favicons %}
4 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
searx/templates/legacy/result_templates/torrent.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result torrent_result">
1+<div class="result torrent_result{% for e in result.engines %} {{ e }}{% endfor %}">
2 {% if "icon_"~result.engine~".ico" in favicons %}
2 {% if "icon_"~result.engine~".ico" in favicons %}
3 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
3 <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
4 {% endif %}
4 {% endif %}
searx/templates/legacy/result_templates/videos.html+1−1
@@ -1,4 +1,4 @@
1−<div class="result">
1+<div class="result{% for e in result.engines %} {{ e }}{% endfor %}">
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>
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>
3 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
3 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
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>
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>
searx/templates/oscar/infobox.html+5−1
@@ -16,7 +16,11 @@
16 {%- if attribute.image -%}
16 {%- if attribute.image -%}
17 <td><img class="img-responsive" src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td>
17 <td><img class="img-responsive" src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td>
18 {%- else -%}
18 {%- else -%}
19+ {% if attribute.label == 'Instance of' %}
20+ <td><bdi><a href="https://wikidata.org/wiki/{{ attribute.value.id }}">{{ attribute.value.id }}</a></bdi></td>
21+ {% else %}
19− <td><bdi>{{ attribute.value }}</bdi></td>
22+ <td><bdi>{{ attribute.value }}</bdi></td>
23+ {%- endif -%}
20 {%- endif -%}
24 {%- endif -%}
21 </tr>
25 </tr>
22 {% endfor -%}
26 {% endfor -%}
searx/templates/oscar/results.html+3−1
@@ -72,6 +72,8 @@
72 </form>
72 </form>
73 {% endfor %}
73 {% endfor %}
74 <div class="clearfix"></div>
74 <div class="clearfix"></div>
75+ <br /><label><a href="{{ search_url() }}&amp;format=rss">{{ _('RSS subscription') }}</a></label>
76+ <div class="clearfix"></div>
75 </div>
77 </div>
76 </div>
78 </div>
77 </div><!-- /#sidebar_results -->
79 </div><!-- /#sidebar_results -->
@@ -100,7 +102,7 @@
100 {%- endif %}
102 {%- endif %}
101
103
102 {% for result in results -%}
104 {% for result in results -%}
103− <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
105+ <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}{% for e in result.engines %} {{ e }}{% endfor %}">
104 {%- set index = loop.index -%}
106 {%- set index = loop.index -%}
105 {%- if result.template -%}
107 {%- if result.template -%}
106 {% include get_result_template('oscar', result['template']) %}
108 {% include get_result_template('oscar', result['template']) %}
searx/templates/simple/macros.html+1−1
@@ -26,7 +26,7 @@
26
26
27<!-- Draw result header -->
27<!-- Draw result header -->
28{% macro result_header(result, favicons, image_proxify) -%}
28{% macro result_header(result, favicons, image_proxify) -%}
29−<article class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %} {% if result['category'] %}category-{{ result['category'] }}{% endif %}">
29+<article class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %} {% if result['category'] %}category-{{ result['category'] }}{% endif %}{% for e in result.engines %} {{ e }}{% endfor %}">
30 {%- if result.img_src %}{{ result_open_link(result.url) }}<img class="image" src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="image" />{{ result_close_link() }}{% endif -%}
30 {%- if result.img_src %}{{ result_open_link(result.url) }}<img class="image" src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="image" />{{ result_close_link() }}{% endif -%}
31 {%- if result.thumbnail %}{{ result_open_link(result.url) }}<img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/>{{ result_close_link() }}{% endif -%}
31 {%- if result.thumbnail %}{{ result_open_link(result.url) }}<img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/>{{ result_close_link() }}{% endif -%}
32 <h3>{{ result_link(result.url, result.title|safe) }}</h3>
32 <h3>{{ result_link(result.url, result.title|safe) }}</h3>