From 42f3a60817f99712e229db35551f51c44eccf0d1 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 2 Dec 2019 23:58:20 +0100 Subject: [PATCH 01/19] app/assets/sass/components/_badge.scss: adding contextual colors. --- app/assets/sass/components/_badge.scss | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/assets/sass/components/_badge.scss b/app/assets/sass/components/_badge.scss index 46107e7..2ef9993 100644 --- a/app/assets/sass/components/_badge.scss +++ b/app/assets/sass/components/_badge.scss @@ -11,8 +11,36 @@ display: none; } + // Contextual colors + // ---------------------------------- + + &-default { + color: white; + background-color: $gray; + } + &-primary { color: white; background-color: $brand-color; } + + &-info { + color: white; + background-color: $brand-info; + } + + &-success { + color: white; + background-color: $brand-success; + } + + &-warning { + color: black; + background-color: $brand-warning; + } + + &-danger { + color: white; + background-color: $brand-danger; + } } From 6a31e8599496deabe098e172fc1bc2edaf1406d8 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 3 Dec 2019 00:03:32 +0100 Subject: [PATCH 02/19] app/models/Data/User.php: adding isActive() method. --- app/models/Data/User.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/models/Data/User.php b/app/models/Data/User.php index 122ba68..1fe205c 100644 --- a/app/models/Data/User.php +++ b/app/models/Data/User.php @@ -255,6 +255,16 @@ class User extends Base return $this; } + /** + * Returns true if this is a active user. + * + * @return bool + */ + public function isActive() + { + return $this->status == self::STATUS_ACTIVE; + } + /** * @return mixed */ From 691632a31fbc4ac3270dcf919c7071a1afcb16ba Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 3 Dec 2019 00:20:47 +0100 Subject: [PATCH 03/19] app/config/routes.yml: adding backend-user-edit route --- app/config/routes.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/config/routes.yml b/app/config/routes.yml index 5510b37..d8c0974 100644 --- a/app/config/routes.yml +++ b/app/config/routes.yml @@ -64,6 +64,9 @@ router: backend-user-list: pattern: '/admin/user/list/{page:([0-9]+)}' path: backend::user::index + backend-user-edit: + pattern: '/admin/user/{id:([0-9]+)}' + path: backend::user::edit backend-log: pattern: '/admin/log{page:/?([0-9]+)?}' path: backend::log::index From adaf80d967fc40efb93afa0ab5e92877768284ba Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 3 Dec 2019 00:27:44 +0100 Subject: [PATCH 04/19] app/views/backend/user/index.volt: adding edit link --- app/views/backend/user/index.volt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/backend/user/index.volt b/app/views/backend/user/index.volt index 5ccaad4..35705ad 100644 --- a/app/views/backend/user/index.volt +++ b/app/views/backend/user/index.volt @@ -5,6 +5,7 @@ +   # Username Name @@ -17,6 +18,11 @@ {% for item in page.items %} + + + {{ icon('solid/pen') }} + + {{ item.id }} {{ item.username }} {{ item.name }} From e332e1a7e7a15c4e2a98ab8c7e79aab72e1981b2 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 3 Dec 2019 11:02:52 +0100 Subject: [PATCH 05/19] app/forms/UserSettings.php: adding a admin flag. --- app/forms/UserSettings.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/forms/UserSettings.php b/app/forms/UserSettings.php index c003f67..bd6d4d0 100644 --- a/app/forms/UserSettings.php +++ b/app/forms/UserSettings.php @@ -36,6 +36,18 @@ use Phalcon\Validation\Validator\Callback as CallbackValidator, class UserSettings extends FormBase { + /** + * @var bool + */ + protected $_admin; + + public function __construct(UserModel $user = null, bool $admin = false) + { + $this->_admin = $admin; + + parent::__construct($user); + } + public function initialize() { $this->setValidation(new \Phalcon\Validation()); @@ -118,7 +130,7 @@ class UserSettings extends FormBase $current_pw = $this->getEntity()->getPassword(); // Current - if (strlen($current_pw) > 0) { + if ($this->_admin === false && strlen($current_pw) > 0) { $current = new Password('passwordCurrent', array( 'class' => 'form-control', )); @@ -143,7 +155,7 @@ class UserSettings extends FormBase // Validation $validation = $this->getValidation(); - if (strlen($current_pw) > 0) { + if ($this->_admin === false && strlen($current_pw) > 0) { $validation->add('passwordCurrent', new CallbackValidator([ 'callback' => function($data) { $new_pw = $data['passwordNew']; From b1212f5310b576da31baa1434c43a6ce89021f9b Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 3 Dec 2019 11:04:23 +0100 Subject: [PATCH 06/19] app/controllers/backend/UserController.php: adding edit action. --- app/config/routes.yml | 6 +++ app/controllers/backend/UserController.php | 41 +++++++++++++- app/views/backend/user/edit.volt | 63 ++++++++++++++++++++++ app/views/backend/user/index.volt | 2 +- 4 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 app/views/backend/user/edit.volt diff --git a/app/config/routes.yml b/app/config/routes.yml index d8c0974..309bc79 100644 --- a/app/config/routes.yml +++ b/app/config/routes.yml @@ -67,6 +67,12 @@ router: backend-user-edit: pattern: '/admin/user/{id:([0-9]+)}' path: backend::user::edit + backend-user-status: + pattern: '/admin/user/{id:([0-9]+)}/{type}' + path: + module: backend + controller: user + action: status backend-log: pattern: '/admin/log{page:/?([0-9]+)?}' path: backend::log::index diff --git a/app/controllers/backend/UserController.php b/app/controllers/backend/UserController.php index bde79ac..4ebde4f 100644 --- a/app/controllers/backend/UserController.php +++ b/app/controllers/backend/UserController.php @@ -2,7 +2,8 @@ namespace App\Controller\Backend; -use App\Model\Data\User; +use App\Model\Data\User, + App\Form\UserSettings as UserSettingsForm; class UserController extends \Phalcon\Mvc\Controller { @@ -21,4 +22,42 @@ class UserController extends \Phalcon\Mvc\Controller $this->view->pagination_url = '/admin/user/list/'; $this->view->page = $paginator->getPaginate(); } + + public function editAction($id) + { + $user = User::findFirstById($id); + $form = new UserSettingsForm($user, true); + + if ($this->request->isPost()) { + $data = $this->request->getPost(); + + if ($form->isValid($data)) { + + $new_pw = $form->getValue('passwordNew'); + if (strlen($new_pw) > 0) { + $hash = $this->security->hash($new_pw, 12); + $user->setPassword($hash); + } + $user->save(); + $form->initialize(); + + $this->flash->message('success', 'User saved!'); + } else { + $this->flash->message('error', 'Could not save user'); + } + } + + $this->view->user = $user; + $this->view->form = $form; + } + + public function statusAction($id, $type) + { + $user = User::findFirstById($id); + $user->setStatus(ucfirst($type)); + $user->save(); + + $this->flash->success('The account was: ' . $user->getStatus()); + $this->response->redirect('/admin'); + } } diff --git a/app/views/backend/user/edit.volt b/app/views/backend/user/edit.volt new file mode 100644 index 0000000..7f34a01 --- /dev/null +++ b/app/views/backend/user/edit.volt @@ -0,0 +1,63 @@ + +{% if (user.isActive() === false) %} +
+
+

