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

Revert "Improve group and user view layout" 

This reverts commit 44e3dba362.
Reason:
* Controls are controls, not content
* Controls must still be shown in case of a non-matching filter
This commit is contained in:
Johannes Meyer 2015-06-09 08:23:06 +02:00
parent 44e3dba362
commit 17fa0d3f11
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,12 +30,8 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
<div class="group-header"> <div class="group-header">
<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>
<h5><?= $this->translate('Members'); ?></h5>
</div> </div>
</div>
<div class="content members" data-base-target="_next">
<?php if (count($members) > 0): ?>
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->sortBox; ?> <?= $this->sortBox; ?>
<?php endif ?> <?php endif ?>
@ -44,6 +40,9 @@ 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 class="content members" data-base-target="_next">
<?php if (count($members) > 0): ?>
<table data-base-target="_next" class="action member-list"> <table data-base-target="_next" class="action member-list">
<thead> <thead>
<tr> <tr>
@ -67,7 +66,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
</tbody> </tbody>
</table> </table>
<?php else: ?> <?php else: ?>
<p><?= $this->translate('Group has no members.'); ?></p> <p><?= $this->translate('No group member found matching the filter'); ?></p>
<?php endif ?> <?php endif ?>
<?php if ($extensible): ?> <?php if ($extensible): ?>
<?= $this->qlink($this->translate('Add a new member'), 'group/addmember', array( <?= $this->qlink($this->translate('Add a new member'), 'group/addmember', array(

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

@ -30,12 +30,8 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
<p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?> <p class="user-name"><strong><?= $this->escape($user->user_name); ?></strong></p> <?= $editLink; ?>
<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>
<h5><?= $this->translate('Group Memberships'); ?></h5>
</div> </div>
</div>
<div class="content memberships" data-base-target="_next">
<?php if (count($memberships) > 0): ?>
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->sortBox; ?> <?= $this->sortBox; ?>
<?php endif ?> <?php endif ?>
@ -44,6 +40,9 @@ 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 class="content memberships" data-base-target="_next">
<?php if (count($memberships) > 0): ?>
<table data-base-target="_next" class="action membership-list"> <table data-base-target="_next" class="action membership-list">
<thead> <thead>
<tr> <tr>
@ -81,7 +80,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
</tbody> </tbody>
</table> </table>
<?php else: ?> <?php else: ?>
<?= $this->translate('User has no group memberships.'); ?> <p><?= $this->translate('No memberships found matching the filter'); ?></p>
<?php endif ?> <?php endif ?>
<?php if ($showCreateMembershipLink): ?> <?php if ($showCreateMembershipLink): ?>
<?= $this->qlink($this->translate('Create new membership'), 'user/createmembership', array( <?= $this->qlink($this->translate('Create new membership'), 'user/createmembership', array(

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

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