From 83d6f366596829f2140f84c73b684bd7f783e93c Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Thu, 18 Dec 2014 16:26:32 +0100
Subject: Final commit on favicons Definitely remove engine array Change every
 themes to accomodate that change Tweak of video template of oscar to add link
 on video thumbnail

---
 searx/templates/default/result_templates/default.html | 2 +-
 searx/templates/default/result_templates/map.html     | 4 ++--
 searx/templates/default/result_templates/videos.html  | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'searx/templates/default')

diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html
index d0e725ac5..0f3e3e6d8 100644
--- a/searx/templates/default/result_templates/default.html
+++ b/searx/templates/default/result_templates/default.html
@@ -1,5 +1,5 @@
 <div class="result {{ result.class }}">
-    <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<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.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html
index 78221aa01..f9ba7dcf6 100644
--- a/searx/templates/default/result_templates/map.html
+++ b/searx/templates/default/result_templates/map.html
@@ -1,7 +1,7 @@
 <div class="result {{ result.class }}">
 
-  {% if result['favicon'] %}
-    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
+  {% if "icon_"~result.engine~".ico" in favicons %}
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
   {% endif %}
 
   <div>
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html
index 233a6c021..16b2d5f30 100644
--- a/searx/templates/default/result_templates/videos.html
+++ b/searx/templates/default/result_templates/videos.html
@@ -1,8 +1,6 @@
 <div class="result">
-    <p>
-      <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+      <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
       {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
-      <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
+      <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
       <p class="url">{{ result.url }}</p>
-    </p>
 </div>
-- 
cgit v1.2.3


From a0293d6196c708e3a79cbb2a099a46caab7e58c7 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 28 Dec 2014 15:07:11 +0100
Subject: [enh] move favicons into own directory

---
 searx/templates/default/result_templates/default.html | 2 +-
 searx/templates/default/result_templates/map.html     | 2 +-
 searx/templates/default/result_templates/videos.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'searx/templates/default')

diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html
index 0f3e3e6d8..73e9af1a9 100644
--- a/searx/templates/default/result_templates/default.html
+++ b/searx/templates/default/result_templates/default.html
@@ -1,5 +1,5 @@
 <div class="result {{ result.class }}">
-    <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<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.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html
index f9ba7dcf6..d361ddb01 100644
--- a/searx/templates/default/result_templates/map.html
+++ b/searx/templates/default/result_templates/map.html
@@ -1,7 +1,7 @@
 <div class="result {{ result.class }}">
 
   {% if "icon_"~result.engine~".ico" in favicons %}
-    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
   {% endif %}
 
   <div>
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html
index 16b2d5f30..08575e847 100644
--- a/searx/templates/default/result_templates/videos.html
+++ b/searx/templates/default/result_templates/videos.html
@@ -1,5 +1,5 @@
 <div class="result">
-      <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+      <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
       {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
       <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
       <p class="url">{{ result.url }}</p>
-- 
cgit v1.2.3


From 2f9a386c0db884ffbea27f43bdcff5bfd1876ad1 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Thu, 1 Jan 2015 18:59:53 +0100
Subject: [enh] better result template handling

---
 searx/templates/default/results.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/templates/default')

diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html
index 199eb1d96..822960593 100644
--- a/searx/templates/default/results.html
+++ b/searx/templates/default/results.html
@@ -59,7 +59,7 @@
 
     {% for result in results %}
         {% if result['template'] %}
-            {% include 'default/result_templates/'+result['template'] %}
+            {% include get_result_template('default', result['template']) %}
         {% else %}
             {% include 'default/result_templates/default.html' %}
         {% endif %}
-- 
cgit v1.2.3


From 798bef77f9b43e713aeb9ac2938785538538a99c Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Thu, 1 Jan 2015 19:24:47 +0100
Subject: [fix] static content paths

---
 searx/templates/default/result_templates/default.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/templates/default')

diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html
index 73e9af1a9..85882e56a 100644
--- a/searx/templates/default/result_templates/default.html
+++ b/searx/templates/default/result_templates/default.html
@@ -1,5 +1,5 @@
 <div class="result {{ result.class }}">
-    <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    <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 }}">{{ 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.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
-- 
cgit v1.2.3


From e5a323b2883848b5eb26ca0c42d451eabb4dc183 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Thu, 1 Jan 2015 19:52:05 +0100
Subject: [fix] favicon paths

---
 searx/templates/default/result_templates/map.html     | 2 +-
 searx/templates/default/result_templates/torrent.html | 3 +++
 searx/templates/default/result_templates/videos.html  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'searx/templates/default')

diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html
index d361ddb01..b3669f895 100644
--- a/searx/templates/default/result_templates/map.html
+++ b/searx/templates/default/result_templates/map.html
@@ -1,7 +1,7 @@
 <div class="result {{ result.class }}">
 
   {% if "icon_"~result.engine~".ico" in favicons %}
-    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
+    <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico) }}" alt="{{result.engine}}" />
   {% endif %}
 
   <div>
diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html
index 5925f1313..fb8988680 100644
--- a/searx/templates/default/result_templates/torrent.html
+++ b/searx/templates/default/result_templates/torrent.html
@@ -1,4 +1,7 @@
 <div class="result torrent_result">
+  {% 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 %}
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     <p class="url">{{ result.pretty_url }}</p>
     {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html
index 08575e847..75f965c80 100644
--- a/searx/templates/default/result_templates/videos.html
+++ b/searx/templates/default/result_templates/videos.html
@@ -1,5 +1,5 @@
 <div class="result">
-      <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    <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 }}">{{ result.title|safe }}</a></h3>
       {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
       <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
       <p class="url">{{ result.url }}</p>
-- 
cgit v1.2.3


From 425a576f28e1afd3d8e65097ecfe225a25d9eafb Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Fri, 9 Jan 2015 04:05:39 +0100
Subject: [fix] template syntax

---
 searx/templates/default/result_templates/map.html     | 2 +-
 searx/templates/default/result_templates/torrent.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'searx/templates/default')

diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html
index b3669f895..d37c2f374 100644
--- a/searx/templates/default/result_templates/map.html
+++ b/searx/templates/default/result_templates/map.html
@@ -1,7 +1,7 @@
 <div class="result {{ result.class }}">
 
   {% 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}}" />
+    <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
   {% endif %}
 
   <div>
diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html
index fb8988680..4c79a0a39 100644
--- a/searx/templates/default/result_templates/torrent.html
+++ b/searx/templates/default/result_templates/torrent.html
@@ -1,6 +1,6 @@
 <div class="result torrent_result">
   {% 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}}" />
+    <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
   {% endif %}
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     <p class="url">{{ result.pretty_url }}</p>
-- 
cgit v1.2.3