Просмотр исходного кода

follow up blocked_engines renaming in templates

Noemi Vanyi 9 лет назад
Родитель
Сommit
7daf98933d

+ 1
- 1
searx/templates/courgette/preferences.html Просмотреть файл

109
                     <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
109
                     <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
110
                     <td>{{ _(categ) }}</td>
110
                     <td>{{ _(categ) }}</td>
111
                     <td class="engine_checkbox">
111
                     <td class="engine_checkbox">
112
-                        <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} />
112
+                        <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} />
113
                         <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
113
                         <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
114
                         <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
114
                         <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
115
                     </td>
115
                     </td>

+ 1
- 1
searx/templates/default/preferences.html Просмотреть файл

97
                 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
97
                 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
98
                 <td>{{ _(categ) }}</td>
98
                 <td>{{ _(categ) }}</td>
99
                 <td class="engine_checkbox">
99
                 <td class="engine_checkbox">
100
-                    <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} />
100
+                    <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} />
101
                     <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
101
                     <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
102
                     <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
102
                     <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
103
                 </td>
103
                 </td>

+ 2
- 2
searx/templates/oscar/preferences.html Просмотреть файл

157
                             {% if not search_engine.private %}
157
                             {% if not search_engine.private %}
158
                                 <tr>
158
                                 <tr>
159
                                     {% if not rtl %}
159
                                     {% if not rtl %}
160
-                                    <td>{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in blocked_engines) }}</td>
160
+                                    <td>{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}</td>
161
                                     <th>{{ search_engine.name }}</th>
161
                                     <th>{{ search_engine.name }}</th>
162
 				    <td>{{ shortcuts[search_engine.name] }}</td>
162
 				    <td>{{ shortcuts[search_engine.name] }}</td>
163
 				    <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>
163
 				    <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>
169
 				    <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>
169
 				    <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>
170
 				    <td>{{ shortcuts[search_engine.name] }}</td>
170
 				    <td>{{ shortcuts[search_engine.name] }}</td>
171
                                     <th>{{ search_engine.name }}</th>
171
                                     <th>{{ search_engine.name }}</th>
172
-                                    <td>{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in blocked_engines) }}</td>
172
+                                    <td>{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}</td>
173
                                     {% endif %}
173
                                     {% endif %}
174
                                 </tr>
174
                                 </tr>
175
                             {% endif %}
175
                             {% endif %}

+ 1
- 1
searx/templates/pix-art/preferences.html Просмотреть файл

60
             <tr>
60
             <tr>
61
                 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
61
                 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
62
                 <td class="engine_checkbox">
62
                 <td class="engine_checkbox">
63
-                    <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} />
63
+                    <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} />
64
                     <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
64
                     <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
65
                     <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
65
                     <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
66
                 </td>
66
                 </td>

+ 1
- 1
searx/webapp.py Просмотреть файл

567
                   language_codes=language_codes,
567
                   language_codes=language_codes,
568
                   engines_by_category=categories,
568
                   engines_by_category=categories,
569
                   stats=stats,
569
                   stats=stats,
570
-                  blocked_engines=disabled_engines,
570
+                  disabled_engines=disabled_engines,
571
                   autocomplete_backends=autocomplete_backends,
571
                   autocomplete_backends=autocomplete_backends,
572
                   shortcuts={y: x for x, y in engine_shortcuts.items()},
572
                   shortcuts={y: x for x, y in engine_shortcuts.items()},
573
                   themes=themes,
573
                   themes=themes,