diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 4 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | 48 |
2 files changed, 46 insertions, 6 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 ff7ef73a..56fd8e0c 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 | |||
@@ -155,6 +155,10 @@ | |||
155 | {{ form_start(form.pwd) }} | 155 | {{ form_start(form.pwd) }} |
156 | {{ form_errors(form.pwd) }} | 156 | {{ form_errors(form.pwd) }} |
157 | 157 | ||
158 | <div class="row"> | ||
159 | {{ 'config.form_password.description'|trans }} | ||
160 | </div> | ||
161 | |||
158 | <fieldset class="w500p inline"> | 162 | <fieldset class="w500p inline"> |
159 | <div class="row"> | 163 | <div class="row"> |
160 | {{ form_label(form.pwd.old_password) }} | 164 | {{ form_label(form.pwd.old_password) }} |
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 19faddc0..9f67217b 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,18 +59,28 @@ | |||
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"> |
55 | <div class="input-field col s12"> | 70 | <div class="input-field col s11"> |
56 | {{ form_label(form.config.language) }} | 71 | {{ form_label(form.config.language) }} |
57 | {{ form_errors(form.config.language) }} | 72 | {{ form_errors(form.config.language) }} |
58 | {{ form_widget(form.config.language) }} | 73 | {{ form_widget(form.config.language) }} |
59 | </div> | 74 | </div> |
75 | <div class="input-field col s1"> | ||
76 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}"> | ||
77 | <i class="material-icons">live_help</i> | ||
78 | </a> | ||
79 | </div> | ||
60 | </div> | 80 | </div> |
61 | 81 | ||
62 | <div class="row"> | 82 | <div class="row"> |
63 | <div class="input-field col s12"> | 83 | <div class="input-field col s11"> |
64 | {{ form_label(form.config.pocket_consumer_key) }} | 84 | {{ form_label(form.config.pocket_consumer_key) }} |
65 | {{ form_errors(form.config.pocket_consumer_key) }} | 85 | {{ form_errors(form.config.pocket_consumer_key) }} |
66 | {{ form_widget(form.config.pocket_consumer_key) }} | 86 | {{ form_widget(form.config.pocket_consumer_key) }} |
@@ -69,6 +89,11 @@ | |||
69 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | 89 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> |
70 | </p> | 90 | </p> |
71 | </div> | 91 | </div> |
92 | <div class="input-field col s1"> | ||
93 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}"> | ||
94 | <i class="material-icons">live_help</i> | ||
95 | </a> | ||
96 | </div> | ||
72 | </div> | 97 | </div> |
73 | 98 | ||
74 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 99 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
@@ -152,7 +177,7 @@ | |||
152 | 177 | ||
153 | {% if twofactor_auth %} | 178 | {% if twofactor_auth %} |
154 | <div class="row"> | 179 | <div class="row"> |
155 | <div class="input-field col s12"> | 180 | <div class="input-field col s11"> |
156 | {{ 'config.form_user.two_factor_description'|trans }} | 181 | {{ 'config.form_user.two_factor_description'|trans }} |
157 | 182 | ||
158 | <br /> | 183 | <br /> |
@@ -161,6 +186,11 @@ | |||
161 | {{ form_label(form.user.twoFactorAuthentication) }} | 186 | {{ form_label(form.user.twoFactorAuthentication) }} |
162 | {{ form_errors(form.user.twoFactorAuthentication) }} | 187 | {{ form_errors(form.user.twoFactorAuthentication) }} |
163 | </div> | 188 | </div> |
189 | <div class="input-field col s1"> | ||
190 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}"> | ||
191 | <i class="material-icons">live_help</i> | ||
192 | </a> | ||
193 | </div> | ||
164 | </div> | 194 | </div> |
165 | {% endif %} | 195 | {% endif %} |
166 | 196 | ||
@@ -173,6 +203,12 @@ | |||
173 | {{ form_start(form.pwd) }} | 203 | {{ form_start(form.pwd) }} |
174 | {{ form_errors(form.pwd) }} | 204 | {{ form_errors(form.pwd) }} |
175 | 205 | ||
206 | <div class="row"> | ||
207 | <div class="input-field col s12"> | ||
208 | {{ 'config.form_password.description'|trans }} | ||
209 | </div> | ||
210 | </div> | ||
211 | |||
176 | <div class="row"> | 212 | <div class="row"> |
177 | <div class="input-field col s12"> | 213 | <div class="input-field col s12"> |
178 | {{ form_label(form.pwd.old_password) }} | 214 | {{ form_label(form.pwd.old_password) }} |