From 9ec654186a8374b0d260cf641114bcbde1f6bb4f Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 15 May 2016 21:50:46 -0400
Subject: User creation forms are now displayed with inline popup

---
 app/Template/user/layout.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/Template/user/layout.php')

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>
-- 
cgit v1.3.1