Merge https://github.com/kanboard/kanboard

2 files changed, 47 insertions, 44 deletions

diff --git a/app/Template/user_creation/local.php b/app/Template/user_creation/local.php
index 4c224cec..059a0114 100644
--- a/app/Template/user_creation/local.php
+++ b/app/Template/user_creation/local.php
@@ -4,37 +4,39 @@
 <form class="popover-form" method="post" action="<?= $this->url->href('UserCreationController', 'save') ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
-    <div class="form-column">
-        <?= $this->form->label(t('Username'), 'username') ?>
-        <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+    <div class="form-columns">
+        <div class="form-column">
+            <?= $this->form->label(t('Username'), 'username') ?>
+            <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
 
-        <?= $this->form->label(t('Name'), 'name') ?>
-        <?= $this->form->text('name', $values, $errors) ?>
+            <?= $this->form->label(t('Name'), 'name') ?>
+            <?= $this->form->text('name', $values, $errors) ?>
 
-        <?= $this->form->label(t('Email'), 'email') ?>
-        <?= $this->form->email('email', $values, $errors) ?>
+            <?= $this->form->label(t('Email'), 'email') ?>
+            <?= $this->form->email('email', $values, $errors) ?>
 
-        <?= $this->form->label(t('Password'), 'password') ?>
-        <?= $this->form->password('password', $values, $errors, array('required')) ?>
+            <?= $this->form->label(t('Password'), 'password') ?>
+            <?= $this->form->password('password', $values, $errors, array('required')) ?>
 
-        <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
-        <?= $this->form->password('confirmation', $values, $errors, array('required')) ?>
-    </div>
+            <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
+            <?= $this->form->password('confirmation', $values, $errors, array('required')) ?>
+        </div>
 
-    <div class="form-column">
-        <?= $this->form->label(t('Add project member'), 'project_id') ?>
-        <?= $this->form->select('project_id', $projects, $values, $errors) ?>
+        <div class="form-column">
+            <?= $this->form->label(t('Add project member'), 'project_id') ?>
+            <?= $this->form->select('project_id', $projects, $values, $errors) ?>
 
-        <?= $this->form->label(t('Timezone'), 'timezone') ?>
-        <?= $this->form->select('timezone', $timezones, $values, $errors) ?>
+            <?= $this->form->label(t('Timezone'), 'timezone') ?>
+            <?= $this->form->select('timezone', $timezones, $values, $errors) ?>
 
-        <?= $this->form->label(t('Language'), 'language') ?>
-        <?= $this->form->select('language', $languages, $values, $errors) ?>
+            <?= $this->form->label(t('Language'), 'language') ?>
+            <?= $this->form->select('language', $languages, $values, $errors) ?>
 
-        <?= $this->form->label(t('Role'), 'role') ?>
-        <?= $this->form->select('role', $roles, $values, $errors) ?>
+            <?= $this->form->label(t('Role'), 'role') ?>
+            <?= $this->form->select('role', $roles, $values, $errors) ?>
 
-        <?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+        </div>
     </div>
 
     <div class="form-actions">
diff --git a/app/Template/user_creation/remote.php b/app/Template/user_creation/remote.php
index dc4981a4..41d0d3c7 100644
--- a/app/Template/user_creation/remote.php
+++ b/app/Template/user_creation/remote.php
@@ -2,38 +2,39 @@
     <h2><?= t('New remote user') ?></h2>
 </div>
 <form class="popover-form" method="post" action="<?= $this->url->href('UserCreationController', 'save') ?>" autocomplete="off">
-
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('is_ldap_user', array('is_ldap_user' => 1)) ?>
 
-    <div class="form-column">
-        <?= $this->form->label(t('Username'), 'username') ?>
-        <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
-
-        <?= $this->form->label(t('Name'), 'name') ?>
-        <?= $this->form->text('name', $values, $errors) ?>
+    <div class="form-columns">
+        <div class="form-column">
+            <?= $this->form->label(t('Username'), 'username') ?>
+            <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+    
+            <?= $this->form->label(t('Name'), 'name') ?>
+            <?= $this->form->text('name', $values, $errors) ?>
 
-        <?= $this->form->label(t('Email'), 'email') ?>
-        <?= $this->form->email('email', $values, $errors) ?>
+            <?= $this->form->label(t('Email'), 'email') ?>
+            <?= $this->form->email('email', $values, $errors) ?>
 
-        <?= $this->hook->render('template:user:create-remote:form', array('values' => $values, 'errors' => $errors)) ?>
-    </div>
+            <?= $this->hook->render('template:user:create-remote:form', array('values' => $values, 'errors' => $errors)) ?>
+        </div>
 
-    <div class="form-column">
-        <?= $this->form->label(t('Add project member'), 'project_id') ?>
-        <?= $this->form->select('project_id', $projects, $values, $errors) ?>
+        <div class="form-column">
+            <?= $this->form->label(t('Add project member'), 'project_id') ?>
+            <?= $this->form->select('project_id', $projects, $values, $errors) ?>
 
-        <?= $this->form->label(t('Timezone'), 'timezone') ?>
-        <?= $this->form->select('timezone', $timezones, $values, $errors) ?>
+            <?= $this->form->label(t('Timezone'), 'timezone') ?>
+            <?= $this->form->select('timezone', $timezones, $values, $errors) ?>
 
-        <?= $this->form->label(t('Language'), 'language') ?>
-        <?= $this->form->select('language', $languages, $values, $errors) ?>
+            <?= $this->form->label(t('Language'), 'language') ?>
+            <?= $this->form->select('language', $languages, $values, $errors) ?>
 
-        <?= $this->form->label(t('Role'), 'role') ?>
-        <?= $this->form->select('role', $roles, $values, $errors) ?>
+            <?= $this->form->label(t('Role'), 'role') ?>
+            <?= $this->form->select('role', $roles, $values, $errors) ?>
 
-        <?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
-        <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
+            <?= $this->form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
+        </div>
     </div>
 
     <div class="form-actions">