aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-11-19 15:30:49 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-11-19 15:30:49 +0100
commit68003139e133835805b143b62c4407f19b495dab (patch)
tree9a71a15d021330fb6d55cc338f125161ddfc61dd /src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
parentbbd4ae7b56d9db744482a5630abad350f2d819af (diff)
parentcb1a6590c0e58c56d0612066501b3a586b103ed5 (diff)
downloadwallabag-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/material/Config/index.html.twig')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig48
1 files changed, 42 insertions, 6 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index e774795b..5d411fdd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -24,23 +24,33 @@
24 {{ form_errors(form.config) }} 24 {{ form_errors(form.config) }}
25 25
26 <div class="row"> 26 <div class="row">
27 <div class="input-field col s12"> 27 <div class="input-field col s11">
28 {{ form_label(form.config.theme) }} 28 {{ form_label(form.config.theme) }}
29 {{ form_errors(form.config.theme) }} 29 {{ form_errors(form.config.theme) }}
30 {{ form_widget(form.config.theme) }} 30 {{ form_widget(form.config.theme) }}
31 </div> 31 </div>
32 <div class="input-field col s1">
33 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}">
34 <i class="material-icons">live_help</i>
35 </a>
36 </div>
32 </div> 37 </div>
33 38
34 <div class="row"> 39 <div class="row">
35 <div class="input-field col s12"> 40 <div class="input-field col s11">
36 {{ form_label(form.config.items_per_page) }} 41 {{ form_label(form.config.items_per_page) }}
37 {{ form_errors(form.config.items_per_page) }} 42 {{ form_errors(form.config.items_per_page) }}
38 {{ form_widget(form.config.items_per_page) }} 43 {{ form_widget(form.config.items_per_page) }}
39 </div> 44 </div>
45 <div class="input-field col s1">
46 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}">
47 <i class="material-icons">live_help</i>
48 </a>
49 </div>
40 </div> 50 </div>
41 51
42 <div class="row"> 52 <div class="row">
43 <div class="input-field col s12"> 53 <div class="input-field col s11">
44 {{ form_label(form.config.reading_speed) }} 54 {{ form_label(form.config.reading_speed) }}
45 {{ form_errors(form.config.reading_speed) }} 55 {{ form_errors(form.config.reading_speed) }}
46 {{ form_widget(form.config.reading_speed) }} 56 {{ form_widget(form.config.reading_speed) }}
@@ -49,6 +59,11 @@
49 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> 59 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
50 </p> 60 </p>
51 </div> 61 </div>
62 <div class="input-field col s1">
63 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_reading_speed'|trans }}">
64 <i class="material-icons">live_help</i>
65 </a>
66 </div>
52 </div> 67 </div>
53 68
54 <div class="row"> 69 <div class="row">
@@ -60,15 +75,20 @@
60 </div> 75 </div>
61 76
62 <div class="row"> 77 <div class="row">
63 <div class="input-field col s12"> 78 <div class="input-field col s11">
64 {{ form_label(form.config.language) }} 79 {{ form_label(form.config.language) }}
65 {{ form_errors(form.config.language) }} 80 {{ form_errors(form.config.language) }}
66 {{ form_widget(form.config.language) }} 81 {{ form_widget(form.config.language) }}
67 </div> 82 </div>
83 <div class="input-field col s1">
84 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}">
85 <i class="material-icons">live_help</i>
86 </a>
87 </div>
68 </div> 88 </div>
69 89
70 <div class="row"> 90 <div class="row">
71 <div class="input-field col s12"> 91 <div class="input-field col s11">
72 {{ form_label(form.config.pocket_consumer_key) }} 92 {{ form_label(form.config.pocket_consumer_key) }}
73 {{ form_errors(form.config.pocket_consumer_key) }} 93 {{ form_errors(form.config.pocket_consumer_key) }}
74 {{ form_widget(form.config.pocket_consumer_key) }} 94 {{ form_widget(form.config.pocket_consumer_key) }}
@@ -77,6 +97,11 @@
77 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> 97 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
78 </p> 98 </p>
79 </div> 99 </div>
100 <div class="input-field col s1">
101 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}">
102 <i class="material-icons">live_help</i>
103 </a>
104 </div>
80 </div> 105 </div>
81 106
82 <div class="row"> 107 <div class="row">
@@ -172,7 +197,7 @@
172 197
173 {% if twofactor_auth %} 198 {% if twofactor_auth %}
174 <div class="row"> 199 <div class="row">
175 <div class="input-field col s12"> 200 <div class="input-field col s11">
176 {{ 'config.form_user.two_factor_description'|trans }} 201 {{ 'config.form_user.two_factor_description'|trans }}
177 202
178 <br /> 203 <br />
@@ -181,6 +206,11 @@
181 {{ form_label(form.user.twoFactorAuthentication) }} 206 {{ form_label(form.user.twoFactorAuthentication) }}
182 {{ form_errors(form.user.twoFactorAuthentication) }} 207 {{ form_errors(form.user.twoFactorAuthentication) }}
183 </div> 208 </div>
209 <div class="input-field col s1">
210 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
211 <i class="material-icons">live_help</i>
212 </a>
213 </div>
184 </div> 214 </div>
185 {% endif %} 215 {% endif %}
186 216
@@ -221,6 +251,12 @@
221 {{ form_start(form.pwd) }} 251 {{ form_start(form.pwd) }}
222 {{ form_errors(form.pwd) }} 252 {{ form_errors(form.pwd) }}
223 253
254 <div class="row">
255 <div class="input-field col s12">
256 {{ 'config.form_password.description'|trans }}
257 </div>
258 </div>
259
224 <div class="row"> 260 <div class="row">
225 <div class="input-field col s12"> 261 <div class="input-field col s12">
226 {{ form_label(form.pwd.old_password) }} 262 {{ form_label(form.pwd.old_password) }}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 06:46:46 +0000