diff options
author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
---|---|---|
committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /src/Wallabag/CoreBundle/Resources/views/themes/material/Config | |
parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | 81 |
1 files changed, 25 insertions, 56 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 afd5b499..19faddc0 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 | |||
@@ -11,14 +11,11 @@ | |||
11 | <div class="row"> | 11 | <div class="row"> |
12 | <div class="div_tabs col s12"> | 12 | <div class="div_tabs col s12"> |
13 | <ul class="tabs"> | 13 | <ul class="tabs"> |
14 | <li class="tab col s3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li> | 14 | <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li> |
15 | <li class="tab col s3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li> | 15 | <li class="tab col s12 m6 l3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li> |
16 | <li class="tab col s3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> | 16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> |
17 | <li class="tab col s3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> | 17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> |
18 | <li class="tab col s3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> | 18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> |
19 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
20 | <li class="tab col s3"><a href="#set6">{{ 'config.tab_menu.new_user'|trans }}</a></li> | ||
21 | {% endif %} | ||
22 | </ul> | 19 | </ul> |
23 | </div> | 20 | </div> |
24 | 21 | ||
@@ -62,6 +59,18 @@ | |||
62 | </div> | 59 | </div> |
63 | </div> | 60 | </div> |
64 | 61 | ||
62 | <div class="row"> | ||
63 | <div class="input-field col s12"> | ||
64 | {{ form_label(form.config.pocket_consumer_key) }} | ||
65 | {{ form_errors(form.config.pocket_consumer_key) }} | ||
66 | {{ form_widget(form.config.pocket_consumer_key) }} | ||
67 | <p> | ||
68 | » | ||
69 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | ||
70 | </p> | ||
71 | </div> | ||
72 | </div> | ||
73 | |||
65 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 74 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
66 | {{ form_rest(form.config) }} | 75 | {{ form_rest(form.config) }} |
67 | </form> | 76 | </form> |
@@ -145,11 +154,9 @@ | |||
145 | <div class="row"> | 154 | <div class="row"> |
146 | <div class="input-field col s12"> | 155 | <div class="input-field col s12"> |
147 | {{ 'config.form_user.two_factor_description'|trans }} | 156 | {{ 'config.form_user.two_factor_description'|trans }} |
148 | </div> | ||
149 | </div> | ||
150 | 157 | ||
151 | <div class="row"> | 158 | <br /> |
152 | <div class="input-field col s12"> | 159 | |
153 | {{ form_widget(form.user.twoFactorAuthentication) }} | 160 | {{ form_widget(form.user.twoFactorAuthentication) }} |
154 | {{ form_label(form.user.twoFactorAuthentication) }} | 161 | {{ form_label(form.user.twoFactorAuthentication) }} |
155 | {{ form_errors(form.user.twoFactorAuthentication) }} | 162 | {{ form_errors(form.user.twoFactorAuthentication) }} |
@@ -196,6 +203,7 @@ | |||
196 | </div> | 203 | </div> |
197 | 204 | ||
198 | <div id="set5" class="col s12"> | 205 | <div id="set5" class="col s12"> |
206 | {% if app.user.config.taggingRules is not empty %} | ||
199 | <div class="row"> | 207 | <div class="row"> |
200 | <div class="input-field col s12"> | 208 | <div class="input-field col s12"> |
201 | <ul> | 209 | <ul> |
@@ -205,14 +213,18 @@ | |||
205 | « {{ tagging_rule.rule }} » | 213 | « {{ tagging_rule.rule }} » |
206 | {{ 'config.form_rules.then_tag_as_label'|trans }} | 214 | {{ 'config.form_rules.then_tag_as_label'|trans }} |
207 | « {{ tagging_rule.tags|join(', ') }} » | 215 | « {{ tagging_rule.tags|join(', ') }} » |
216 | <a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}"> | ||
217 | <i class="tool grey-text mode_edit material-icons">mode_edit</i> | ||
218 | </a> | ||
208 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}"> | 219 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}"> |
209 | <i class="tool grey-text delete mdi-action-delete"></i> | 220 | <i class="tool grey-text delete material-icons">delete</i> |
210 | </a> | 221 | </a> |
211 | </li> | 222 | </li> |
212 | {% endfor %} | 223 | {% endfor %} |
213 | </ul> | 224 | </ul> |
214 | </div> | 225 | </div> |
215 | </div> | 226 | </div> |
227 | {% endif %} | ||
216 | 228 | ||
217 | {{ form_start(form.new_tagging_rule) }} | 229 | {{ form_start(form.new_tagging_rule) }} |
218 | {{ form_errors(form.new_tagging_rule) }} | 230 | {{ form_errors(form.new_tagging_rule) }} |
@@ -322,49 +334,6 @@ | |||
322 | </div> | 334 | </div> |
323 | </div> | 335 | </div> |
324 | </div> | 336 | </div> |
325 | |||
326 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
327 | <div id="set6" class="col s12"> | ||
328 | {{ form_start(form.new_user) }} | ||
329 | {{ form_errors(form.new_user) }} | ||
330 | |||
331 | <div class="row"> | ||
332 | <div class="input-field col s12"> | ||
333 | {{ form_label(form.new_user.username) }} | ||
334 | {{ form_errors(form.new_user.username) }} | ||
335 | {{ form_widget(form.new_user.username) }} | ||
336 | </div> | ||
337 | </div> | ||
338 | |||
339 | <div class="row"> | ||
340 | <div class="input-field col s12"> | ||
341 | {{ form_label(form.new_user.plainPassword.first) }} | ||
342 | {{ form_errors(form.new_user.plainPassword.first) }} | ||
343 | {{ form_widget(form.new_user.plainPassword.first) }} | ||
344 | </div> | ||
345 | </div> | ||
346 | |||
347 | <div class="row"> | ||
348 | <div class="input-field col s12"> | ||
349 | {{ form_label(form.new_user.plainPassword.second) }} | ||
350 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
351 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
352 | </div> | ||
353 | </div> | ||
354 | |||
355 | <div class="row"> | ||
356 | <div class="input-field col s12"> | ||
357 | {{ form_label(form.new_user.email) }} | ||
358 | {{ form_errors(form.new_user.email) }} | ||
359 | {{ form_widget(form.new_user.email) }} | ||
360 | </div> | ||
361 | </div> | ||
362 | |||
363 | {{ form_widget(form.new_user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
364 | {{ form_rest(form.new_user) }} | ||
365 | </form> | ||
366 | </div> | ||
367 | {% endif %} | ||
368 | </div> | 337 | </div> |
369 | 338 | ||
370 | </div> | 339 | </div> |