From 6ee35145caccab29a12e32e815bfd838579b35db Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Wed, 18 Feb 2015 18:31:01 +0100
Subject: [PATCH 1/2] New Tab in preferences in Oscar to view Cookies This tab
 only purpose is to allow to see what searx is storing on the user's computer.

At a later time, we could implement a way to delete those cookies.
---
 searx/templates/oscar/preferences.html | 316 +++++++++++++------------
 1 file changed, 171 insertions(+), 145 deletions(-)

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 126bdbd7b..2425b9ea4 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -12,159 +12,185 @@
     <h1>{{ _('Preferences') }}</h1>
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
 
-    <!-- Nav tabs -->
-    <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
-      <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>
-    </ul>
+        <!-- Nav tabs -->
+        <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
+          <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_cookies" role="tab" data-toggle="tab">{{ _('Cookies') }}</a></li>
+        </ul>
 
-    <!-- Tab panes -->
-    <noscript>
-        <h3>{{ _('General') }}</h3>
-    </noscript>
-    <div class="tab-content">
-        <div class="tab-pane active" id="tab_general">
-            <fieldset>
-            <div class="container-fluid">
-                <div class="row form-group">
-                    {% if rtl %}
-                    <div class="col-sm-11 col-md-10">
-                        {% include 'oscar/categories.html' %}
-                    </div>
-                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
-                    {% else %}
-                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
-                    <div class="col-sm-11 col-md-10">
-                        {% include 'oscar/categories.html' %}
-                    </div>
-                    {% endif %}
-                </div>
-                {% set language_label = _('Search language') %}
-                {% set language_info = _('What language do you prefer for search?') %}
-                {{ preferences_item_header(language_info, language_label, rtl) }}
-                    <select class="form-control" name='language'>
-                        <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
-                        {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %}
-                        <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
-                        {% endfor %}
-                    </select>
-                {{ preferences_item_footer(language_info, language_label, rtl) }}
-
-                {% set locale_label = _('Interface language') %}
-                {% set locale_info = _('Change the language of the layout') %}
-                {{ preferences_item_header(locale_info, locale_label, rtl) }}
-                    <select class="form-control" name='locale'>
-                        {% for locale_id,locale_name in locales.items() | sort %}
-                        <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
-                        {% endfor %}
-                    </select>
-                {{ preferences_item_footer(locale_info, locale_label, rtl) }}
-
-                {% set autocomplete_label = _('Autocomplete') %}
-                {% set autocomplete_info = _('Find stuff as you type') %}
-                {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }}
-                    <select class="form-control" name="autocomplete">
-                        <option value=""> - </option>
-                        {% for backend in autocomplete_backends %}
-                        <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
-                        {% endfor %}
-                    </select>
-                {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }}
-
-                {% set image_proxy_label = _('Image proxy') %}
-                {% set image_proxy_info = _('Proxying image results through searx') %}
-                {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }}
-                    <select class="form-control" name='image_proxy'>
-                        <option value="1" {% if image_proxy  %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
-                        <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
-                    </select>
-                {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }}
-
-                {% set method_label = _('Method') %}
-                {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %}
-                {{ preferences_item_header(method_info, method_label, rtl) }}
-                    <select class="form-control" name='method'>
-                        <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
-                        <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
-                    </select>
-                {{ preferences_item_footer(method_info, method_label, rtl) }}
-
-                {% set safesearch_label = _('SafeSearch') %}
-                {% set safesearch_info = _('Filter content') %}
-                {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }}
-                    <select class="form-control" name='safesearch'>
-                        <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
-                        <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
-                        <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
-                    </select>
-                {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }}
-
-                {% set theme_label = _('Themes') %}
-                {% set theme_info = _('Change searx layout') %}
-                {{ preferences_item_header(theme_info, theme_label, rtl) }}
-                    <select class="form-control" name="theme">
-                        {% for name in themes %}
-                        <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
-                        {% endfor %}
-                    </select>
-                {{ preferences_item_footer(theme_info, theme_label, rtl) }}
-            </div>
-            </fieldset>
-        </div>
-        <div class="tab-pane active_if_nojs" id="tab_engine">
-
-            <!-- Nav tabs -->
-            <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
-                {% for (categ,search_engines) in categs %}
-                <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
-                {% endfor %}
-            </ul>
-
-            <noscript>
-                <h3>{{ _('Engines') }}</h3>
-            </noscript>
-
-            <!-- Tab panes -->
-            <div class="tab-content">
-                {% for (categ,search_engines) in categs %}
-                <noscript><label>{{ _(categ) }}</label>
-                </noscript>
-                <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
-                    <div class="container-fluid">
-                    <fieldset>
-                    {% for search_engine in search_engines %}
-                        {% if not search_engine.private %}
-                            <div class="row">
-                                {% if not rtl %}
-                                <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
-                                {% endif %}
-                                <div class="col-xs-6 col-sm-4 col-md-4">
-                                    <div class="checkbox">
-                                    <input class="hidden" 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 %} />
-                                    <label class="btn btn-success label_hide_if_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
-                                    <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
-                                    </div>
-                                </div>
-                                {% if rtl %}
-                                <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</div>
-                                {% endif %}
-                            </div>
+        <!-- Tab panes -->
+        <noscript>
+            <h3>{{ _('General') }}</h3>
+        </noscript>
+        <div class="tab-content">
+            <div class="tab-pane active" id="tab_general">
+                <fieldset>
+                <div class="container-fluid">
+                    <div class="row form-group">
+                        {% if rtl %}
+                        <div class="col-sm-11 col-md-10">
+                            {% include 'oscar/categories.html' %}
+                        </div>
+                        <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                        {% else %}
+                        <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                        <div class="col-sm-11 col-md-10">
+                            {% include 'oscar/categories.html' %}
+                        </div>
                         {% endif %}
