From 18f772615b04343965c7589256219f2117cb1a0f Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Wed, 10 Dec 2014 18:09:21 +0100
Subject: HTML Entities + Use the right template

Courgette was using the wrong template. I assume it was a mistake.
---
 searx/templates/courgette/results.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'searx/templates/courgette')

diff --git a/searx/templates/courgette/results.html b/searx/templates/courgette/results.html
index d0b53b48a..62bef8c90 100644
--- a/searx/templates/courgette/results.html
+++ b/searx/templates/courgette/results.html
@@ -10,7 +10,7 @@
 
         <div id="search_url">
             {{ _('Search URL') }}:
-            <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly="" />
+            <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&amp;pageno={{ pageno }}{% if selected_categories %}&amp;category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly />
         </div>
         <div id="apis">
         {{ _('Download results') }}
@@ -43,9 +43,9 @@
 
     {% for result in results %}
         {% if result['template'] %}
-            {% include 'default/result_templates/'+result['template'] %}
+            {% include 'courgette/result_templates/'+result['template'] %}
         {% else %}
-            {% include 'default/result_templates/default.html' %}
+            {% include 'courgette/result_templates/default.html' %}
         {% endif %}
     {% endfor %}
 
-- 
cgit v1.2.3


From 74000c739dcc40e331df85d6219654ad06da100b Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Wed, 10 Dec 2014 18:10:19 +0100
Subject: Alt on favicon

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

(limited to 'searx/templates/courgette')

diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html
index 734f9066c..5a8a78198 100644
--- a/searx/templates/courgette/result_templates/default.html
+++ b/searx/templates/courgette/result_templates/default.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" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />
   {% endif %}
 
   <div>
-- 
cgit v1.2.3


From b043237c619597131be28ae9d3d0917a3f9b0d4a Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Wed, 10 Dec 2014 18:11:20 +0100
Subject: Correct alt and title

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

(limited to 'searx/templates/courgette')

diff --git a/searx/templates/courgette/result_templates/images.html b/searx/templates/courgette/result_templates/images.html
index 1f15ff2bb..ebda5380b 100644
--- a/searx/templates/courgette/result_templates/images.html
+++ b/searx/templates/courgette/result_templates/images.html
@@ -1,6 +1,6 @@
 <div class="image_result">
     <p>
-        <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title={{ result.title }}/></a>
+        <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
         <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span>
     </p>
 </div>
-- 
cgit v1.2.3


From eef05c3ddc0f3e719c4d4c3a5acbcc0351da46a9 Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Wed, 10 Dec 2014 18:11:59 +0100
Subject: Alt on favicon

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

(limited to 'searx/templates/courgette')

diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html
index 734f9066c..5a8a78198 100644
--- a/searx/templates/courgette/result_templates/map.html
+++ b/searx/templates/courgette/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" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />
   {% endif %}
 
   <div>
-- 
cgit v1.2.3


From a809fd1bbb8a62b6a0f02f43e415f29b9af60f8c Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Wed, 10 Dec 2014 18:14:29 +0100
Subject: Multiple HTML corrections

Alt on favicon
Width of image should be 400 and not 400px
Correct alt+title on image
No <p> contains <p>
---
 searx/templates/courgette/result_templates/videos.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'searx/templates/courgette')

diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html
index 8ceb0b180..c8d1a39b6 100644
--- a/searx/templates/courgette/result_templates/videos.html
+++ b/searx/templates/courgette/result_templates/videos.html
@@ -1,12 +1,10 @@
 <div class="result">
   {% if result['favicon'] %}
-    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />
   {% endif %}
 
-    <p>
       <h3 class="result_title"><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 width="400px" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
+      <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
       <p class="url">{{ result.url }}</p>
-    </p>
 </div>
-- 
cgit v1.2.3