From 94cd4b91e545c4b79a703802e2c7f05fcde28211 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 20 May 2015 15:54:47 +0200
Subject: [PATCH] GroupController: Just show a group's name when listing groups

refs #8826
---
 application/controllers/GroupController.php |  8 +------
 application/views/scripts/group/list.phtml  | 12 -----------
 public/css/icinga/main-content.less         | 23 +++++++++------------
 3 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 4a0652e4e..45d677e50 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -64,13 +64,7 @@ class GroupController extends Controller
             return;
         }
 
-        $query = $backend->select(array(
-            'group_name',
-            'parent_name',
-            'created_at',
-            'last_modified'
-        ));
-
+        $query = $backend->select(array('group_name'));
         $filterEditor = Widget::create('filterEditor')
             ->setQuery($query)
             ->preserveParams('limit', 'sort', 'dir', 'view', 'backend')
diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 3d9afd9b4..05b79d5f7 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -36,9 +36,6 @@ if (count($groups) > 0): ?>
   <thead>
     <tr>
       <th class="group-name"><?= $this->translate('Group'); ?></th>
-      <th class="group-parent"><?= $this->translate('Parent'); ?></th>
-      <th class="group-created"><?= $this->translate('Created at'); ?></th>
-      <th class="group-modified"><?= $this->translate('Last modified'); ?></th>
      <?php if ($reducible): ?>
       <th class="group-remove"><?= $this->translate('Remove'); ?></th>
      <?php endif ?>
@@ -48,15 +45,6 @@ if (count($groups) > 0): ?>
   <?php foreach ($groups as $group): ?>
     <tr>
       <td clas="group-name"><?= $this->escape($group->group_name); ?></td>
-      <td class="group-parent">
-        <?= $group->parent_name === null ? $this->translate('None', 'user.group.parent') : $this->escape($group->parent_name); ?>
-      </td>
-      <td class="group-created">
-        <?= $group->created_at === null ? $this->translate('N/A') : date('d/m/Y g:i A', $group->created_at); ?>
-      </td>
-      <td class="group-modified">
-        <?= $group->last_modified === null ? $this->translate('Never') : date('d/m/Y g:i A', $group->last_modified); ?>
-      </td>
      <?php if ($reducible): ?>
       <td class="group-remove">
         <?= $this->qlink(
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 82c58674c..bea9b4a0f 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -243,21 +243,13 @@ div.controls div.user-header {
 
 div.content.groups {
   table.group-list {
-    th {
-      &.group-parent, &.group-remove {
-        width: 6%;
-        padding-right: 0.5em;
-        text-align: right;
-      }
-
-      &.group-created, &.group-modified {
-        width: 12%;
-        padding-right: 0.5em;
-        text-align: right;
-      }
+    th.group-remove {
+      width: 8em;
+      padding-right: 0.5em;
+      text-align: right;
     }
 
-    td.group-parent, td.group-created, td.group-modified, td.group-remove {
+    td.group-remove {
       text-align: right;
     }
   }
@@ -265,6 +257,11 @@ div.content.groups {
   p {
     margin-top: 0;
   }
+
+  a.group-add {
+    display: block;
+    margin-top: 1em;
+  }
 }
 
 form.backend-selection {