+                    </div>
+                    {% set language_label = _('Search language') %}
+                    {% set language_info = _('What language do you prefer for search?') %}
+                    {{ preferences_item_header(language_info, language_label, rtl) }}
+                        <select class="form-control" name='language'>
+                            <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
+                            {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %}
+                            <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
+                            {% endfor %}
+                        </select>
+                    {{ preferences_item_footer(language_info, language_label, rtl) }}
+
+                    {% set locale_label = _('Interface language') %}
+                    {% set locale_info = _('Change the language of the layout') %}
+                    {{ preferences_item_header(locale_info, locale_label, rtl) }}
+                        <select class="form-control" name='locale'>
+                            {% for locale_id,locale_name in locales.items() | sort %}
+                            <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
+                            {% endfor %}
+                        </select>
+                    {{ preferences_item_footer(locale_info, locale_label, rtl) }}
+
+                    {% set autocomplete_label = _('Autocomplete') %}
+                    {% set autocomplete_info = _('Find stuff as you type') %}
+                    {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }}
+                        <select class="form-control" name="autocomplete">
+                            <option value=""> - </option>
+                            {% for backend in autocomplete_backends %}
+                            <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
+                            {% endfor %}
+                        </select>
+                    {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }}
+
+                    {% set image_proxy_label = _('Image proxy') %}
+                    {% set image_proxy_info = _('Proxying image results through searx') %}
+                    {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }}
+                        <select class="form-control" name='image_proxy'>
+                            <option value="1" {% if image_proxy  %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
+                            <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
+                        </select>
+                    {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }}
+
+                    {% set method_label = _('Method') %}
+                    {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %}
+                    {{ preferences_item_header(method_info, method_label, rtl) }}
+                        <select class="form-control" name='method'>
+                            <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
+                            <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
+                        </select>
+                    {{ preferences_item_footer(method_info, method_label, rtl) }}
+
+                    {% set safesearch_label = _('SafeSearch') %}
+                    {% set safesearch_info = _('Filter content') %}
+                    {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }}
+                        <select class="form-control" name='safesearch'>
+                            <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
+                            <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
+                            <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
+                        </select>
+                    {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }}
+
+                    {% set theme_label = _('Themes') %}
+                    {% set theme_info = _('Change searx layout') %}
+                    {{ preferences_item_header(theme_info, theme_label, rtl) }}
+                        <select class="form-control" name="theme">
+                            {% for name in themes %}
+                            <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
+                            {% endfor %}
+                        </select>
+                    {{ preferences_item_footer(theme_info, theme_label, rtl) }}
+                </div>
+                </fieldset>
+            </div>
+            <div class="tab-pane active_if_nojs" id="tab_engine">
+
+                <!-- Nav tabs -->
+                <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
+                    {% for (categ,search_engines) in categs %}
+                    <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
+                    {% endfor %}
+                </ul>
+
+                <noscript>
+                    <h3>{{ _('Engines') }}</h3>
+                </noscript>
+
+                <!-- Tab panes -->
+                <div class="tab-content">
+                    {% for (categ,search_engines) in categs %}
+                    <noscript><label>{{ _(categ) }}</label>
+                    </noscript>
+                    <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
+                        <div class="container-fluid">
+                        <fieldset>
+                        {% for search_engine in search_engines %}
+                            {% if not search_engine.private %}
+                                <div class="row">
+                                    {% if not rtl %}
+                                    <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
+                                    {% endif %}
+                                    <div class="col-xs-6 col-sm-4 col-md-4">
+                                        <div class="checkbox">
+                                        <input class="hidden" 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 %} />
+                                        <label class="btn btn-success label_hide_if_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                        <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+                                        </div>
+                                    </div>
+                                    {% if rtl %}
+                                    <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</div>
+                                    {% endif %}
+                                </div>
+                            {% endif %}
+                        {% endfor %}
+                        </fieldset>
+                        </div>
+                    </div>
+                    {% endfor %}
+                </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>
-                {% endfor %}
             </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.') }}
