Improve user controllers and views

2 files changed, 93 insertions, 0 deletions

diff --git a/app/Template/user_list/dropdown.php b/app/Template/user_list/dropdown.php
new file mode 100644
index 00000000..9e90c230
--- /dev/null
+++ b/app/Template/user_list/dropdown.php
@@ -0,0 +1,27 @@
+<div class="dropdown">
+    <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
+    <ul>
+        <li>
+            <i class="fa fa-user fa-fw"></i>
+            <?= $this->url->link(t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
+        </li>
+        <?php if ($user['is_active'] == 1 && $this->user->hasAccess('UserStatusController', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?>
+            <li>
+                <i class="fa fa-times fa-fw"></i>
+                <?= $this->url->link(t('Disable'), 'UserStatusController', 'confirmDisable', array('user_id' => $user['id']), false, 'popover') ?>
+            </li>
+        <?php endif ?>
+        <?php if ($user['is_active'] == 0 && $this->user->hasAccess('UserStatusController', 'enable') && ! $this->user->isCurrentUser($user['id'])): ?>
+            <li>
+                <i class="fa fa-check-square-o fa-fw"></i>
+                <?= $this->url->link(t('Enable'), 'UserStatusController', 'confirmEnable', array('user_id' => $user['id']), false, 'popover') ?>
+            </li>
+        <?php endif ?>
+        <?php if ($this->user->hasAccess('UserStatusController', 'remove') && ! $this->user->isCurrentUser($user['id'])): ?>
+            <li>
+                <i class="fa fa-trash-o fa-fw"></i>
+                <?= $this->url->link(t('Remove'), 'UserStatusController', 'confirmRemove', array('user_id' => $user['id']), false, 'popover') ?>
+            </li>
+        <?php endif ?>
+    </ul>
+</div>
diff --git a/app/Template/user_list/show.php b/app/Template/user_list/show.php
new file mode 100644
index 00000000..b2bd9377
--- /dev/null
+++ b/app/Template/user_list/show.php
@@ -0,0 +1,66 @@
+<section id="main">
+    <div class="page-header">
+        <?php if ($this->user->hasAccess('UserCreationController', 'show')): ?>
+        <ul>
+            <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'), 'GroupListController', 'index') ?></li>
+        </ul>
+        <?php endif ?>
+    </div>
+    <?php if ($paginator->isEmpty()): ?>
+        <p class="alert"><?= t('No user') ?></p>
+    <?php else: ?>
+        <table class="table-stripped">
+            <tr>
+                <th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th>
+                <th class="column-18"><?= $paginator->order(t('Username'), 'username') ?></th>
+                <th class="column-18"><?= $paginator->order(t('Name'), 'name') ?></th>
+                <th class="column-15"><?= $paginator->order(t('Email'), 'email') ?></th>
+                <th class="column-15"><?= $paginator->order(t('Role'), 'role') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Two Factor'), 'twofactor_activated') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Account type'), 'is_ldap_user') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Status'), 'is_active') ?></th>
+                <th class="column-5"><?= t('Actions') ?></th>
+            </tr>
+            <?php foreach ($paginator->getCollection() as $user): ?>
+            <tr>
+                <td>
+                    <?= '#'.$user['id'] ?>
+                </td>
+                <td>
+                    <?= $this->url->link($this->text->e($user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
+                </td>
+                <td>
+                    <?= $this->text->e($user['name']) ?>
+                </td>
+                <td>
+                    <a href="mailto:<?= $this->text->e($user['email']) ?>"><?= $this->text->e($user['email']) ?></a>
+                </td>
+                <td>
+                    <?= $this->user->getRoleName($user['role']) ?>
+                </td>
+                <td>
+                    <?= $user['twofactor_activated'] ? t('Yes') : t('No') ?>
+                </td>
+                <td>
+                    <?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?>
+                </td>
+                <td>
+                    <?php if ($user['is_active'] == 1): ?>
+                        <?= t('Active') ?>
+                    <?php else: ?>
+                        <?= t('Inactive') ?>
+                    <?php endif ?>
+                </td>
+                <td>
+                    <?= $this->render('user_list/dropdown', array('user' => $user)) ?>
+                </td>
+            </tr>
+            <?php endforeach ?>
+        </table>
+
+        <?= $paginator ?>
+    <?php endif ?>
+</section>