searx

commit: 34b5d9566988652063c27b48d45b1cd02ddb3be5
parent c2e88339f7bb84e719e943b427a9afcdd84981aa
Author: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date:   Mon,  8 Dec 2014 01:01:33 +0100

UX and HTML corrections

Put the infobox first. Result first is more useful for the user.
Add id in form for "for".
htmlentities in the URL.
Take care of spaces in categories.
Diffstat:
M
searx/templates/oscar/results.html
14
++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
@@ -51,6 +51,11 @@
         </div><!-- /#main_results -->
 
         <div class="col-sm-4" id="sidebar_results">
+            {% if infoboxes %}
+                {% for infobox in infoboxes %}
+                    {% include 'oscar/infobox.html' %}
+                {% endfor %}
+            {% endif %} 
 
             {% if suggestions %}
             <div class="panel panel-default">
@@ -76,7 +81,7 @@
                     <form role="form">
                         <div class="form-group">
                             <label for="search_url">{{ _('Search URL') }}</label>
-                            <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>
+                            <input id="search_url" type="url" class="form-control select-all-on-click cursor-text" name="search_url" value="{{ base_url }}?q={{ q|urlencode }}&amp;pageno={{ pageno }}{% if selected_categories %}&amp;category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly>
                         </div>
                     </form>
                     
@@ -94,13 +99,6 @@
                     <div class="clearfix"></div>
                 </div>
             </div>
-        
-        {% if infoboxes %}
-            {% for infobox in infoboxes %}
-                {% include 'oscar/infobox.html' %}
-            {% endfor %}
-        {% endif %}    
-        
         </div><!-- /#sidebar_results -->
     </div>
 {% endblock %}