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

Resolved conflict searx/settings.yml

1 files changed, 0 insertions, 51 deletions

diff --git a/searx/templates/default/infobox.html b/searx/templates/default/infobox.html
deleted file mode 100644
index 4dd25fabd..000000000
--- a/searx/templates/default/infobox.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="infobox">
-<h2><bdi>{{ infobox.infobox }}</bdi></h2>
-    {% if infobox.img_src %}<img src="{{ image_proxify(infobox.img_src) }}" title="{{ infobox.infobox|striptags }}" alt="{{ infobox.infobox|striptags }}" />{% endif %}
-    <p><bdi>{{ infobox.entity }}</bdi></p>
-    <p><bdi>{{ infobox.content | safe }}</bdi></p>
-    {% if infobox.attributes %}
-    <div class="attributes">
-        <table>
-            {% for attribute in infobox.attributes %}
-            <tr>
-                <td><bdi>{{ attribute.label }}</bdi></td>
-                {% if attribute.image %}
-                <td><img src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td>
-                {% else %}
-                <td><bdi>{{ attribute.value }}</bdi></td>
-                {% endif %}
-            </tr>
-            {% endfor %}
-        </table>
-    </div>
-    {% endif %}
-
-    {% if infobox.urls %}
-    <div class="urls">
-        <ul>
-            {% for url in infobox.urls %}
-            <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>
-            {% endfor %}
-        </ul>
-    </div>
-    {% endif %}
-
-    {% if infobox.relatedTopics %}
-    <div class="relatedTopics">
-        {% for topic in infobox.relatedTopics %}
-        <div>
-            <h3><bdi>{{ topic.name }}</bdi></h3>
-            {% for suggestion in topic.suggestions %}
-            <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
-                <input type="hidden" name="q" value="{{ suggestion }}">
-                <input type="submit" value="{{ suggestion }}" />
-            </form>
-            {% endfor %}
-        </div>
-        {% endfor %}
-    </div>
-    {% endif %}
-
-    <br />
-  
-</div>