git.iko.soy/searx
on master help sign in
[fix] ordered categories in preferences - closes #258
6f73f4eAdam Tauber
searx/templates/courgette/preferences.html+2−2
compare with master
unifiedsplit
@@ -101,8 +101,8 @@
101 <th>{{ _('Category') }}</th>
101 <th>{{ _('Category') }}</th>
102 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
102 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
103 </tr>
103 </tr>
104− {% for (categ,search_engines) in categs %}
104+ {% for categ in categories %}
105− {% for search_engine in search_engines %}
105+ {% for search_engine in engines_by_category[categ] %}
106
106
107 {% if not search_engine.private %}
107 {% if not search_engine.private %}
108 <tr>
108 <tr>
searx/templates/default/preferences.html+2−2
@@ -89,8 +89,8 @@
89 <th>{{ _('Category') }}</th>
89 <th>{{ _('Category') }}</th>
90 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
90 <th>{{ _('Allow') }} / {{ _('Block') }}</th>
91 </tr>
91 </tr>
92− {% for (categ,search_engines) in categs %}
92+ {% for categ in categories %}
93− {% for search_engine in search_engines %}
93+ {% for search_engine in engines_by_category[categ] %}
94
94
95 {% if not search_engine.private %}
95 {% if not search_engine.private %}
96 <tr>
96 <tr>
searx/templates/oscar/preferences.html+3−3
@@ -116,7 +116,7 @@
116
116
117 <!-- Nav tabs -->
117 <!-- Nav tabs -->
118 <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
118 <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 %}
120 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
120 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
121 {% endfor %}
121 {% endfor %}
122 </ul>
122 </ul>
@@ -127,13 +127,13 @@
127
127
128 <!-- Tab panes -->
128 <!-- Tab panes -->
129 <div class="tab-content">
129 <div class="tab-content">
130− {% for (categ,search_engines) in categs %}
130+ {% for categ in categories %}
131 <noscript><label>{{ _(categ) }}</label>
131 <noscript><label>{{ _(categ) }}</label>
132 </noscript>
132 </noscript>
133 <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
133 <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
134 <div class="container-fluid">
134 <div class="container-fluid">
135 <fieldset>
135 <fieldset>
136− {% for search_engine in search_engines %}
136+ {% for search_engine in engines_by_category[categ] %}
137 {% if not search_engine.private %}
137 {% if not search_engine.private %}
138 <div class="row">
138 <div class="row">
139 {% if not rtl %}
139 {% if not rtl %}
searx/webapp.py+1−1
@@ -607,7 +607,7 @@ def preferences():
607 current_language=lang or 'all',
607 current_language=lang or 'all',
608 image_proxy=image_proxy,
608 image_proxy=image_proxy,
609 language_codes=language_codes,
609 language_codes=language_codes,
610− categs=categories.items(),
610+ engines_by_category=categories,
611 blocked_engines=blocked_engines,
611 blocked_engines=blocked_engines,
612 autocomplete_backends=autocomplete_backends,
612 autocomplete_backends=autocomplete_backends,
613 shortcuts={y: x for x, y in engine_shortcuts.items()},
613 shortcuts={y: x for x, y in engine_shortcuts.items()},