tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GroupController: Fix design for showing a group

This commit is contained in:
Johannes Meyer 2015-06-25 11:36:26 +02:00
parent af7426451a
commit f2ba70d5ab
3 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
application/views/scripts/group/show.phtml
View File

@ -27,20 +27,26 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $tabs; ?> <?= $tabs; ?>
<?php endif ?> <?php endif ?>
<div class="group-header"> <h1><?= $this->escape($group->group_name); ?><span class="pull-right"><?= $editLink; ?></span></h1>
<p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?> <table class="avp user-header">
<p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p> <tr>
<p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p> <th><?= $this->translate('Created at'); ?></th>
<h3><?= $this->translate('Members'); ?></h3> <td><?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></td>
<?php if (! $this->compact): ?> </tr>
<tr>
<th><?= $this->translate('Last modified'); ?></th>
<td><?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></td>
</tr>
</table>
<h2><?= $this->translate('Members'); ?></h2>
<?php if (! $this->compact): ?>
<?= $this->sortBox; ?> <?= $this->sortBox; ?>
<?php endif ?> <?php endif ?>
<?= $this->limiter; ?> <?= $this->limiter; ?>
<?= $this->paginator; ?> <?= $this->paginator; ?>
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->filterEditor; ?> <?= $this->filterEditor; ?>
<?php endif ?> <?php endif ?>
</div>
</div> </div>
<div class="content members" data-base-target="_next"> <div class="content members" data-base-target="_next">
<?php if (count($members) > 0): ?> <?php if (count($members) > 0): ?>

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

@ -43,12 +43,12 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
</table> </table>
<h2><?= $this->translate('Group Memberships'); ?></h2> <h2><?= $this->translate('Group Memberships'); ?></h2>
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->sortBox ?> <?= $this->sortBox; ?>
<?php endif ?> <?php endif ?>
<?= $this->limiter ?> <?= $this->limiter; ?>
<?= $this->paginator ?> <?= $this->paginator; ?>
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->filterEditor ?> <?= $this->filterEditor; ?>
<?php endif ?> <?php endif ?>
</div> </div>
<div class="content memberships"> <div class="content memberships">

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

@ -274,19 +274,6 @@ div.content.groups {
} }
} }
div.controls div.group-header {
.group-name {
display: inline-block;
margin: 0 0 0.3em;
font-size: 2em;
}
.group-parent, .group-created, .group-modified {
margin: 0 0 0.2em;
font-size: 0.8em;
}
}
div.content.members { div.content.members {
table.member-list { table.member-list {
th.member-remove { th.member-remove {