Merge pull request #104 from dalf/master

[enh] add infoboxes and answers, [fix] when two results are merged, really use the content with more text

3 files changed, 61 insertions, 1 deletions

diff --git a/searx/templates/default/infobox.html b/searx/templates/default/infobox.html
new file mode 100644
index 000000000..f963e898c
--- /dev/null
+++ b/searx/templates/default/infobox.html
@@ -0,0 +1,44 @@
+<div class="infobox">
+  <h2>{{ infobox.infobox }}</h2>
+  {% if infobox.img_src %}<img src="{{ infobox.img_src }}" />{% endif %}
+  <p>{{ infobox.entity }}</p>
+  <p>{{ infobox.content }}</p>
+  {% if infobox.attributes %}
+  <div class="attributes">
+    <table>
+      {% for attribute in infobox.attributes %}
+      <tr><td>{{ attribute.label }}</td><td>{{ attribute.value }}</td></tr>
+      {% endfor %}
+    </table>
+  </div>
+  {% endif %}
+
+  {% if infobox.urls %}
+  <div class="urls">
+    <ul>
+      {% for url in infobox.urls %}
+      <li class="url"><a href="{{ url.url }}">{{ url.title }}</a></li>
+      {% endfor %}
+    </ul>
+  </div>
+  {% endif %}
+
+  {% if infobox.relatedTopics %}
+  <div class="relatedTopics">
+      {% for topic in infobox.relatedTopics %}
+      <div>
+	<h3>{{ topic.name }}</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>
diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html
index ac9b9b979..938d66d04 100644
--- a/searx/templates/default/result_templates/default.html
+++ b/searx/templates/default/result_templates/default.html
@@ -8,6 +8,6 @@
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
 	{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
-    <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
+    <p class="content">{% if result.img_src %}<img src="{{ result.img_src|safe }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
   </div>
 </div>
diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html
index d0b53b48a..b66d6e2af 100644
--- a/searx/templates/default/results.html
+++ b/searx/templates/default/results.html
@@ -30,6 +30,14 @@
         </div>
     </div>
 
+    {% if answers %}
+    <div id="answers"><span>{{ _('Answers') }}</span>
+        {% for answer in answers %}
+        <span>{{ answer }}</span>
+        {% endfor %}
+    </div>
+    {% endif %}
+
     {% if suggestions %}
     <div id="suggestions"><span>{{ _('Suggestions') }}</span>
         {% for suggestion in suggestions %}
@@ -41,6 +49,14 @@
     </div>
     {% endif %}
 
+    {% if infoboxes %}
+    <div id="infoboxes">
+      {% for infobox in infoboxes %}
+         {% include 'default/infobox.html' %}
+      {% endfor %}
+    </div>
+    {% endif %}    
+
     {% for result in results %}
         {% if result['template'] %}
             {% include 'default/result_templates/'+result['template'] %}