Merge branch 'master' into language_aliases_fix

searx/plugins/open_results_on_new_tab.py

@@ -20,5 +20,6 @@
                       'This plugin overwrites the default behaviour to open links on new tabs/windows. '
                       '(JavaScript required)')
 default_on = False
+preference_section = 'ui'
 
 js_dependencies = ('plugins/js/open_results_on_new_tab.js',)

searx/plugins/vim_hotkeys.py

@@ -5,6 +5,7 @@
                       '(JavaScript required). '
                       'Press "h" key on main or result page to get help.')
 default_on = False
+preference_section = 'ui'
 
 js_dependencies = ('plugins/js/vim_hotkeys.js',)
 css_dependencies = ('plugins/css/vim_hotkeys.css',)

searx/templates/simple/preferences.html

@@ -68,7 +68,7 @@ <h2>{{ _('Preferences') }}</h2>
         <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
       </select>
     </p>
-    <div class="description">{{ _('Filter content') }}</p>
+    <p class="description">{{ _('Filter content') }}</p>
   </fieldset>
   {{ plugin_preferences('general') }}
   <fieldset>
@@ -122,7 +122,7 @@ <h2>{{ _('Preferences') }}</h2>
       {% endif %}
       {% endfor %}
     </table>
-    <div>
+    </div>
     {{ tab_footer() }}
     {% endfor %}
     {{ tabs_close() }}
@@ -171,7 +171,7 @@ <h2>{{ _('Preferences') }}</h2>
         {{ _('With that list, you can assess searx transparency.') }}<br />
      </p>
 
-     {% if cookies %}     
+     {% if cookies %}
      <table class="cookies">
        <tr>
           <th>{{ _('Cookie name') }}</th>
@@ -186,14 +186,14 @@ <h2>{{ _('Preferences') }}</h2>
      </table>
      {% else %}
         {% include 'oscar/messages/no_cookies.html' %}
-     {% endif %}     
+     {% endif %}
 
      <h4>{{ _('Search URL of the currently saved preferences') }} :</h4>
      <div class="selectable_url">
        <pre>{{ url_for('index', _external=True) }}?preferences={{ preferences_url_params|e }}{% raw %}&amp;q=%s{% endraw %}</pre>
      </div>
      <p class="small_font">{{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }}</p>
-     
+
   {{ tab_footer() }}
 
   {{ tab_header('maintab', 'privacy', _('Privacy')) }}
@@ -218,15 +218,15 @@ <h4>{{ _('Search URL of the currently saved preferences') }} :</h4>
     <div class="description">{{ _('Proxying image results through searx') }}</div>
   </fieldset>
   {{ plugin_preferences('privacy') }}
-  
+
   {{ tab_footer() }}
 
   {{ tabs_close() }}
 
   <p class="small_font">{{ _('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>
 
   <input type="submit" value="{{ _('save') }}" />
   <div class="{% if rtl %}left{% else %}right{% endif %} preferences_back"><a href="{{ url_for('clear_cookies') }}">{{ _('Reset defaults') }}</a></div>