From 152fcccd4489378a8ed9391e3e191df4aeba6435 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 30 Sep 2016 20:09:06 +0200 Subject: Add users management UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) --- .../Resources/views/Manage/edit.html.twig | 86 ++++++++++++++++++++++ .../Resources/views/Manage/index.html.twig | 48 ++++++++++++ .../Resources/views/Manage/new.html.twig | 61 +++++++++++++++ .../UserBundle/Resources/views/manage.html.twig | 43 +++++++++++ 4 files changed, 238 insertions(+) create mode 100644 src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/manage.html.twig (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig new file mode 100644 index 00000000..5292ba78 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig @@ -0,0 +1,86 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'user.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'user.edit_user'|trans }}

+ +
+ {{ form_start(edit_form) }} + {{ form_errors(edit_form) }} + +
+
+ {{ form_label(edit_form.name) }} + {{ form_errors(edit_form.name) }} + {{ form_widget(edit_form.name) }} +
+
+ +
+
+ {{ form_label(edit_form.username) }} + {{ form_errors(edit_form.username) }} + {{ form_widget(edit_form.username) }} +
+
+ +
+
+ {{ form_label(edit_form.email) }} + {{ form_errors(edit_form.email) }} + {{ form_widget(edit_form.email) }} +
+
+ +
+
+ {{ form_widget(edit_form.enabled) }} + {{ form_label(edit_form.enabled) }} + {{ form_errors(edit_form.enabled) }} +
+
+ +
+
+ {{ form_widget(edit_form.locked) }} + {{ form_label(edit_form.locked) }} + {{ form_errors(edit_form.locked) }} +
+
+ + {% if twofactor_auth %} +
+
+ {{ form_widget(edit_form.twoFactorAuthentication) }} + {{ form_label(edit_form.twoFactorAuthentication) }} + {{ form_errors(edit_form.twoFactorAuthentication) }} +
+
+ {% endif %} + +
+ + {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(edit_form) }} + +

+ {{ form_start(delete_form) }} + + {{ form_end(delete_form) }} +

+

{{ 'user.form.back_to_list'|trans }}

+
+
+
+
+
+
+ +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig new file mode 100644 index 00000000..996bdb1a --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig @@ -0,0 +1,48 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'user.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'user.description'|trans|raw }}

+ + + + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} + +
{{ 'user.form.username_label'|trans }}{{ 'user.form.email_label'|trans }}{{ 'user.form.last_login_label'|trans }}{{ 'user.form.locked_label'|trans }}{{ 'user.list.actions'|trans }}
{{ user.username }}{{ user.email }}{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}{% if user.locked %}{{ 'user.list.yes'|trans }}{% else %}{{ 'user.list.no'|trans }}{% endif %} + {{ 'user.list.edit_action'|trans }} +
+
+

+ {{ 'user.list.create_new_one'|trans }} +

+
+
+
+
+
+ +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig new file mode 100644 index 00000000..8c894c04 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig @@ -0,0 +1,61 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'user.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'user.new_user'|trans }}

+ +
+ {{ form_start(form) }} + {{ form_errors(form) }} + +
+
+ {{ form_label(form.username) }} + {{ form_errors(form.username) }} + {{ form_widget(form.username) }} +
+
+ +
+
+ {{ form_label(form.plainPassword.first) }} + {{ form_errors(form.plainPassword.first) }} + {{ form_widget(form.plainPassword.first) }} +
+
+ +
+
+ {{ form_label(form.plainPassword.second) }} + {{ form_errors(form.plainPassword.second) }} + {{ form_widget(form.plainPassword.second) }} +
+
+ +
+
+ {{ form_label(form.email) }} + {{ form_errors(form.email) }} + {{ form_widget(form.email) }} +
+
+ + {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form) }} + +

{{ 'user.form.back_to_list'|trans }}

+
+
+
+
+
+
+ +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/manage.html.twig b/src/Wallabag/UserBundle/Resources/views/manage.html.twig new file mode 100644 index 00000000..c614c55f --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/manage.html.twig @@ -0,0 +1,43 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'user.manage.page_title'|trans }}{% endblock %} + +{% block content %} + +
+
+
+
+
+

{{ 'user.manage.description'|trans|raw }}

+ + + + + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} + +
{{ 'user.manage.field.username'|trans }}{{ 'user.manage.field.email'|trans }}{{ 'user.manage.field.last_login'|trans }}{{ 'user.manage.field.locked'|trans }}{{ 'user.manage.action'|trans }}
{{ user.username }}{{ user.email }}{{ user.lastLogin|date('d/m/Y H:i:s') }}{{ user.locked ? 'yes' : 'no' }}edit - delete
+
+
+
+
+
+ +{% endblock %} -- cgit v1.2.3 From ccc7faec094387681a59faa5ca79a86e33f06972 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 2 Oct 2016 13:21:45 +0200 Subject: Disabled delete button for the logged user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To avoid some bad things to happen… --- src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig index 5292ba78..d5cf99c3 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig @@ -72,7 +72,7 @@

{{ form_start(delete_form) }} - + {{ form_end(delete_form) }}

{{ 'user.form.back_to_list'|trans }}

-- cgit v1.2.3