Merge branch 'master' of https://github.com/asciimoo/searx into filtron

searx/static/themes/legacy/less/style.less

@@ -741,3 +741,7 @@ color: @color-font-light;
     transition: opacity 1s ease;
     opacity: 0.8;
 }
+
+pre code {
+    white-space: pre-wrap;
+}

searx/static/themes/simple/css/searx-rtl.css

@@ -1,4 +1,4 @@
-/*! searx | 06-08-2019 | https://github.com/asciimoo/searx */
+/*! searx | 04-06-2020 |  */
 /*
 * searx, A privacy-respecting, hackable metasearch engine
 *
@@ -2171,6 +2171,9 @@ article.result-images[data-vim-selected]::before {
     overflow: inherit;
   }
 }
+pre code {
+  white-space: pre-wrap;
+}
 #search_submit {
   left: 1px;
   right: auto;

searx/static/themes/simple/css/searx.css

@@ -1,4 +1,4 @@
-/*! searx | 06-08-2019 | https://github.com/asciimoo/searx */
+/*! searx | 04-06-2020 |  */
 /*
 * searx, A privacy-respecting, hackable metasearch engine
 *
@@ -2171,3 +2171,6 @@ article.result-images[data-vim-selected]::before {
     overflow: inherit;
   }
 }
+pre code {
+  white-space: pre-wrap;
+}

searx/static/themes/simple/less/style.less

@@ -719,3 +719,7 @@ article.result-images[data-vim-selected]::before {
   }
 
 }
+
+pre code {
+    white-space: pre-wrap;
+}

searx/templates/courgette/result_templates/code.html

@@ -1,4 +1,4 @@
-<div class="result {{ result.class }}">
+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
     <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>
     {% 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>

searx/templates/courgette/result_templates/default.html

@@ -1,4 +1,4 @@
-<div class="result {{ result.class }}">
+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
 
     {% 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}}" />

searx/templates/courgette/result_templates/images.html

@@ -1,4 +1,4 @@
-<div class="image_result">
+<div class="image_result{% for e in result.engines %} {{ e }}{% endfor %}">
     <p>
         <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>
         <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,4 +1,4 @@
-<div class="result">
+<div class="result{% for e in result.engines %} {{ e }}{% endfor %}">
 <table>
     {% for key, value in result.items() %}
     {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}

searx/templates/courgette/result_templates/map.html

@@ -1,4 +1,4 @@
-<div class="result {{ result.class }}">
+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
 
     {% 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}}" />

searx/templates/courgette/result_templates/torrent.html

@@ -1,4 +1,4 @@
-<div class="result torrent_result">
+<div class="result torrent_result{% for e in result.engines %} {{ e }}{% endfor %}">
     {% 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 %}

searx/templates/courgette/result_templates/videos.html

@@ -1,4 +1,4 @@
-<div class="result">
+<div class="result{% for e in result.engines %} {{ e }}{% endfor %}">
 	{% 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 %}

searx/templates/legacy/result_templates/code.html

@@ -1,4 +1,4 @@
-<div class="result {{ result.class }}">
+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
     <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>
     <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>
     {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}

searx/templates/legacy/result_templates/default.html

@@ -1,4 +1,4 @@
-<div class="result {{ result.class }}">
+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
     <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>
     <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>
     {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>

searx/templates/legacy/result_templates/images.html

@@ -1,4 +1,4 @@
-<div class="image_result">
+<div class="image_result{% for e in result.engines %} {{ e }}{% endfor %}">
     <p>
         <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>
         <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,4 +1,4 @@
-<table class="result-table">
+<table class="result-table{% for e in result.engines %} {{ e }}{% endfor %}">
     {% for key, value in result.items() %}
     {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}
         {% continue %}

searx/templates/legacy/result_templates/map.html

@@ -1,4 +1,4 @@
-<div class="result {{ result.class }}">
+<div class="result {{ result.class }}{% for e in result.engines %} {{ e }}{% endfor %}">
 
     {% 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}}" />

searx/templates/legacy/result_templates/torrent.html

@@ -1,4 +1,4 @@
-<div class="result torrent_result">
+<div class="result torrent_result{% for e in result.engines %} {{ e }}{% endfor %}">
   {% 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 %}

searx/templates/legacy/result_templates/videos.html

@@ -1,4 +1,4 @@
-<div class="result">
+<div class="result{% for e in result.engines %} {{ e }}{% endfor %}">
     <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>
     {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
     <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

@@ -16,7 +16,11 @@
                 {%- if attribute.image -%}
                 <td><img class="img-responsive" src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td>
                 {%- else -%}
-                <td><bdi>{{ attribute.value }}</bdi></td>
+                 {% if attribute.label == 'Instance of' %}
+                  <td><bdi><a href="https://wikidata.org/wiki/{{ attribute.value.id }}">{{ attribute.value.id }}</a></bdi></td>
+                 {% else %}
+                  <td><bdi>{{ attribute.value }}</bdi></td>
+                 {%- endif -%}
                 {%- endif -%}
             </tr>
             {% endfor -%}

searx/templates/oscar/results.html

@@ -72,6 +72,8 @@
                     </form>
                     {% endfor %}
                     <div class="clearfix"></div>
+                    <br /><label><a href="{{ search_url() }}&amp;format=rss">{{ _('RSS subscription') }}</a></label>
+                    <div class="clearfix"></div>
                 </div>
             </div>
         </div><!-- /#sidebar_results -->
@@ -100,7 +102,7 @@
             {%- endif %}
 
             {% for result in results -%}
-            <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
+            <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}{% for e in result.engines %} {{ e }}{% endfor %}">
                 {%- set index = loop.index -%}
                 {%- if result.template -%}
                     {% include get_result_template('oscar', result['template']) %}

searx/templates/simple/macros.html

@@ -26,7 +26,7 @@
 
 <!-- Draw result header -->
 {% macro result_header(result, favicons, image_proxify) -%}
-<article class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %} {% if result['category'] %}category-{{ result['category'] }}{% endif %}">
+<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 %}">
   {%- 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 -%}
   {%- 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 -%}
   <h3>{{ result_link(result.url, result.title|safe) }}</h3>