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/results.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 searx/templates/oscar/results.html

(limited to 'searx/templates/oscar/results.html')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
new file mode 100644
index 000000000..fde65c883
--- /dev/null
+++ b/searx/templates/oscar/results.html
@@ -0,0 +1,22 @@
+{% extends "oscar/base.html" %}
+{% block title %}{{ q }} - {% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col-sm-8" id="main_results">
+            <h1 class="sr-only">{{ _('Search results') }}</h1>
+            {% include 'oscar/search.html' %}
+            
+            {% for result in results %}
+            <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
+                {% set index = loop.index %}
+                {% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %}
+            </div>
+            {% endfor %}
+            
+            <div class="clearfix"></div>
+    
+        </div>
+        <div class="col-sm-4" id="sidebar_results">
+        </div>
+    </div>
+{% endblock %}
-- 
cgit v1.2.3


From b91b77e335c0b0f2dca2b261c64414c96fdb2412 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 14:44:34 +0200
Subject: oscar template: improve result page

* add paging support
* add suggestion panel
* add links panel
---
 searx/templates/oscar/results.html | 80 +++++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 5 deletions(-)

(limited to 'searx/templates/oscar/results.html')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index fde65c883..f4364ed48 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -5,18 +5,88 @@
         <div class="col-sm-8" id="main_results">
             <h1 class="sr-only">{{ _('Search results') }}</h1>
             {% include 'oscar/search.html' %}
-            
+
             {% for result in results %}
             <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
                 {% set index = loop.index %}
                 {% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %}
             </div>
             {% endfor %}
-            
+
             <div class="clearfix"></div>
-    
-        </div>
+
+            {% if paging %}
+            <div id="pagination">
+                <div class="pull-left">
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
+                        <input type="hidden" name="q" value="{{ q }}" />
+                        {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
+                        <input type="hidden" name="pageno" value="{{ pageno-1 }}" />
+                        <button type="submit" class="btn btn-default" {% if pageno == 1 %}disabled{% endif %}><span class="glyphicon glyphicon-backward"></span> {{ _('previous page') }}</button>
+                    </form>
+                </div>
+                <div class="pull-right">
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"  class="pull-left">
+                        {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
+                        <input type="hidden" name="q" value="{{ q }}" />
+                        <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
+                        <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-forward"></span> {{ _('next page') }}</button>
+                    </form>
+                </div>
+            </div><!-- /#pagination -->
+            <div class="clearfix"></div>
+            {% endif %}
+        </div><!-- /#main_results -->
+
         <div class="col-sm-4" id="sidebar_results">
-        </div>
+
+            {% if suggestions %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#suggestions">{{ _('Suggestions') }}</a>
+                    </h4>
+                </div>
+                <div class="panel-body">
+                    {% for suggestion in suggestions %}
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">
+                        <input type="hidden" name="q" value="{{ suggestion }}">
+                        <button type="submit" class="btn btn-default btn-xs">{{ suggestion }}</button>
+                    </form>
+                    {% endfor %}
+                </div>
+            </div>
+            {% endif %}
+
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#links">{{ _('Links') }}</a>
+                    </h4>
+                </div>
+                <div class="panel-body">
+                    <form role="form">
+                        <div class="form-group">
+                            <label for="search_url">{{ _('Search URL') }}</label>
+                            <input type="url" class="form-control" name="search_url" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}">
+                        </div>
+                    </form>
+                    
+                    <label>{{ _('Download results') }}</label>
+                    <div class="clearfix"></div>
+                    {% for output_type in ('csv', 'json', 'rss') %}
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-left result_download">
+                        <input type="hidden" name="q" value="{{ q }}">
+                        <input type="hidden" name="format" value="{{ output_type }}">
+                        {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1">{% endfor %}
+                        <input type="hidden" name="pageno" value="{{ pageno }}">
+                        <button type="submit" class="btn btn-default">{{ output_type }}</button>
+                    </form>
+                    {% endfor %} 
+                    <div class="clearfix"></div>
+                </div>
+            </div>
+        
+        </div><!-- /#sidebar_results -->
     </div>
 {% endblock %}
-- 
cgit v1.2.3


From dc2c1362205ea90dae75872b316dc1d693c9a750 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 15:46:57 +0200
Subject: oscar template: little style improvements

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

(limited to 'searx/templates/oscar/results.html')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index f4364ed48..91070777b 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -68,7 +68,7 @@
                     <form role="form">
                         <div class="form-group">
                             <label for="search_url">{{ _('Search URL') }}</label>
-                            <input type="url" class="form-control" name="search_url" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}">
+                            <input type="url" class="form-control select-all-on-click cursor-text" name="search_url" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly>
                         </div>
                     </form>
                     
-- 
cgit v1.2.3


From c25aab73b72087a9a56d86c155a166bfcf018822 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Wed, 1 Oct 2014 19:46:29 +0200
Subject: oscar template: add no result message

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

(limited to 'searx/templates/oscar/results.html')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 91070777b..6b02dc7bd 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -12,6 +12,10 @@
                 {% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %}
             </div>
             {% endfor %}
+            
+            {% if not results %}
+                {% include 'oscar/messages/no_results.html' %}
+            {% endif %}
 
             <div class="clearfix"></div>
 
-- 
cgit v1.2.3


From c36c935b03cc87ddfcac5ce3ded333be73387a7a Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 5 Oct 2014 15:29:21 +0200
Subject: oscar template: add infobox

---
 searx/templates/oscar/results.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'searx/templates/oscar/results.html')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 6b02dc7bd..0bf4914b4 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -47,9 +47,7 @@
             {% if suggestions %}
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h4 class="panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#suggestions">{{ _('Suggestions') }}</a>
-                    </h4>
+                    <h4 class="panel-title">{{ _('Suggestions') }}</h4>
                 </div>
                 <div class="panel-body">
                     {% for suggestion in suggestions %}
@@ -64,9 +62,7 @@
 
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h4 class="panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#links">{{ _('Links') }}</a>
-                    </h4>
+                    <h4 class="panel-title">{{ _('Links') }}</h4>
                 </div>
                 <div class="panel-body">
                     <form role="form">
@@ -91,6 +87,12 @@
                 </div>
             </div>
         
+        {% if infoboxes %}
+            {% for infobox in infoboxes %}
+                {% include 'oscar/infobox.html' %}
+            {% endfor %}
+        {% endif %}    
+        
         </div><!-- /#sidebar_results -->
     </div>
 {% endblock %}
-- 
cgit v1.2.3


From a697a1eaa56d05e3b95240cc2f6bd8954b378812 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 26 Oct 2014 19:20:20 +0100
Subject: oscar template: display answers

---
 searx/templates/oscar/results.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'searx/templates/oscar/results.html')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 0bf4914b4..deda276fa 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -6,6 +6,14 @@
             <h1 class="sr-only">{{ _('Search results') }}</h1>
             {% include 'oscar/search.html' %}
 
+            {% if answers %}
+            {% for answer in answers %}
+            <div class="result well">
+                <span>{{ answer }}</span>
+            </div>
+            {% endfor %}
+            {% endif %}
+
             {% for result in results %}
             <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
                 {% set index = loop.index %}
-- 
cgit v1.2.3