AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use contextual menu instead of action column in users management

This commit is contained in:
Frederic Guillot 2017-02-14 22:09:29 -05:00
parent f618f228d7
commit a559dc0be7
5 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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)
-----------------------------

26
app/Template/group/index.php
View File

@ -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 ?>

18
app/Template/group/users.php
View File

@ -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>

2
app/Template/user_list/dropdown.php
View File

@ -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'])) ?>

10
app/Template/user_list/show.php
View File

@ -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>