From f3b565e17ecd4c875381a3a212d73fb065f9a89d Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 12:33:22 +0200
Subject: oscar template: implement first version of results page

* implement results page
* improve search form template
* implement all result_templates
* fix youtube engine
---
 searx/templates/oscar/result_templates/images.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 searx/templates/oscar/result_templates/images.html

(limited to 'searx/templates/oscar/result_templates/images.html')

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
new file mode 100644
index 000000000..07b427d78
--- /dev/null
+++ b/searx/templates/oscar/result_templates/images.html
@@ -0,0 +1,21 @@
+<a href="#" data-toggle="modal" data-target="#modal-{{ index }}">
+    <img src="{{ result.img_src }}" alt="{{ result.title|e }}" class="img-thumbnail">
+</a>
+
+<div class="modal fade" id="modal-{{ index }}" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <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>
+            </div>
+            <div class="modal-body">
+                <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">
+            </div>
+            <div class="modal-footer">
+                <a href="{{ result.img_src }}" class="btn btn-default">{{ _('Get image') }}</a>
+                <a href="{{ result.url }}" class="btn btn-default">{{ _('View source') }}</a>
+            </div>
+        </div>
+    </div>
+</div>
-- 
cgit v1.2.3


From 6fa5f02d0b6a5cdd65216b689f217a42beb7070f Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 13:25:12 +0200
Subject: oscar template: improve image results

---
 searx/templates/oscar/result_templates/images.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'searx/templates/oscar/result_templates/images.html')

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 07b427d78..48ed5dece 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -11,8 +11,12 @@
             </div>
             <div class="modal-body">
                 <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">
+                {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
             </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>
+                <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>
             </div>
-- 
cgit v1.2.3


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/images.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'searx/templates/oscar/result_templates/images.html')

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>
-- 
cgit v1.2.3


From 25312c53e170deb55bd48029e3b76b87692e1911 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 3 Nov 2014 22:18:40 +0100
Subject: [enh] add no-js support

* image results have url, which can be clicked
* preferences full functionable without js
---
 searx/templates/oscar/result_templates/images.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/templates/oscar/result_templates/images.html')

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 5570a3143..3ad48352a 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -1,4 +1,4 @@
-<a href="#" data-toggle="modal" data-target="#modal-{{ index }}">
+<a href="{{ result.img_src }}" data-toggle="modal" data-target="#modal-{{ index }}">
     <img src="{{ result.img_src }}" alt="{{ result.title|e }}" class="img-thumbnail">
 </a>
 
-- 
cgit v1.2.3