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

Add heading to user and group view and fix layout

This commit is contained in:
Matthias Jentsch 2015-06-09 10:27:54 +02:00
parent eba862a290
commit 4cea9f15e9
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
<p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?> <p class="group-name"><strong><?= $this->escape($group->group_name); ?></strong></p> <?= $editLink; ?>
<p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p> <p class="group-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></p>
<p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p> <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
</div> <h3><?= $this->translate('Members'); ?></h3>
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->sortBox; ?> <?= $this->sortBox; ?>
<?php endif ?> <?php endif ?>
@ -40,6 +40,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
<?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): ?>

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

@ -31,7 +31,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
<p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></p> <p class="user-state"><strong><?= $this->translate('State'); ?>:</strong> <?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></p>
<p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p> <p class="user-created"><strong><?= $this->translate('Created at'); ?>:</strong> <?= $user->created_at === null ? '-' : $this->formatDateTime($user->created_at); ?></p>
<p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p> <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
</div> <h3><?= $this->translate('Group Memberships'); ?></h3>
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->sortBox; ?> <?= $this->sortBox; ?>
<?php endif ?> <?php endif ?>
@ -40,6 +40,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->filterEditor; ?> <?= $this->filterEditor; ?>
<?php endif ?> <?php endif ?>
</div>
</div> </div>
<div class="content memberships" data-base-target="_next"> <div class="content memberships" data-base-target="_next">
<?php if (count($memberships) > 0): ?> <?php if (count($memberships) > 0): ?>

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

@ -236,8 +236,9 @@ div.content.users {
} }
div.controls div.user-header { div.controls div.user-header {
border-bottom: 2px solid @colorPetrol; h5 {
margin-bottom: 1em; margin-bottom: 0.8em;
}
.user-name { .user-name {
display: inline-block; display: inline-block;
@ -302,8 +303,9 @@ div.content.groups {
} }
div.controls div.group-header { div.controls div.group-header {
border-bottom: 2px solid @colorPetrol; h5 {
margin-bottom: 1em; margin-bottom: 0.8em;
}
.group-name { .group-name {
display: inline-block; display: inline-block;