-    <br />
-    {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
-    </p>
+        <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 />
+        {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
+        </p>
 
-    <input type="submit" class="btn btn-primary" value="{{ _('save') }}" />
-	<a href="{{ url_for('index') }}"><div class="btn btn-default">{{ _('back') }}</div></a>
+        <input type="submit" class="btn btn-primary" value="{{ _('save') }}" />
+        <a href="{{ url_for('index') }}"><div class="btn btn-default">{{ _('back') }}</div></a>
     </form>
 </div>
 {% endblock %}

From 5c5ff19ec116062dc8c31e51af3f26fca041a445 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Sun, 26 Apr 2015 20:09:28 +0200
Subject: [PATCH 2/2] [fix] indentation

---
 searx/templates/oscar/preferences.html | 324 ++++++++++++-------------
 1 file changed, 162 insertions(+), 162 deletions(-)

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 9beb21009..56e67e815 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -12,179 +12,179 @@
     <h1>{{ _('Preferences') }}</h1>
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
 
-    <!-- Nav tabs -->
-    <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
-      <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_plugins" role="tab" data-toggle="tab">{{ _('Plugins') }}</a></li>
-    </ul>
+        <!-- Nav tabs -->
+        <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
+          <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_plugins" role="tab" data-toggle="tab">{{ _('Plugins') }}</a></li>
+        </ul>
 
-    <!-- Tab panes -->
-    <noscript>
-        <h3>{{ _('General') }}</h3>
-    </noscript>
-    <div class="tab-content">
-        <div class="tab-pane active" id="tab_general">
-            <fieldset>
-            <div class="container-fluid">
-                <div class="row form-group">
-                    {% if rtl %}
-                    <div class="col-sm-11 col-md-10">
-                        {% include 'oscar/categories.html' %}
-                    </div>
-                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
-                    {% else %}
-                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
-                    <div class="col-sm-11 col-md-10">
-                        {% include 'oscar/categories.html' %}
-                    </div>
-                    {% endif %}
-                </div>
-                {% set language_label = _('Search language') %}
-                {% set language_info = _('What language do you prefer for search?') %}
-                {{ preferences_item_header(language_info, language_label, rtl) }}
-                    <select class="form-control" name='language'>
-                        <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
-                        {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %}
-                        <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
-                        {% endfor %}
-                    </select>
-                {{ preferences_item_footer(language_info, language_label, rtl) }}
-
-                {% set locale_label = _('Interface language') %}
-                {% set locale_info = _('Change the language of the layout') %}
-                {{ preferences_item_header(locale_info, locale_label, rtl) }}
-                    <select class="form-control" name='locale'>
-                        {% for locale_id,locale_name in locales.items() | sort %}
-                        <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
-                        {% endfor %}
-                    </select>
-                {{ preferences_item_footer(locale_info, locale_label, rtl) }}
-
-                {% set autocomplete_label = _('Autocomplete') %}
-                {% set autocomplete_info = _('Find stuff as you type') %}
-                {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }}
-                    <select class="form-control" name="autocomplete">
-                        <option value=""> - </option>
-                        {% for backend in autocomplete_backends %}
-                        <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
-                        {% endfor %}
-                    </select>
-                {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }}
-
-                {% set image_proxy_label = _('Image proxy') %}
-                {% set image_proxy_info = _('Proxying image results through searx') %}
-                {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }}
-                    <select class="form-control" name='image_proxy'>
-                        <option value="1" {% if image_proxy  %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
-                        <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
-                    </select>
-                {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }}
-
-                {% set method_label = _('Method') %}
-                {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %}
-                {{ preferences_item_header(method_info, method_label, rtl) }}
-                    <select class="form-control" name='method'>
-                        <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
-                        <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
-                    </select>
-                {{ preferences_item_footer(method_info, method_label, rtl) }}
-
-                {% set safesearch_label = _('SafeSearch') %}
-                {% set safesearch_info = _('Filter content') %}
-                {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }}
-                    <select class="form-control" name='safesearch'>
-                        <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
-                        <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
-                        <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
-                    </select>
-                {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }}
-
-                {% set theme_label = _('Themes') %}
-                {% set theme_info = _('Change searx layout') %}
-                {{ preferences_item_header(theme_info, theme_label, rtl) }}
-                    <select class="form-control" name="theme">
-                        {% for name in themes %}
-                        <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
-                        {% endfor %}
-                    </select>
-                {{ preferences_item_footer(theme_info, theme_label, rtl) }}
-            </div>
-            </fieldset>
-        </div>
-        <div class="tab-pane active_if_nojs" id="tab_engine">
-
-            <!-- Nav tabs -->
-            <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
-                {% for categ in categories %}
-                <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
-                {% endfor %}
-            </ul>
-
-            <noscript>
-                <h3>{{ _('Engines') }}</h3>
-            </noscript>
-
-            <!-- Tab panes -->
-            <div class="tab-content">
-                {% for categ in categories %}
-                <noscript><label>{{ _(categ) }}</label>
-                </noscript>
-                <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
-                    <div class="container-fluid">
-                    <fieldset>
-                    {% for search_engine in engines_by_category[categ] %}
-                        {% if not search_engine.private %}
-                            <div class="row">
-                                {% if not rtl %}
-                                <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
-                                {% endif %}
-                                <div class="col-xs-6 col-sm-4 col-md-4">
-                                    {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in blocked_engines) }}
-                                </div>
-                                {% if rtl %}
-                                <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</div>
-                                {% endif %}
-                            </div>
+        <!-- Tab panes -->
+        <noscript>
+            <h3>{{ _('General') }}</h3>
+        </noscript>
+        <div class="tab-content">
+            <div class="tab-pane active" id="tab_general">
+                <fieldset>
+                <div class="container-fluid">
+                    <div class="row form-group">
+                        {% if rtl %}
+                        <div class="col-sm-11 col-md-10">
+                            {% include 'oscar/categories.html' %}
+                        </div>
+                        <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                        {% else %}
+                        <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                        <div class="col-sm-11 col-md-10">
+                            {% include 'oscar/categories.html' %}
+                        </div>
                         {% endif %}
