tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

user/show.phtml: Improve layout

Browse Source 
refs #10367
This commit is contained in:
Johannes Meyer 2015-10-15 14:35:30 +02:00
parent 4d5fde768a
commit 635bb3eec6
3 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/UserController.php
View File

@ -140,7 +140,7 @@ class UserController extends AuthBackendController
$removeForm->addElement('button', 'btn_submit', array( $removeForm->addElement('button', 'btn_submit', array(
'escape' => false, 'escape' => false,
'type' => 'submit', 'type' => 'submit',
'class' => 'link-like spinner', 'class' => 'link-button spinner',
'value' => 'btn_submit', 'value' => 'btn_submit',
'decorators' => array('ViewHelper'), 'decorators' => array('ViewHelper'),
'label' => $this->view->icon('trash'), 'label' => $this->view->icon('trash'),

20
application/views/scripts/user/show.phtml
View File

@ -22,7 +22,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
} }
?> ?>
<div class="controls"> <div class="controls separated dont-print">
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $tabs; ?> <?= $tabs; ?>
<?php endif ?> <?php endif ?>
@ -41,17 +41,17 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
<td><?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></td> <td><?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></td>
</tr> </tr>
</table> </table>
<h2><?= $this->translate('Group Memberships'); ?></h2>
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->sortBox; ?> <h2><?= $this->translate('Group Memberships'); ?></h2>
<?php endif ?> <div class="grid">
<?= $this->limiter; ?> <?= $this->limiter; ?>
<?= $this->paginator; ?> <?= $this->paginator; ?>
<?php if (! $this->compact): ?> <?= $this->sortBox; ?>
</div>
<?= $this->filterEditor; ?> <?= $this->filterEditor; ?>
<?php endif ?> <?php endif ?>
</div> </div>
<div class="content memberships"> <div class="content">
<?php if ($showCreateMembershipLink): ?> <?php if ($showCreateMembershipLink): ?>
<?= $this->qlink( <?= $this->qlink(
$this->translate('Create New Membership') , $this->translate('Create New Membership') ,
@ -75,14 +75,14 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
<table data-base-target="_next" class="action-table listing-table"> <table data-base-target="_next" class="action-table listing-table">
<thead> <thead>
<tr> <tr>
<th class="membership-group"><?= $this->translate('Group'); ?></th> <th><?= $this->translate('Group'); ?></th>
<th class="membership-cancel"><?= $this->translate('Cancel', 'group.membership'); ?></th> <th><?= $this->translate('Cancel', 'group.membership'); ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($memberships as $membership): ?> <?php foreach ($memberships as $membership): ?>
<tr> <tr>
<td class="membership-group"> <td>
<?php if ($this->hasPermission('config/authentication/groups/show') && $membership->backend instanceof Selectable): ?> <?php if ($this->hasPermission('config/authentication/groups/show') && $membership->backend instanceof Selectable): ?>
<?= $this->qlink($membership->group_name, 'group/show', array( <?= $this->qlink($membership->group_name, 'group/show', array(
'backend' => $membership->backend->getName(), 'backend' => $membership->backend->getName(),
@ -94,7 +94,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
<?= $this->escape($membership->group_name); ?> <?= $this->escape($membership->group_name); ?>
<?php endif ?> <?php endif ?>
</td> </td>
<td class="membership-cancel" data-base-target="_self"> <td data-base-target="_self">
<?php if (isset($removeForm) && $membership->backend instanceof Reducible): ?> <?php if (isset($removeForm) && $membership->backend instanceof Reducible): ?>
<?= $removeForm->setAction($this->url('group/removemember', array( <?= $removeForm->setAction($this->url('group/removemember', array(
'backend' => $membership->backend->getName(), 'backend' => $membership->backend->getName(),

27
public/css/icinga/main-content.less
View File

@ -233,33 +233,6 @@ div.content.users {
} }
} }
div.content.memberships {
table.membership-list {
th.membership-cancel {
width: 8em;
padding-right: 0.5em;
text-align: right;
}
td.membership-cancel {
text-align: right;
form button.link-like {
color: inherit;
}
}
}
p {
margin-top: 0;
}
a.membership-create {
display: block;
margin-top: 1em;
}
}
div.content.groups { div.content.groups {
table.group-list { table.group-list {
th.group-remove { th.group-remove {