Merge branch 'master' into language_aliases_fix

This commit is contained in:
Noémi Ványi 2019-01-07 20:33:31 +01:00 committed by GitHub
commit 1a850cf171
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions

View file

@ -20,5 +20,6 @@ description = gettext('Results are opened in the same window by default. '
'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',)

View file

@ -5,6 +5,7 @@ description = gettext('Navigate search results with Vim-like hotkeys '
'(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',)

View file

@ -68,7 +68,7 @@
<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 @@
{% endif %}
{% endfor %}
</table>
<div>
</div>
{{ tab_footer() }}
{% endfor %}
{{ tabs_close() }}