Merge branch 'featured_result' of https://github.com/pw3t/searx

3 files changed, 26 insertions, 1 deletions

diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html
index 48c0775ae..ab6d469b4 100644
--- a/searx/templates/result_templates/default.html
+++ b/searx/templates/result_templates/default.html
@@ -1,5 +1,14 @@
 <div class="result {{ result.class }}">
-    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+
+  {% if result['favicon'] %}
+  <div style="float:left; margin:2px;">
+    <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" />
+  </div>
+  {% endif %}
+
+  <div>
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3></br>
     <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
     <p class="url">{{ result.pretty_url }}</p>
+  </div>
 </div>
diff --git a/searx/templates/result_templates/videos.html b/searx/templates/result_templates/videos.html
new file mode 100644
index 000000000..ae6d8f16c
--- /dev/null
+++ b/searx/templates/result_templates/videos.html
@@ -0,0 +1,13 @@
+<div class="result">
+  {% if result['favicon'] %}
+  <div style="float:left; margin:2px;">
+    <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" />
+  </div>
+  {% endif %}
+
+    <p>
+      <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+      <a href="{{ result.url }}"><img width="300" height="170"  src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
+      <p class="url">{{ result.url }}</p>
+    </p>
+</div>
diff --git a/searx/templates/results.html b/searx/templates/results.html
index 4ca36c656..be40900c3 100644
--- a/searx/templates/results.html
+++ b/searx/templates/results.html
@@ -9,9 +9,12 @@
     {% if suggestions %}
     <div id="suggestions"><span>Suggestions: </span>{% for suggestion in suggestions %}<form method="post" action="/"><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div>
     {% endif %}
+    
+
     <div id ="result_count">
         Number of results: {{ number_of_results }}
     </div>
+
     {% for result in results %}
         {% if result['template'] %}
             {% include 'result_templates/'+result['template'] %}