User creation forms are now displayed with inline popup

6 files changed, 104 insertions, 117 deletions

diff --git a/app/Template/user/create_local.php b/app/Template/user/create_local.php
deleted file mode 100644
index 7257456d..00000000
--- a/app/Template/user/create_local.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
-        </ul>
-    </div>
-    <section>
-    <form method="post" action="<?= $this->url->href('user', '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"')) ?>
-
-            <?= $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('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>
-
-        <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('Language'), 'language') ?>
-            <?= $this->form->select('language', $languages, $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) ?>
-        </div>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-            <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'user', 'index') ?>
-        </div>
-    </form>
-    </section>
-</section>
diff --git a/app/Template/user/create_remote.php b/app/Template/user/create_remote.php
deleted file mode 100644
index 05acbba1..00000000
--- a/app/Template/user/create_remote.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
-        </ul>
-    </div>
-    <form method="post" action="<?= $this->url->href('user', '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) ?>
-
-            <?= $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>
-
-        <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('Language'), 'language') ?>
-            <?= $this->form->select('language', $languages, $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) ?>
-        </div>
-
-        <div class="form-actions">
-            <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-            <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'user', 'index') ?>
-        </div>
-    </form>
-    <div class="alert alert-info">
-        <ul>
-            <li><?= t('Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.') ?></li>
-            <li><?= t('If you check the box "Disallow login form", credentials entered in the login form will be ignored.') ?></li>
-        </ul>
-    </div>
-</section>
\ No newline at end of file
diff --git a/app/Template/user/index.php b/app/Template/user/index.php
index 00cd0c82..b810373f 100644
--- a/app/Template/user/index.php
+++ b/app/Template/user/index.php
@@ -1,9 +1,9 @@
 <section id="main">
     <div class="page-header">
-        <?php if ($this->user->hasAccess('user', 'create')): ?>
+        <?php if ($this->user->hasAccess('UserCreationController', 'show')): ?>
         <ul>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'UserCreationController', 'show', array(), false, 'popover') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'UserCreationController', 'show', array('remote' => 1), false, 'popover') ?></li>
             <li><i class="fa fa-upload fa-fw"></i><?= $this->url->link(t('Import'), 'UserImportController', 'show', array(), false, 'popover') ?></li>
             <li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
         </ul>
diff --git a/app/Template/user/layout.php b/app/Template/user/layout.php
index 3a0a5ba6..47df2997 100644
--- a/app/Template/user/layout.php
+++ b/app/Template/user/layout.php
@@ -1,19 +1,19 @@
 <section id="main">
     <div class="page-header">
-        <?php if ($this->user->hasAccess('user', 'create')): ?>
+        <?php if ($this->user->hasAccess('UserCreationController', 'show')): ?>
         <ul>
             <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'UserCreationController', 'show', array(), false, 'popover') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'UserCreationController', 'show', array('remote' => 1), false, 'popover') ?></li>
+            <li><i class="fa fa-upload fa-fw"></i><?= $this->url->link(t('Import'), 'UserImportController', 'show', array(), false, 'popover') ?></li>
+            <li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
         </ul>
         <?php endif ?>
     </div>
     <section class="sidebar-container" id="user-section">
-
         <?= $this->render('user/sidebar', array('user' => $user)) ?>
-
         <div class="sidebar-content">
             <?= $content_for_sublayout ?>
         </div>
     </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/user_creation/local.php b/app/Template/user_creation/local.php
new file mode 100644
index 00000000..a83074e8
--- /dev/null
+++ b/app/Template/user_creation/local.php
@@ -0,0 +1,45 @@
+<div class="page-header">
+    <h2><?= t('New local user') ?></h2>
+</div>
+<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"')) ?>
+
+        <?= $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('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>
+
+    <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('Language'), 'language') ?>
+        <?= $this->form->select('language', $languages, $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) ?>
+    </div>
+
+    <div class="form-actions">
+        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?>
+    </div>
+</form>
diff --git a/app/Template/user_creation/remote.php b/app/Template/user_creation/remote.php
new file mode 100644
index 00000000..5266fce8
--- /dev/null
+++ b/app/Template/user_creation/remote.php
@@ -0,0 +1,50 @@
+<div class="page-header">
+    <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) ?>
+
+        <?= $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>
+
+    <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('Language'), 'language') ?>
+        <?= $this->form->select('language', $languages, $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) ?>
+    </div>
+
+    <div class="form-actions">
+        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?>
+    </div>
+</form>
+<div class="alert alert-info">
+    <ul>
+        <li><?= t('Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.') ?></li>
+        <li><?= t('If you check the box "Disallow login form", credentials entered in the login form will be ignored.') ?></li>
+    </ul>
+</div>