-                    {% endfor %}
-                    </fieldset>
                     </div>
+                    {% set language_label = _('Search language') %}
+                    {% set language_info = _('What language do you prefer for search?') %}
+                    {{ preferences_item_header(language_info, language_label, rtl) }}
+                        <select class="form-control" name='language'>
+                            <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
+                            {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %}
+                            <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
+                            {% endfor %}
+                        </select>
+                    {{ preferences_item_footer(language_info, language_label, rtl) }}
+
+                    {% set locale_label = _('Interface language') %}
+                    {% set locale_info = _('Change the language of the layout') %}
+                    {{ preferences_item_header(locale_info, locale_label, rtl) }}
+                        <select class="form-control" name='locale'>
+                            {% for locale_id,locale_name in locales.items() | sort %}
+                            <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
+                            {% endfor %}
+                        </select>
+                    {{ preferences_item_footer(locale_info, locale_label, rtl) }}
+
+                    {% set autocomplete_label = _('Autocomplete') %}
+                    {% set autocomplete_info = _('Find stuff as you type') %}
+                    {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }}
+                        <select class="form-control" name="autocomplete">
+                            <option value=""> - </option>
+                            {% for backend in autocomplete_backends %}
+                            <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
+                            {% endfor %}
+                        </select>
+                    {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }}
+
+                    {% set image_proxy_label = _('Image proxy') %}
+                    {% set image_proxy_info = _('Proxying image results through searx') %}
+                    {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }}
+                        <select class="form-control" name='image_proxy'>
+                            <option value="1" {% if image_proxy  %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
+                            <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
+                        </select>
+                    {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }}
+
+                    {% set method_label = _('Method') %}
+                    {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %}
+                    {{ preferences_item_header(method_info, method_label, rtl) }}
+                        <select class="form-control" name='method'>
+                            <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
+                            <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
+                        </select>
+                    {{ preferences_item_footer(method_info, method_label, rtl) }}
+
+                    {% set safesearch_label = _('SafeSearch') %}
+                    {% set safesearch_info = _('Filter content') %}
+                    {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }}
+                        <select class="form-control" name='safesearch'>
+                            <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
+                            <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
+                            <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
+                        </select>
+                    {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }}
+
+                    {% set theme_label = _('Themes') %}
+                    {% set theme_info = _('Change searx layout') %}
+                    {{ preferences_item_header(theme_info, theme_label, rtl) }}
+                        <select class="form-control" name="theme">
+                            {% for name in themes %}
+                            <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
+                            {% endfor %}
+                        </select>
+                    {{ preferences_item_footer(theme_info, theme_label, rtl) }}
                 </div>
