From f2ba70d5ab9a3f70a6bd180058637ae61dfbf5db Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 25 Jun 2015 11:36:26 +0200
Subject: [PATCH] GroupController: Fix design for showing a group

---
 application/views/scripts/group/show.phtml | 34 +++++++++++++---------
 application/views/scripts/user/show.phtml  |  8 ++---
 public/css/icinga/main-content.less        | 13 ---------
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 20538a9b3..ed5c747d5 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -27,20 +27,26 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
  <?php if (! $this->compact): ?>
   <?= $tabs; ?>
  <?php endif ?>
-  <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>
-    <h3><?= $this->translate('Members'); ?></h3>
-    <?php if (! $this->compact): ?>
-     <?= $this->sortBox; ?>
-    <?php endif ?>
-     <?= $this->limiter; ?>
-     <?= $this->paginator; ?>
-    <?php if (! $this->compact): ?>
-     <?= $this->filterEditor; ?>
-    <?php endif ?>
-  </div>
+  <h1><?= $this->escape($group->group_name); ?><span class="pull-right"><?= $editLink; ?></span></h1>
+  <table class="avp user-header">
+    <tr>
+      <th><?= $this->translate('Created at'); ?></th>
+      <td><?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></td>
+    </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; ?>
+<?php endif ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+<?php if (! $this->compact): ?>
+  <?= $this->filterEditor; ?>
+<?php endif ?>
 </div>
 <div class="content members" data-base-target="_next">
 <?php if (count($members) > 0): ?>
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 929737c71..b592bd64c 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -43,12 +43,12 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
   </table>
   <h2><?= $this->translate('Group Memberships'); ?></h2>
 <?php if (! $this->compact): ?>
-  <?= $this->sortBox ?>
+  <?= $this->sortBox; ?>
 <?php endif ?>
-  <?= $this->limiter ?>
-  <?= $this->paginator ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
 <?php if (! $this->compact): ?>
-  <?= $this->filterEditor ?>
+  <?= $this->filterEditor; ?>
 <?php endif ?>
 </div>
 <div class="content memberships">
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 98493f1ea..72cffa19b 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -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 {
   table.member-list {
     th.member-remove {