on master help sign in
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.

commit34b5d9566988652063c27b48d45b1cd02ddb3be5 authorCqoicebordel <Cqoicebordel@users.noreply.github.com> dateMon 8 Dec 2014, 01:01 (12 years ago) parentc2e8833
1 file changed+6−8
searx/templates/oscar/results.html+6−8
searx/templates/oscar/results.html+6−8
@@ -51,6 +51,11 @@
5151 </div><!-- /#main_results -->
5252
5353 <div class="col-sm-4" id="sidebar_results">
54+ {% if infoboxes %}
55+ {% for infobox in infoboxes %}
56+ {% include 'oscar/infobox.html' %}
57+ {% endfor %}
58+ {% endif %}
5459
5560 {% if suggestions %}
5661 <div class="panel panel-default">
@@ -76,7 +81,7 @@
7681 <form role="form">
7782 <div class="form-group">
7883 <label for="search_url">{{ _('Search URL') }}</label>
79− <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>
84+ <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>
8085 </div>
8186 </form>
8287
@@ -94,13 +99,6 @@
9499 <div class="clearfix"></div>
95100 </div>
96101 </div>
97−
98− {% if infoboxes %}
99− {% for infobox in infoboxes %}
100− {% include 'oscar/infobox.html' %}
101− {% endfor %}
102− {% endif %}
103−
104102 </div><!-- /#sidebar_results -->
105103 </div>
106104{% endblock %}