From 57e618edf7a72cb65620e5664941fb11130d2145 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Thu, 9 Jul 2015 23:05:45 +0200
Subject: Add Image on opensearch

---
 searx/templates/courgette/opensearch.xml | 1 +
 searx/templates/default/opensearch.xml   | 1 +
 searx/templates/oscar/opensearch.xml     | 1 +
 3 files changed, 3 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/courgette/opensearch.xml b/searx/templates/courgette/opensearch.xml
index f39283f99..ff9eac55b 100644
--- a/searx/templates/courgette/opensearch.xml
+++ b/searx/templates/courgette/opensearch.xml
@@ -3,6 +3,7 @@
   <ShortName>searx</ShortName>
   <Description>Search searx</Description>
   <InputEncoding>UTF-8</InputEncoding>
+  <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
     <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
diff --git a/searx/templates/default/opensearch.xml b/searx/templates/default/opensearch.xml
index f39283f99..ff9eac55b 100644
--- a/searx/templates/default/opensearch.xml
+++ b/searx/templates/default/opensearch.xml
@@ -3,6 +3,7 @@
   <ShortName>searx</ShortName>
   <Description>Search searx</Description>
   <InputEncoding>UTF-8</InputEncoding>
+  <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
     <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
diff --git a/searx/templates/oscar/opensearch.xml b/searx/templates/oscar/opensearch.xml
index f39283f99..ff9eac55b 100644
--- a/searx/templates/oscar/opensearch.xml
+++ b/searx/templates/oscar/opensearch.xml
@@ -3,6 +3,7 @@
   <ShortName>searx</ShortName>
   <Description>Search searx</Description>
   <InputEncoding>UTF-8</InputEncoding>
+  <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
     <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
-- 
cgit v1.2.3


From a75d10206e588ccc1bae85ac579809e8a377d4ec Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Thu, 17 Sep 2015 18:18:48 +0200
Subject: Correct the loop through search engines Fix #432

---
 searx/templates/pix-art/preferences.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/pix-art/preferences.html b/searx/templates/pix-art/preferences.html
index 0caf31b46..f59497ec8 100644
--- a/searx/templates/pix-art/preferences.html
+++ b/searx/templates/pix-art/preferences.html
@@ -53,8 +53,8 @@
             <th>{{ _('Engine name') }}</th>
             <th>{{ _('Allow') }} / {{ _('Block') }}</th>
         </tr>
-    {% for (categ,search_engines) in categs %}
-        {% for search_engine in search_engines %}
+    {% for categ in all_categories %}
+        {% for search_engine in engines_by_category[categ] %}
 
             {% if not search_engine.private %}
             <tr>
-- 
cgit v1.2.3


From 5eabba2da17c7cf1b6c0704d3ecd7476bdd989b7 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Sat, 3 Oct 2015 17:46:12 +0200
Subject: [mod] list all engines of a result

---
 searx/templates/oscar/macros.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html
index 5866c132c..cf49ce81a 100644
--- a/searx/templates/oscar/macros.html
+++ b/searx/templates/oscar/macros.html
@@ -25,7 +25,11 @@
 <!-- Draw result footer -->
 {% macro result_footer(result) -%}
     <div class="clearfix"></div>
-    <span class="label label-default pull-right">{{ result.engine }}</span>
+    <div class="pull-right">
+    {% for engine in result.engines %}
+        <span class="label label-default">{{ engine }}</span>
+    {% endfor %}
+</div>
     <p class="text-muted">{{ result.pretty_url }}</p>
 {%- endmacro %}
 
-- 
cgit v1.2.3