-                {% endfor %}
+                </fieldset>
             </div>
-        </div>
-        <div class="tab-pane active_if_nojs" id="tab_plugins">
-            <noscript>
-                <h3>{{ _('Plugins') }}</h3>
-            </noscript>
-            <fieldset>
-            <div class="container-fluid">
-                {% for plugin in plugins %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">{{ plugin.name }}</h3>
-                    </div>
-                    <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">
-                            {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}
+            <div class="tab-pane active_if_nojs" id="tab_engine">
+
+                <!-- Nav tabs -->
+                <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;">
+                    {% for categ in categories %}
+                    <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
+                    {% endfor %}
+                </ul>
+
+                <noscript>
+                    <h3>{{ _('Engines') }}</h3>
+                </noscript>
+
+                <!-- Tab panes -->
+                <div class="tab-content">
+                    {% for categ in categories %}
+                    <noscript><label>{{ _(categ) }}</label>
+                    </noscript>
+                    <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
+                        <div class="container-fluid">
+                        <fieldset>
+                        {% for search_engine in engines_by_category[categ] %}
+                            {% if not search_engine.private %}
+                                <div class="row">
+                                    {% if not rtl %}
+                                    <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
+                                    {% endif %}
+                                    <div class="col-xs-6 col-sm-4 col-md-4">
+                                        {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in blocked_engines) }}
+                                    </div>
+                                    {% if rtl %}
+                                    <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</div>
+                                    {% endif %}
+                                </div>
+                            {% endif %}
+                        {% endfor %}
+                        </fieldset>
                         </div>
                     </div>
+                    {% endfor %}
                 </div>
-                {% endfor %}
             </div>
-            </fieldset>
+            <div class="tab-pane active_if_nojs" id="tab_plugins">
+                <noscript>
+                    <h3>{{ _('Plugins') }}</h3>
+                </noscript>
+                <fieldset>
+                <div class="container-fluid">
+                    {% for plugin in plugins %}
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <h3 class="panel-title">{{ plugin.name }}</h3>
+                        </div>
+                        <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">
+                                {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}
+                            </div>
+                        </div>
+                    </div>
+                    {% endfor %}
+                </div>
+                </fieldset>
+            </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.') }}
-    <br />
-    {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
-    </p>
+        <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 />
+        {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
+        </p>
 
-    <input type="submit" class="btn btn-primary" value="{{ _('save') }}" />
-	<a href="{{ url_for('index') }}"><div class="btn btn-default">{{ _('back') }}</div></a>
-	<a href="{{ url_for('clear_cookies') }}"><div class="btn btn-default">{{ _('Reset defaults') }}</div></a>
+        <input type="submit" class="btn btn-primary" value="{{ _('save') }}" />
+        <a href="{{ url_for('index') }}"><div class="btn btn-default">{{ _('back') }}</div></a>
+        <a href="{{ url_for('clear_cookies') }}"><div class="btn btn-default">{{ _('Reset defaults') }}</div></a>
     </form>
 </div>
 {% endblock %}