Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies

Browse Source 
Conflicts:
	searx/templates/oscar/preferences.html
This commit is contained in:
Adam Tauber 2015-04-26 20:14:40 +02:00
commit 41e00e65a5
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
searx/templates/oscar/preferences.html
View File

@ -17,6 +17,7 @@
<li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li> <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
<li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li> <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
<li><a href="#tab_plugins" role="tab" data-toggle="tab">{{ _('Plugins') }}</a></li> <li><a href="#tab_plugins" role="tab" data-toggle="tab">{{ _('Plugins') }}</a></li>
<li><a href="#tab_cookies" role="tab" data-toggle="tab">{{ _('Cookies') }}</a></li>
</ul> </ul>
<!-- Tab panes --> <!-- Tab panes -->
@ -159,23 +160,48 @@
<h3>{{ _('Plugins') }}</h3> <h3>{{ _('Plugins') }}</h3>
</noscript> </noscript>
<fieldset> <fieldset>
<div class="container-fluid"> <div class="container-fluid">
{% for plugin in plugins %} {% for plugin in plugins %}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">{{ plugin.name }}</h3> <h3 class="panel-title">{{ plugin.name }}</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="col-xs-6 col-sm-4 col-md-6">{{ plugin.description }}</div> <div class="col-xs-6 col-sm-4 col-md-6">{{ plugin.description }}</div>
<div class="col-xs-6 col-sm-4 col-md-6"> <div class="col-xs-6 col-sm-4 col-md-6">
{{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }} {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}
</div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>
{% endfor %}
</div>
</fieldset> </fieldset>
</div> </div>
<div class="tab-pane active_if_nojs" id="tab_cookies">
<noscript>
<h3>{{ _('Cookies') }}</h3>
</noscript>
<p class="text-muted" style="margin:20px 0;">
{{ _('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>
{% 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>
{% endfor %}
</fieldset>
</div>
</div>
</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.') }} <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.') }}
<br /> <br />