From 17fa0d3f11d4f494e6456f5e5b2c6914d00deef6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 9 Jun 2015 08:23:06 +0200
Subject: [PATCH] Revert "Improve group and user view layout"

This reverts commit 44e3dba36226451afb2a3f0954ae21bc3bb6c7ba.
Reason:
* Controls are controls, not content
* Controls must still be shown in case of a non-matching filter
---
 application/views/scripts/group/show.phtml | 11 +++++------
 application/views/scripts/user/show.phtml  | 11 +++++------
 public/css/icinga/main-content.less        | 10 ++++------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 8c8c91f51..636a449d4 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -30,12 +30,8 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
   <div class="group-header">
     <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-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p> 
-    <h5><?= $this->translate('Members'); ?></h5>
+    <p class="group-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></p>
   </div>
-</div>
-<div class="content members" data-base-target="_next">
-<?php if (count($members) > 0): ?>
  <?php if (! $this->compact): ?>
   <?= $this->sortBox; ?>
  <?php endif ?>
@@ -44,6 +40,9 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
  <?php if (! $this->compact): ?>
   <?= $this->filterEditor; ?>
  <?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">
     <thead>
       <tr>
@@ -67,7 +66,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
     </tbody>
   </table>
 <?php else: ?>
-  <p><?= $this->translate('Group has no members.'); ?></p>
+  <p><?= $this->translate('No group member found matching the filter'); ?></p>
 <?php endif ?>
 <?php if ($extensible): ?>
   <?= $this->qlink($this->translate('Add a new member'), 'group/addmember', array(
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index f4e9dee6a..82f4c53f9 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -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-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-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p> 
-    <h5><?= $this->translate('Group Memberships'); ?></h5>
+    <p class="user-modified"><strong><?= $this->translate('Last modified'); ?>:</strong> <?= $user->last_modified === null ? '-' : $this->formatDateTime($user->last_modified); ?></p>
   </div>
-</div>
-<div class="content memberships" data-base-target="_next">
- <?php if (count($memberships) > 0): ?>
  <?php if (! $this->compact): ?>
   <?= $this->sortBox; ?>
  <?php endif ?>
@@ -44,6 +40,9 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
  <?php if (! $this->compact): ?>
   <?= $this->filterEditor; ?>
  <?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">
     <thead>
       <tr>
@@ -81,7 +80,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
     </tbody>
   </table>
 <?php else: ?>
-  <?= $this->translate('User has no group memberships.'); ?>
+  <p><?= $this->translate('No memberships found matching the filter'); ?></p>
 <?php endif ?>
 <?php if ($showCreateMembershipLink): ?>
 <?= $this->qlink($this->translate('Create new membership'), 'user/createmembership', array(
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 06269d271..18bc03a57 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -236,9 +236,8 @@ div.content.users {
 }
 
 div.controls div.user-header {
-  h5 {
-    margin-bottom: 0em;
-  }
+  border-bottom: 2px solid @colorPetrol;
+  margin-bottom: 1em;
 
   .user-name {
     display: inline-block;
@@ -303,9 +302,8 @@ div.content.groups {
 }
 
 div.controls div.group-header {
-  h5 {
-    margin-bottom: 0em;
-  }
+  border-bottom: 2px solid @colorPetrol;
+  margin-bottom: 1em;
 
   .group-name {
     display: inline-block;