diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |
parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 4c01b128..3548f590 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -14,6 +14,9 @@ | |||
14 | {{ form_errors(form.config.theme) }} | 14 | {{ form_errors(form.config.theme) }} |
15 | {{ form_widget(form.config.theme) }} | 15 | {{ form_widget(form.config.theme) }} |
16 | </div> | 16 | </div> |
17 | <a href="#" title="{{ 'config.form_settings.help_theme'|trans }}"> | ||
18 | <i class="material-icons">live_help</i> | ||
19 | </a> | ||
17 | </fieldset> | 20 | </fieldset> |
18 | 21 | ||
19 | <fieldset class="w500p inline"> | 22 | <fieldset class="w500p inline"> |
@@ -22,6 +25,9 @@ | |||
22 | {{ form_errors(form.config.items_per_page) }} | 25 | {{ form_errors(form.config.items_per_page) }} |
23 | {{ form_widget(form.config.items_per_page) }} | 26 | {{ form_widget(form.config.items_per_page) }} |
24 | </div> | 27 | </div> |
28 | <a href="#" title="{{ 'config.form_settings.help_items_per_page'|trans }}"> | ||
29 | <i class="material-icons">live_help</i> | ||
30 | </a> | ||
25 | </fieldset> | 31 | </fieldset> |
26 | 32 | ||
27 | <fieldset class="w500p inline"> | 33 | <fieldset class="w500p inline"> |
@@ -34,6 +40,9 @@ | |||
34 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> | 40 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> |
35 | </p> | 41 | </p> |
36 | </div> | 42 | </div> |
43 | <a href="#" title="{{ 'config.form_settings.help_reading_speed'|trans }}"> | ||
44 | <i class="material-icons">live_help</i> | ||
45 | </a> | ||
37 | </fieldset> | 46 | </fieldset> |
38 | 47 | ||
39 | <fieldset class="w500p inline"> | 48 | <fieldset class="w500p inline"> |
@@ -50,6 +59,9 @@ | |||
50 | {{ form_errors(form.config.language) }} | 59 | {{ form_errors(form.config.language) }} |
51 | {{ form_widget(form.config.language) }} | 60 | {{ form_widget(form.config.language) }} |
52 | </div> | 61 | </div> |
62 | <a href="#" title="{{ 'config.form_settings.help_language'|trans }}"> | ||
63 | <i class="material-icons">live_help</i> | ||
64 | </a> | ||
53 | </fieldset> | 65 | </fieldset> |
54 | 66 | ||
55 | <fieldset class="w500p inline"> | 67 | <fieldset class="w500p inline"> |
@@ -62,10 +74,16 @@ | |||
62 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | 74 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> |
63 | </p> | 75 | </p> |
64 | </div> | 76 | </div> |
77 | <a href="#" title="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}"> | ||
78 | <i class="material-icons">live_help</i> | ||
79 | </a> | ||
80 | </fieldset> | ||
65 | 81 | ||
82 | <fieldset class="w500p inline"> | ||
66 | <div class="row"> | 83 | <div class="row"> |
67 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> | 84 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> |
68 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a> | 85 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a> |
86 | <br/> | ||
69 | <img id="androidQrcode" /> | 87 | <img id="androidQrcode" /> |
70 | <script> | 88 | <script> |
71 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); | 89 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); |
@@ -161,6 +179,9 @@ | |||
161 | {{ form_errors(form.user.twoFactorAuthentication) }} | 179 | {{ form_errors(form.user.twoFactorAuthentication) }} |
162 | {{ form_widget(form.user.twoFactorAuthentication) }} | 180 | {{ form_widget(form.user.twoFactorAuthentication) }} |
163 | </div> | 181 | </div> |
182 | <a href="#" title="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}"> | ||
183 | <i class="material-icons">live_help</i> | ||
184 | </a> | ||
164 | </fieldset> | 185 | </fieldset> |
165 | {% endif %} | 186 | {% endif %} |
166 | 187 | ||
@@ -204,6 +225,10 @@ | |||
204 | {{ form_start(form.pwd) }} | 225 | {{ form_start(form.pwd) }} |
205 | {{ form_errors(form.pwd) }} | 226 | {{ form_errors(form.pwd) }} |
206 | 227 | ||
228 | <div class="row"> | ||
229 | {{ 'config.form_password.description'|trans }} | ||
230 | </div> | ||
231 | |||
207 | <fieldset class="w500p inline"> | 232 | <fieldset class="w500p inline"> |
208 | <div class="row"> | 233 | <div class="row"> |
209 | {{ form_label(form.pwd.old_password) }} | 234 | {{ form_label(form.pwd.old_password) }} |