git.iko.soy/searx
on master help sign in
follow up blocked_engines renaming in templates
commit7daf98933d39151ab5fd7929645f26497db8b8af authorNoemi Vanyi <sitbackandwait@gmail.com> dateSat 9 Apr 2016, 18:48 (11 years ago) parent5867e97
5 files changed+6−6
compare with master
unifiedsplit
searx/templates/courgette/preferences.html+1−1 searx/templates/default/preferences.html+1−1 searx/templates/oscar/preferences.html+2−2 searx/templates/pix-art/preferences.html+1−1 searx/webapp.py+1−1
searx/templates/courgette/preferences.html+1−1
@@ -109,7 +109,7 @@
109109 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
110110 <td>{{ _(categ) }}</td>
111111 <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 %} />
113113 <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
114114 <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
115115 </td>
searx/templates/default/preferences.html+1−1
@@ -97,7 +97,7 @@
9797 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
9898 <td>{{ _(categ) }}</td>
9999 <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 %} />
101101 <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
102102 <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
103103 </td>
searx/templates/oscar/preferences.html+2−2
@@ -157,7 +157,7 @@
157157 {% if not search_engine.private %}
158158 <tr>
159159 {% 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>
161161 <th>{{ search_engine.name }}</th>
162162 <td>{{ shortcuts[search_engine.name] }}</td>
163163 <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>
@@ -169,7 +169,7 @@
169169 <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>
170170 <td>{{ shortcuts[search_engine.name] }}</td>
171171 <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>
173173 {% endif %}
174174 </tr>
175175 {% endif %}
searx/templates/pix-art/preferences.html+1−1
@@ -60,7 +60,7 @@
6060 <tr>
6161 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>
6262 <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 %} />
6464 <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
6565 <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
6666 </td>
searx/webapp.py+1−1
@@ -567,7 +567,7 @@ def preferences():
567567 language_codes=language_codes,
568568 engines_by_category=categories,
569569 stats=stats,
570− blocked_engines=disabled_engines,
570+ disabled_engines=disabled_engines,
571571 autocomplete_backends=autocomplete_backends,
572572 shortcuts={y: x for x, y in engine_shortcuts.items()},
573573 themes=themes,