mirrors/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-12-20 16:26:33 +00:00
Code Issues Projects Releases Wiki Activity

[fix] do not hide categorie inside preferences if there is no engine activated

Browse source
This commit is contained in:
Thomas Pointhuber 2015-06-05 08:48:47 +02:00
parent aa1b8fa79b
commit 0978f10887
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
searx/templates/courgette/preferences.html
View file

@ -101,7 +101,7 @@
<th>{{ _('Category') }}</th> <th>{{ _('Category') }}</th>
<th>{{ _('Allow') }} / {{ _('Block') }}</th> <th>{{ _('Allow') }} / {{ _('Block') }}</th>
</tr> </tr>
{% for categ in categories %} {% for categ in all_categories %}
{% for search_engine in engines_by_category[categ] %} {% for search_engine in engines_by_category[categ] %}
{% if not search_engine.private %} {% if not search_engine.private %}

2
searx/templates/default/preferences.html
View file

@ -89,7 +89,7 @@
<th>{{ _('Category') }}</th> <th>{{ _('Category') }}</th>
<th>{{ _('Allow') }} / {{ _('Block') }}</th> <th>{{ _('Allow') }} / {{ _('Block') }}</th>
</tr> </tr>
{% for categ in categories %} {% for categ in all_categories %}
{% for search_engine in engines_by_category[categ] %} {% for search_engine in engines_by_category[categ] %}
{% if not search_engine.private %} {% if not search_engine.private %}

4
searx/templates/oscar/preferences.html
View file

@ -117,7 +117,7 @@
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;"> <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
{% for categ in categories %} {% for categ in all_categories %}
<li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li> <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
@ -128,7 +128,7 @@
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
{% for categ in categories %} {% for categ in all_categories %}
<noscript><label>{{ _(categ) }}</label> <noscript><label>{{ _(categ) }}</label>
</noscript> </noscript>
<div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}"> <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">

8
searx/webapp.py
View file

@ -279,6 +279,12 @@ def render(template_name, override_theme=None, **kwargs):
if x != 'general' if x != 'general'
and x in nonblocked_categories) and x in nonblocked_categories)
if 'all_categories' not in kwargs:
kwargs['all_categories'] = ['general']
kwargs['all_categories'].extend(x for x in
sorted(categories.keys())
if x != 'general')
if 'selected_categories' not in kwargs: if 'selected_categories' not in kwargs:
kwargs['selected_categories'] = [] kwargs['selected_categories'] = []
for arg in request.args: for arg in request.args:
@ -286,11 +292,13 @@ def render(template_name, override_theme=None, **kwargs):
c = arg.split('_', 1)[1] c = arg.split('_', 1)[1]
if c in categories: if c in categories:
kwargs['selected_categories'].append(c) kwargs['selected_categories'].append(c)
if not kwargs['selected_categories']: if not kwargs['selected_categories']:
cookie_categories = request.cookies.get('categories', '').split(',') cookie_categories = request.cookies.get('categories', '').split(',')
for ccateg in cookie_categories: for ccateg in cookie_categories:
if ccateg in categories: if ccateg in categories:
kwargs['selected_categories'].append(ccateg) kwargs['selected_categories'].append(ccateg)
if not kwargs['selected_categories']: if not kwargs['selected_categories']:
kwargs['selected_categories'] = ['general'] kwargs['selected_categories'] = ['general']