{{ user.getStatus() }}

+
+
+{% endif %} + +
+ +
+ {{ form.renderDecorated('username', [ 'length': 7 ]) }} + {{ form.renderDecorated('id', [ 'length': 2, 'label-length' : 1 ]) }} +
+ +
+ {{ form.renderDecorated('name') }} +
+ +
+ {{ form.renderDecorated('email') }} +
+ +
+
+

Password

+
+
+ +
+ {{ form.renderDecorated('passwordNew') }} +
+ +
+ {{ form.renderDecorated('passwordConfirm') }} +
+ +
+
+
+ {{ form.render('Save') }} + + + {% set actions = [ 'Activate': 'Active', 'Suspend': 'Suspended', 'Delete': 'Deleted' ] %} +
+ {% for label, status in actions %} + + {% if (user.status != status) %} + + {{ label }} + + {% endif %} + + {% endfor %} +
+
+
+ +
+ + diff --git a/app/views/backend/user/index.volt b/app/views/backend/user/index.volt index 35705ad..c03ad3c 100644 --- a/app/views/backend/user/index.volt +++ b/app/views/backend/user/index.volt @@ -27,7 +27,7 @@ {{ item.username }} {{ item.name }} {{ item.email }} - {{ item.type }} + {{ item.type | capitalize }} {{ item.status }} {% endfor %} From 599eb17f693c8c2fb751f76f4216f16f0be3ae6d Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 17:13:30 +0200 Subject: [PATCH 07/19] app/config/routes.yml: make "page" an optional variable for backend-user-list route. --- app/config/routes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/routes.yml b/app/config/routes.yml index 309bc79..9bc1776 100644 --- a/app/config/routes.yml +++ b/app/config/routes.yml @@ -62,7 +62,7 @@ router: pattern: '/admin' path: backend::user::index backend-user-list: - pattern: '/admin/user/list/{page:([0-9]+)}' + pattern: '/admin/user/list{page:/?([0-9]+)?}' path: backend::user::index backend-user-edit: pattern: '/admin/user/{id:([0-9]+)}' From c6704f5f4ad0e401c30d7e09c9cfbd49b8749a6a Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 17:15:42 +0200 Subject: [PATCH 08/19] app/forms/UserSettings.php: Make the form work correctly with null or "empty" user object. --- app/forms/UserSettings.php | 86 +++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 28 deletions(-) diff --git a/app/forms/UserSettings.php b/app/forms/UserSettings.php index bd6d4d0..f51dab2 100644 --- a/app/forms/UserSettings.php +++ b/app/forms/UserSettings.php @@ -50,19 +50,24 @@ class UserSettings extends FormBase public function initialize() { + $entity = $this->getEntity(); + $this->setValidation(new \Phalcon\Validation()); // Id - $id = new Text('id', array( - 'class' => 'form-control', - 'readonly' => '', - )); - $id->addValidator(new IdenticalValidator([ - 'accepted' => $this->getEntity()->getId(), - ])); + if ($entity && $entity->getId()) { + $id = new Text('id', array( + 'class' => 'form-control', + 'readonly' => '', + )); - $id->setLabel('ID'); - $this->add($id); + $id->addValidator(new IdenticalValidator([ + 'accepted' => $entity->getId(), + ])); + + $id->setLabel('ID'); + $this->add($id); + } // Username $username = new Text('username', array( @@ -72,16 +77,20 @@ class UserSettings extends FormBase $username->setLabel('Username'); - $username->addValidator(new AlnumValidator()); - - $validator = new UniquenessValidator(array( + $validator_options = array( 'model' => new UserModel(), - 'message' => 'The username already exists.', + 'message' => 'The :field already exists.', 'attribute' => 'username', - 'except' => [ $this->getEntity()->getUsername() ] - )); + ); - $username->addValidator($validator); + if ($entity && strlen($entity->getUsername())) { + $validator_options['except'] = [ $entity->getUsername() ]; + } + + $username->addValidators([ + new AlnumValidator(), + new UniquenessValidator($validator_options) + ]); $this->add($username); @@ -100,18 +109,39 @@ class UserSettings extends FormBase $this->add($name); // Email - $email = new Text('email', array( - 'class' => 'form-control', - 'placeholder' => 'Email', - 'readonly' => '', - )); + if ($this->_admin === false && $entity) { + $email = new Text('email', array( + 'class' => 'form-control', + 'placeholder' => 'Email', + 'readonly' => '', + )); - $email->addValidator(new IdenticalValidator([ - 'accepted' => $this->getEntity()->getEmail(), - ])); + $email->addValidator(new IdenticalValidator([ + 'accepted' => $entity->getEmail(), + ])); + } else { + $email = new Text('email', array( + 'class' => 'form-control', + 'placeholder' => 'Email', + )); + + $validator_options = [ + 'model' => new UserModel(), + 'message' => 'The :field already exists.', + 'attribute' => 'email', + ]; + + if ($entity && strlen($entity->getEmail())) { + $validator_options['except'] = [ $entity->getEmail() ]; + } + + $email->addValidators([ + new EmailValidator(), + new UniquenessValidator($validator_options) + ]); + } $email->setLabel('Email'); - $this->add($email); // Passwords @@ -127,10 +157,10 @@ class UserSettings extends FormBase */ protected function _passwords() { - $current_pw = $this->getEntity()->getPassword(); + $entity = $this->getEntity(); // Current - if ($this->_admin === false && strlen($current_pw) > 0) { + if ($this->_admin === false && $entity && strlen($entity->getPassword()) > 0) { $current = new Password('passwordCurrent', array( 'class' => 'form-control', )); @@ -155,7 +185,7 @@ class UserSettings extends FormBase // Validation $validation = $this->getValidation(); - if ($this->_admin === false && strlen($current_pw) > 0) { + if ($this->_admin === false && $entity && strlen($entity->getPassword()) > 0) { $validation->add('passwordCurrent', new CallbackValidator([ 'callback' => function($data) { $new_pw = $data['passwordNew']; From 652b814e13cf26ab6fcc0e38f3dc6d501df6c11a Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 17:16:37 +0200 Subject: [PATCH 09/19] app/forms/UserSettings.php: Show "Save" or "Create" based on if there is a entity id or not. --- app/forms/UserSettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/forms/UserSettings.php b/app/forms/UserSettings.php index f51dab2..3f54c55 100644 --- a/app/forms/UserSettings.php +++ b/app/forms/UserSettings.php @@ -148,7 +148,7 @@ class UserSettings extends FormBase $this->_passwords(); // Submit - $submit = new Submit('Save', array('class' => 'button button-default')); + $submit = new Submit($entity && $entity->getId() ? 'Save' : 'Create', array('class' => 'button button-default')); $this->add($submit); } From b2249735c3baa3da88f62ffa02e41eda2bcb4edb Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 17:26:45 +0200 Subject: [PATCH 10/19] app/controllers/backend/UserController.php: in statusAction() display "Activated" in flash message when status is changed to "Active" --- app/controllers/backend/UserController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/backend/UserController.php b/app/controllers/backend/UserController.php index 4ebde4f..20f819c 100644 --- a/app/controllers/backend/UserController.php +++ b/app/controllers/backend/UserController.php @@ -57,7 +57,13 @@ class UserController extends \Phalcon\Mvc\Controller $user->setStatus(ucfirst($type)); $user->save(); - $this->flash->success('The account was: ' . $user->getStatus()); + $status = $user->getStatus(); + // Bit of a hack to convert "active" to verb. + if ($status === User::STATUS_ACTIVE) { + $status = 'Activated'; + } + + $this->flash->success('The account was: ' . $status); $this->response->redirect('/admin'); } } From 5a4fd192c7a58ac5a0f50168bcf2b6c8f9bfe8b6 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 23:02:24 +0200 Subject: [PATCH 11/19] app/views/backend/user/edit.volt: change form to allow for both new and existing users. --- app/views/backend/user/edit.volt | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/app/views/backend/user/edit.volt b/app/views/backend/user/edit.volt index 7f34a01..d8163aa 100644 --- a/app/views/backend/user/edit.volt +++ b/app/views/backend/user/edit.volt @@ -1,17 +1,24 @@ -{% if (user.isActive() === false) %} -
-
-

{{ user.getStatus() }}

-
-
+
+

+ {% if (user.getId()) %} Edit user #{{ user.getId() }} {% else %} Create user {% endif %} +

+ +{% if (user.getId() and user.isActive() === false) %} +

{{ user.getStatus() }}

{% endif %} +
+
+ {% if (form.has('id')) %} {{ form.renderDecorated('username', [ 'length': 7 ]) }} {{ form.renderDecorated('id', [ 'length': 2, 'label-length' : 1 ]) }} + {% else %} + {{ form.renderDecorated('username') }} + {% endif %}
@@ -39,9 +46,14 @@
+ {% if (form.has('Save')) %} {{ form.render('Save') }} + {% else %} + {{ form.render('Create') }} + {% endif %} + {% if (user.getId()) %} {% set actions = [ 'Activate': 'Active', 'Suspend': 'Suspended', 'Delete': 'Deleted' ] %}
{% for label, status in actions %} @@ -55,9 +67,8 @@ {% endfor %}
+ {% endif %}
- - From 59c2baeb74d6715eb0f040b15bb5422cc1c0781e Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 23:03:36 +0200 Subject: [PATCH 12/19] app/views/backend/user: rename edit.volt to form.volt --- app/views/backend/user/{edit.volt => form.volt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/views/backend/user/{edit.volt => form.volt} (100%) diff --git a/app/views/backend/user/edit.volt b/app/views/backend/user/form.volt similarity index 100% rename from app/views/backend/user/edit.volt rename to app/views/backend/user/form.volt From 172cddb577b5c9c1e4b1ebf23c48aa4c08625170 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 23:04:08 +0200 Subject: [PATCH 13/19] app/controllers/backend/UserController.php: in editAction() take "user/form" view. --- app/controllers/backend/UserController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/backend/UserController.php b/app/controllers/backend/UserController.php index 20f819c..8a17e3b 100644 --- a/app/controllers/backend/UserController.php +++ b/app/controllers/backend/UserController.php @@ -49,6 +49,7 @@ class UserController extends \Phalcon\Mvc\Controller $this->view->user = $user; $this->view->form = $form; + $this->view->pick('user/form'); } public function statusAction($id, $type) From 885cdbe47ad19414d2ea207a4dd59bd68d935b48 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 23:04:43 +0200 Subject: [PATCH 14/19] app/controllers/backend/UserController.php: Adding newAction() --- app/controllers/backend/UserController.php | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/controllers/backend/UserController.php b/app/controllers/backend/UserController.php index 8a17e3b..d77cbd8 100644 --- a/app/controllers/backend/UserController.php +++ b/app/controllers/backend/UserController.php @@ -23,6 +23,36 @@ class UserController extends \Phalcon\Mvc\Controller $this->view->page = $paginator->getPaginate(); } + public function newAction() + { + $user = new User; + $form = new UserSettingsForm($user, true); + + if ($this->request->isPost()) { + $data = $this->request->getPost(); + if ($form->isValid($data)) { + + $new_pw = $form->getValue('passwordNew'); + if (strlen($new_pw) > 0) { + $hash = $this->security->hash($new_pw, 12); + $user->setPassword($hash); + } + + $form->initialize(); + + $this->flash->message('success', 'User created!'); + $this->response->redirect(['for' => 'backend-user-list']); + return; + } + + $this->flash->message('error', 'Could not create user'); + } + + $this->view->user = $user; + $this->view->form = $form; + $this->view->pick('user/form'); + } + public function editAction($id) { $user = User::findFirstById($id); From d8a20441cc66f7ff5bbd4d29f2a6783a3c161e4a Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 23:05:00 +0200 Subject: [PATCH 15/19] app/config/routes.yml: Adding backend-user-new route --- app/config/routes.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/config/routes.yml b/app/config/routes.yml index 9bc1776..71b1d67 100644 --- a/app/config/routes.yml +++ b/app/config/routes.yml @@ -64,6 +64,9 @@ router: backend-user-list: pattern: '/admin/user/list{page:/?([0-9]+)?}' path: backend::user::index + backend-user-new: + pattern: '/admin/user/new' + path: backend::user::new backend-user-edit: pattern: '/admin/user/{id:([0-9]+)}' path: backend::user::edit From cd543fca8d9d5119cb68d3ffda1066e15e7720e8 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 24 Jul 2022 23:05:17 +0200 Subject: [PATCH 16/19] app/views/backend/user/index.volt: Adding button to new user form. --- app/views/backend/user/index.volt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/backend/user/index.volt b/app/views/backend/user/index.volt index c03ad3c..8766f74 100644 --- a/app/views/backend/user/index.volt +++ b/app/views/backend/user/index.volt @@ -1,5 +1,13 @@ -

Users

+
+

Users

+ +
+ + {{ icon('solid/plus') }} New + +
+
From 513517032fcfac89645f3f79b1d7a8eee2806802 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 8 Aug 2022 23:50:32 +0200 Subject: [PATCH 17/19] app/assets/sass/components/_badge.scss: convert to new bootstrap variables. --- app/assets/sass/components/_badge.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/sass/components/_badge.scss b/app/assets/sass/components/_badge.scss index f0f9c7f..794b1f6 100644 --- a/app/assets/sass/components/_badge.scss +++ b/app/assets/sass/components/_badge.scss @@ -16,7 +16,7 @@ &-default { color: white; - background-color: $gray; + background-color: $gray-400; } &-primary { @@ -26,21 +26,21 @@ &-info { color: white; - background-color: $brand-info; + background-color: $info; } &-success { color: white; - background-color: $brand-success; + background-color: $success; } &-warning { color: black; - background-color: $brand-warning; + background-color: $warning; } &-danger { color: white; - background-color: $brand-danger; + background-color: $danger; } } From 79e947f8ebde8d64f0c7514e226238b9cc759a18 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 8 Aug 2022 23:50:51 +0200 Subject: [PATCH 18/19] app/views/backend/user/index.volt: use new bootstrap classes --- app/views/backend/user/index.volt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/backend/user/index.volt b/app/views/backend/user/index.volt index 8766f74..0c0a978 100644 --- a/app/views/backend/user/index.volt +++ b/app/views/backend/user/index.volt @@ -1,8 +1,8 @@
-

Users

+

Users

-
+
{{ icon('solid/plus') }} New From b2e54d4030ed9f4ab9296b5b5f6131ae871f6501 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 8 Aug 2022 23:51:05 +0200 Subject: [PATCH 19/19] app/views/backend/user/form.volt: use new bootstrap classes --- app/views/backend/user/form.volt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/views/backend/user/form.volt b/app/views/backend/user/form.volt index d8163aa..43d0542 100644 --- a/app/views/backend/user/form.volt +++ b/app/views/backend/user/form.volt @@ -1,18 +1,18 @@
-

+

{% if (user.getId()) %} Edit user #{{ user.getId() }} {% else %} Create user {% endif %}

{% if (user.getId() and user.isActive() === false) %} -

{{ user.getStatus() }}

+

{{ user.getStatus() }}

{% endif %}
-
+
{% if (form.has('id')) %} {{ form.renderDecorated('username', [ 'length': 7 ]) }} {{ form.renderDecorated('id', [ 'length': 2, 'label-length' : 1 ]) }} @@ -21,30 +21,30 @@ {% endif %}
-
+
{{ form.renderDecorated('name') }}
-
+
{{ form.renderDecorated('email') }}
-
-
+
+

Password

-
+
{{ form.renderDecorated('passwordNew') }}
-
+
{{ form.renderDecorated('passwordConfirm') }}
-
-
+
+
{% if (form.has('Save')) %} {{ form.render('Save') }} @@ -55,7 +55,7 @@ {% if (user.getId()) %} {% set actions = [ 'Activate': 'Active', 'Suspend': 'Suspended', 'Delete': 'Deleted' ] %} -
+
{% for label, status in actions %} {% if (user.status != status) %}