Browse Source

[fix] ordered categories in preferences - closes #258

Adam Tauber 10 years ago
parent
commit
6f73f4e7a4

+ 2
- 2
searx/templates/courgette/preferences.html View File

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 %}
105
-            {% for search_engine in search_engines %}
104
+        {% for categ in categories %}
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>

+ 2
- 2
searx/templates/default/preferences.html View File

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 %}
93
-        {% for search_engine in search_engines %}
92
+    {% for categ in categories %}
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>

+ 3
- 3
searx/templates/oscar/preferences.html View File

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
 
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 %}

+ 1
- 1
searx/webapp.py View File

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()},