瀏覽代碼

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.
Cqoicebordel 10 年之前
父節點
當前提交
34b5d95669
共有 1 個檔案被更改,包括 6 行新增8 行删除
  1. 6
    8
      searx/templates/oscar/results.html

+ 6
- 8
searx/templates/oscar/results.html 查看文件

51
         </div><!-- /#main_results -->
51
         </div><!-- /#main_results -->
52
 
52
 
53
         <div class="col-sm-4" id="sidebar_results">
53
         <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 %} 
54
 
59
 
55
             {% if suggestions %}
60
             {% if suggestions %}
56
             <div class="panel panel-default">
61
             <div class="panel panel-default">
76
                     <form role="form">
81
                     <form role="form">
77
                         <div class="form-group">
82
                         <div class="form-group">
78
                             <label for="search_url">{{ _('Search URL') }}</label>
83
                             <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>
80
                         </div>
85
                         </div>
81
                     </form>
86
                     </form>
82
                     
87
                     
94
                     <div class="clearfix"></div>
99
                     <div class="clearfix"></div>
95
                 </div>
100
                 </div>
96
             </div>
101
             </div>
97
-        
98
-        {% if infoboxes %}
99
-            {% for infobox in infoboxes %}
100
-                {% include 'oscar/infobox.html' %}
101
-            {% endfor %}
102
-        {% endif %}    
103
-        
104
         </div><!-- /#sidebar_results -->
102
         </div><!-- /#sidebar_results -->
105
     </div>
103
     </div>
106
 {% endblock %}
104
 {% endblock %}