diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-01-27 09:34:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 09:34:32 +0100 |
commit | 6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch) | |
tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /src/Wallabag/UserBundle/Resources/views/Manage | |
parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
parent | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff) | |
download | wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip |
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'src/Wallabag/UserBundle/Resources/views/Manage')
-rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig | 8 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig index 67843f20..3ffd15f5 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig | |||
@@ -47,14 +47,6 @@ | |||
47 | </div> | 47 | </div> |
48 | </div> | 48 | </div> |
49 | 49 | ||
50 | <div class="row"> | ||
51 | <div class="input-field col s12"> | ||
52 | {{ form_widget(edit_form.locked) }} | ||
53 | {{ form_label(edit_form.locked) }} | ||
54 | {{ form_errors(edit_form.locked) }} | ||
55 | </div> | ||
56 | </div> | ||
57 | |||
58 | {% if twofactor_auth %} | 50 | {% if twofactor_auth %} |
59 | <div class="row"> | 51 | <div class="row"> |
60 | <div class="input-field col s12"> | 52 | <div class="input-field col s12"> |
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig index 996bdb1a..daba29e4 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | |||
@@ -17,7 +17,6 @@ | |||
17 | <th>{{ 'user.form.username_label'|trans }}</th> | 17 | <th>{{ 'user.form.username_label'|trans }}</th> |
18 | <th>{{ 'user.form.email_label'|trans }}</th> | 18 | <th>{{ 'user.form.email_label'|trans }}</th> |
19 | <th>{{ 'user.form.last_login_label'|trans }}</th> | 19 | <th>{{ 'user.form.last_login_label'|trans }}</th> |
20 | <th>{{ 'user.form.locked_label'|trans }}</th> | ||
21 | <th>{{ 'user.list.actions'|trans }}</th> | 20 | <th>{{ 'user.list.actions'|trans }}</th> |
22 | </tr> | 21 | </tr> |
23 | </thead> | 22 | </thead> |
@@ -27,7 +26,6 @@ | |||
27 | <td>{{ user.username }}</td> | 26 | <td>{{ user.username }}</td> |
28 | <td>{{ user.email }}</td> | 27 | <td>{{ user.email }}</td> |
29 | <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td> | 28 | <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td> |
30 | <td>{% if user.locked %}{{ 'user.list.yes'|trans }}{% else %}{{ 'user.list.no'|trans }}{% endif %}</td> | ||
31 | <td> | 29 | <td> |
32 | <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a> | 30 | <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a> |
33 | </td> | 31 | </td> |