From 517e57b996aaeceda08afd0e80bfd30ad6192971 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 3 Oct 2014 13:16:30 +0200
Subject: oscar template: improve result icons

---
 searx/templates/oscar/result_templates/default.html | 4 ++--
 searx/templates/oscar/result_templates/images.html  | 4 ++--
 searx/templates/oscar/result_templates/torrent.html | 4 ++--
 searx/templates/oscar/result_templates/videos.html  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
index 2ea246542..3b0963816 100644
--- a/searx/templates/oscar/result_templates/default.html
+++ b/searx/templates/oscar/result_templates/default.html
@@ -1,8 +1,8 @@
-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
 
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
 
 {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
 
 <span class="label label-default pull-right">{{ result.engine }}</span>
-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>
+<p class="text-muted">{{ result.pretty_url }}</p>
diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 48ed5dece..5570a3143 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -7,7 +7,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">{{ result.title|striptags }}</h4>
+                <h4 class="modal-title">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}{{ result.title|striptags }}</h4>
             </div>
             <div class="modal-body">
                 <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">
@@ -15,7 +15,7 @@
             </div>
             <div class="modal-footer">
                 <span class="label label-default pull-right">{{ result.engine }}</span>
-                <p class="text-muted pull-left">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>
+                <p class="text-muted pull-left">{{ result.pretty_url }}</p>
                 <div class="clearfix"></div>
                 <a href="{{ result.img_src }}" class="btn btn-default">{{ _('Get image') }}</a>
                 <a href="{{ result.url }}" class="btn btn-default">{{ _('View source') }}</a>
diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html
index 14ac63232..903d304eb 100644
--- a/searx/templates/oscar/result_templates/torrent.html
+++ b/searx/templates/oscar/result_templates/torrent.html
@@ -1,6 +1,6 @@
 {% from 'oscar/macros.html' import icon %}
 
-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
 
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
 
@@ -11,4 +11,4 @@
 {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
 
 <span class="label label-default pull-right">{{ result.engine }}</span>
-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>
+<p class="text-muted">{{ result.pretty_url }}</p>
diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html
index 32112472e..1a9b60717 100644
--- a/searx/templates/oscar/result_templates/videos.html
+++ b/searx/templates/oscar/result_templates/videos.html
@@ -1,4 +1,4 @@
-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
     
@@ -8,6 +8,6 @@
         {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif %}
     </div>
 </div>
-    
+
 <span class="label label-default pull-right">{{ result.engine }}</span>
-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>
+<p class="text-muted">{{ result.pretty_url }}</p>
-- 
cgit v1.2.3