pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added help on config screen

Browse Source
This commit is contained in:
Nicolas Lœuillet
2016-11-12 13:18:39 +01:00
parent d213219ec7
commit 540a9bc4a2
33 changed files with 164 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
View File

@ -155,6 +155,10 @@
{{ form_start(form.pwd) }}
{{ form_errors(form.pwd) }}
<div class="row">
{{ 'config.form_password.description'|trans }}
</div>
<fieldset class="w500p inline">
<div class="row">
{{ form_label(form.pwd.old_password) }}

72
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
View File

@ -24,23 +24,33 @@
{{ form_errors(form.config) }}
<div class="row">
<div class="input-field col s12">
<div class="input-field col s11">
{{ form_label(form.config.theme) }}
{{ form_errors(form.config.theme) }}
{{ form_widget(form.config.theme) }}
</div>
</div>
<div class="row">
<div class="input-field col s12">
{{ form_label(form.config.items_per_page) }}
{{ form_errors(form.config.items_per_page) }}
{{ form_widget(form.config.items_per_page) }}
<div class="input-field col s1">
<a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}">
<i class="material-icons">live_help</i>
</a>
</div>
</div>
<div class="row">
<div class="input-field col s12">
<div class="input-field col s11">
{{ form_label(form.config.items_per_page) }}
{{ form_errors(form.config.items_per_page) }}
{{ form_widget(form.config.items_per_page) }}
</div>
<div class="input-field col s1">
<a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}">
<i class="material-icons">live_help</i>
</a>
</div>
</div>
<div class="row">
<div class="input-field col s11">
{{ form_label(form.config.reading_speed) }}
{{ form_errors(form.config.reading_speed) }}
{{ form_widget(form.config.reading_speed) }}
@ -49,18 +59,28 @@
<a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
</p>
</div>
</div>
<div class="row">
<div class="input-field col s12">
{{ form_label(form.config.language) }}
{{ form_errors(form.config.language) }}
{{ form_widget(form.config.language) }}
<div class="input-field col s1">
<a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_reading_speed'|trans }}">
<i class="material-icons">live_help</i>
</a>
</div>
</div>
<div class="row">
<div class="input-field col s12">
<div class="input-field col s11">
{{ form_label(form.config.language) }}
{{ form_errors(form.config.language) }}
{{ form_widget(form.config.language) }}
</div>
<div class="input-field col s1">
<a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}">
<i class="material-icons">live_help</i>
</a>
</div>
</div>
<div class="row">
<div class="input-field col s11">
{{ form_label(form.config.pocket_consumer_key) }}
{{ form_errors(form.config.pocket_consumer_key) }}
{{ form_widget(form.config.pocket_consumer_key) }}
@ -69,6 +89,11 @@
<a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
</p>
</div>
<div class="input-field col s1">
<a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}">
<i class="material-icons">live_help</i>
</a>
</div>
</div>
{{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
@ -152,7 +177,7 @@
{% if twofactor_auth %}
<div class="row">
<div class="input-field col s12">
<div class="input-field col s11">
{{ 'config.form_user.two_factor_description'|trans }}
<br />
@ -161,6 +186,11 @@
{{ form_label(form.user.twoFactorAuthentication) }}
{{ form_errors(form.user.twoFactorAuthentication) }}
</div>
<div class="input-field col s1">
<a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
<i class="material-icons">live_help</i>
</a>
</div>
</div>
{% endif %}
@ -173,6 +203,12 @@
{{ form_start(form.pwd) }}
{{ form_errors(form.pwd) }}
<div class="row">
<div class="input-field col s12">
{{ 'config.form_password.description'|trans }}
</div>
</div>
<div class="row">
<div class="input-field col s12">
{{ form_label(form.pwd.old_password) }}