summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--app/Template/group/index.php26
-rw-r--r--app/Template/group/users.php18
-rw-r--r--app/Template/user_list/dropdown.php2
-rw-r--r--app/Template/user_list/show.php10
5 files changed, 34 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 853bee7b..5716264d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Version 1.0.40 (unreleased)
+---------------------------
+
+Improvements:
+
+* Use contextual menu instead of action column in users management
+
Version 1.0.39 (Feb 12, 2017)
-----------------------------
diff --git a/app/Template/group/index.php b/app/Template/group/index.php
index fe3f398e..e4856a70 100644
--- a/app/Template/group/index.php
+++ b/app/Template/group/index.php
@@ -11,31 +11,27 @@
<table class="table-fixed table-scrolling">
<tr>
<th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th>
- <th class="column-20"><?= $paginator->order(t('External Id'), 'external_id') ?></th>
<th><?= $paginator->order(t('Name'), 'name') ?></th>
- <th class="column-5"><?= t('Actions') ?></th>
+ <th class="column-30"><?= $paginator->order(t('External Id'), 'external_id') ?></th>
</tr>
<?php foreach ($paginator->getCollection() as $group): ?>
<tr>
<td>
- #<?= $group['id'] ?>
- </td>
- <td>
- <?= $this->text->e($group['external_id']) ?>
+ <div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon">#<?= $group['id'] ?> <i class="fa fa-caret-down"></i></a>
+ <ul>
+ <li><?= $this->modal->medium('plus', t('Add group member'), 'GroupListController', 'associate', array('group_id' => $group['id'])) ?></li>
+ <li><?= $this->url->icon('users', t('Members'), 'GroupListController', 'users', array('group_id' => $group['id'])) ?></li>
+ <li><?= $this->modal->medium('edit', t('Edit'), 'GroupModificationController', 'show', array('group_id' => $group['id'])) ?></li>
+ <li><?= $this->modal->confirm('trash-o', t('Remove'), 'GroupListController', 'confirm', array('group_id' => $group['id'])) ?></li>
+ </ul>
+ </div>
</td>
<td>
<?= $this->url->link($this->text->e($group['name']), 'GroupListController', 'users', array('group_id' => $group['id'])) ?>
</td>
<td>
- <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><?= $this->modal->medium('plus', t('Add group member'), 'GroupListController', 'associate', array('group_id' => $group['id'])) ?></li>
- <li><?= $this->url->icon('users', t('Members'), 'GroupListController', 'users', array('group_id' => $group['id'])) ?></li>
- <li><?= $this->modal->medium('edit', t('Edit'), 'GroupModificationController', 'show', array('group_id' => $group['id'])) ?></li>
- <li><?= $this->modal->confirm('trash-o', t('Remove'), 'GroupListController', 'confirm', array('group_id' => $group['id'])) ?></li>
- </ul>
- </div>
+ <?= $this->text->e($group['external_id']) ?>
</td>
</tr>
<?php endforeach ?>
diff --git a/app/Template/group/users.php b/app/Template/group/users.php
index ef179674..268f28de 100644
--- a/app/Template/group/users.php
+++ b/app/Template/group/users.php
@@ -10,16 +10,25 @@
<?php else: ?>
<table class="table-striped table-scrolling">
<tr>
- <th><?= $paginator->order(t('Id'), 'id') ?></th>
+ <th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th>
<th><?= $paginator->order(t('Username'), 'username') ?></th>
<th><?= $paginator->order(t('Name'), 'name') ?></th>
<th><?= $paginator->order(t('Email'), 'email') ?></th>
- <th><?= t('Actions') ?></th>
</tr>
<?php foreach ($paginator->getCollection() as $user): ?>
<tr>
<td>
- <?= $this->url->link('#'.$user['id'], 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
+ <div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon"><?= '#'.$user['id'] ?> <i class="fa fa-caret-down"></i></a>
+ <ul>
+ <li>
+ <?= $this->url->icon('user', t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
+ </li>
+ <li>
+ <?= $this->modal->confirm('trash-o', t('Remove this user from group'), 'GroupListController', 'dissociate', array('group_id' => $group['id'], 'user_id' => $user['id'])) ?>
+ </li>
+ </ul>
+ </div>
</td>
<td>
<?= $this->url->link($this->text->e($user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
@@ -30,9 +39,6 @@
<td>
<a href="mailto:<?= $this->text->e($user['email']) ?>"><?= $this->text->e($user['email']) ?></a>
</td>
- <td>
- <?= $this->modal->confirm('trash-o', t('Remove this user'), 'GroupListController', 'dissociate', array('group_id' => $group['id'], 'user_id' => $user['id'])) ?>
- </td>
</tr>
<?php endforeach ?>
</table>
diff --git a/app/Template/user_list/dropdown.php b/app/Template/user_list/dropdown.php
index d18f20aa..6c076feb 100644
--- a/app/Template/user_list/dropdown.php
+++ b/app/Template/user_list/dropdown.php
@@ -1,5 +1,5 @@
<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>
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon"><?= '#'.$user['id'] ?> <i class="fa fa-caret-down"></i></a>
<ul>
<li>
<?= $this->url->icon('user', t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
diff --git a/app/Template/user_list/show.php b/app/Template/user_list/show.php
index e83895ea..dad5442a 100644
--- a/app/Template/user_list/show.php
+++ b/app/Template/user_list/show.php
@@ -27,15 +27,14 @@
<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-12"><?= $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>
+ <th class="column-12"><?= $paginator->order(t('Status'), 'is_active') ?></th>
</tr>
<?php foreach ($paginator->getCollection() as $user): ?>
<tr>
<td>
- <?= '#'.$user['id'] ?>
+ <?= $this->render('user_list/dropdown', array('user' => $user)) ?>
</td>
<td>
<?= $this->url->link($this->text->e($user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
@@ -62,9 +61,6 @@
<?= t('Inactive') ?>
<?php endif ?>
</td>
- <td>
- <?= $this->render('user_list/dropdown', array('user' => $user)) ?>
- </td>
</tr>
<?php endforeach ?>
</table>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 02:42:08 +0000