git.iko.soy/searx
on master help sign in
[fix] ordered categories in preferences - closes #258
commit6f73f4e7a41b957bf74494613d035f9140f5f906 authorAdam Tauber <asciimoo@gmail.com> dateTue 7 Apr 2015, 18:09 (12 years ago) parent79b3de5
4 files changed+8−8
compare with master
unifiedsplit
searx/templates/courgette/preferences.html+2−2 searx/templates/default/preferences.html+2−2 searx/templates/oscar/preferences.html+3−3 searx/webapp.py+1−1
searx/templates/courgette/preferences.html+2−2
@@ -101,8 +101,8 @@
101101 <th>{{ _('Category') }}</th>
102102 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
103103 </tr>
104− {% for (categ,search_engines) in categs %}
105− {% for search_engine in search_engines %}
104+ {% for categ in categories %}
105+ {% for search_engine in engines_by_category[categ] %}
106106
107107 {% if not search_engine.private %}
108108 <tr>
searx/templates/default/preferences.html+2−2
@@ -89,8 +89,8 @@
8989 <th>{{ _('Category') }}</th>
9090 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
9191 </tr>
92− {% for (categ,search_engines) in categs %}
93− {% for search_engine in search_engines %}
92+ {% for categ in categories %}
93+ {% for search_engine in engines_by_category[categ] %}
9494
9595 {% if not search_engine.private %}
9696 <tr>
searx/templates/oscar/preferences.html+3−3
@@ -116,7 +116,7 @@
116116
117117 <!-- Nav tabs -->
118118 <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
119− {% for (categ,search_engines) in categs %}
119+ {% for categ in categories %}
120120 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
121121 {% endfor %}
122122 </ul>
@@ -127,13 +127,13 @@
127127
128128 <!-- Tab panes -->
129129 <div class="tab-content">
130− {% for (categ,search_engines) in categs %}
130+ {% for categ in categories %}
131131 <noscript><label>{{ _(categ) }}</label>
132132 </noscript>
133133 <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
134134 <div class="container-fluid">
135135 <fieldset>
136− {% for search_engine in search_engines %}
136+ {% for search_engine in engines_by_category[categ] %}
137137 {% if not search_engine.private %}
138138 <div class="row">
139139 {% if not rtl %}
searx/webapp.py+1−1
@@ -607,7 +607,7 @@ def preferences():
607607 current_language=lang or 'all',
608608 image_proxy=image_proxy,
609609 language_codes=language_codes,
610− categs=categories.items(),
610+ engines_by_category=categories,
611611 blocked_engines=blocked_engines,
612612 autocomplete_backends=autocomplete_backends,
613613 shortcuts={y: x for x, y in engine_shortcuts.items()},