Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e28f12b authored by Adam Tauber's avatar Adam Tauber
Browse files

Merge pull request #356 from pointhi/settings_fix 

fix little bug inside settings, improve oscar template
parents aa1b8fa7 a8b75ca4

searx/templates/courgette/preferences.html

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
                <th>{{ _('Category') }}</th>

                <th>{{ _('Allow') }} / {{ _('Block') }}</th>

            </tr>

        {% for categ in categories %}

        {% for categ in all_categories %}

            {% for search_engine in engines_by_category[categ] %}



                {% if not search_engine.private %}

searx/templates/default/preferences.html

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
            <th>{{ _('Category') }}</th>

            <th>{{ _('Allow') }} / {{ _('Block') }}</th>

        </tr>

    {% for categ in categories %}

    {% for categ in all_categories %}

        {% for search_engine in engines_by_category[categ] %}



            {% if not search_engine.private %}

searx/templates/oscar/messages/no_cookies.html

0 → 100644
+5 −0
Original line number Diff line number Diff line 
{% from 'oscar/macros.html' import icon %}

<div class="alert alert-info fade in" role="alert">

    <strong class="lead">{{ icon('info-sign') }} {{ _('Information!') }}</strong>

    {{ _('currently, there are no cookies defined.') }}

</div>

searx/templates/oscar/preferences.html

+16 −14
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 


                <!-- Nav tabs -->

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

                    {% endfor %}

                </ul>
@@ -128,7 +128,7 @@ 


                <!-- Tab panes -->

                <div class="tab-content">

                    {% for categ in categories %}

                    {% for categ in all_categories %}

                    <noscript><label>{{ _(categ) }}</label>

                    </noscript>

                    <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
@@ -213,21 +213,23 @@ 
                    {{ _('This is the list of cookies and their values searx is storing on your computer.') }}<br />

                    {{ _('With that list, you can assess searx transparency.') }}<br />

                </p>

                <div class="container-fluid">

                    <fieldset>

                        <div class="row">

                            <div class="col-xs-6 col-sm-4 col-md-4 text-muted"><label>{{ _('Cookie name') }}</label></div>

                            <div class="col-xs-6 col-sm-4 col-md-4 text-muted"><label>{{ _('Value') }}</label></div>

                        </div>

                {% if cookies %}

                <table class="table table-striped">

                    <tr>

                        <th class="text-muted" style="padding-right:40px;">{{ _('Cookie name') }}</th>

                        <th class="text-muted">{{ _('Value') }}</th>

                    </tr>



                    {% for cookie in cookies %}

                        <div class="row">

                            <div class="col-xs-6 col-sm-4 col-md-4 text-muted">{{ cookie }}</div>

                            <div class="col-xs-6 col-sm-4 col-md-4 text-muted">{{ cookies[cookie] }}</div>

                        </div>

                    <tr>

                        <td class="text-muted" style="padding-right:40px;">{{ cookie }}</td>

                        <td class="text-muted">{{ cookies[cookie] }}</td>

                    </tr>

                    {% endfor %}

                    </fieldset>

                </div>

                </table>

                {% else %}

                    {% include 'oscar/messages/no_cookies.html' %}

                {% endif %}

            </div>

        </div>

        <p class="text-muted" style="margin:20px 0;">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }}

searx/webapp.py

+8 −0
Original line number Diff line number Diff line
@@ -279,6 +279,12 @@ def render(template_name, override_theme=None, **kwargs): 
                                    if x != 'general'

                                    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:

        kwargs['selected_categories'] = []

        for arg in request.args:
@@ -286,11 +292,13 @@ def render(template_name, override_theme=None, **kwargs): 
                c = arg.split('_', 1)[1]

                if c in categories:

                    kwargs['selected_categories'].append(c)



    if not kwargs['selected_categories']:

        cookie_categories = request.cookies.get('categories', '').split(',')

        for ccateg in cookie_categories:

            if ccateg in categories:

                kwargs['selected_categories'].append(ccateg)



    if not kwargs['selected_categories']:

        kwargs['selected_categories'] = ['general']