From 27e16118314f53b2aff63f29ad4b64efdb9d9448 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 28 Sep 2015 18:28:46 +0200
Subject: [PATCH] Navigation: Change Config/Application tabs

refs #5543
---
 application/controllers/ConfigController.php     |  7 +++++--
 .../controllers/UsergroupbackendController.php   | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 5a33f9792..3df16630b 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -55,13 +55,13 @@ class ConfigController extends Controller
         $tabs = $this->getTabs();
         $tabs->add('userbackend', array(
             'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
-            'label' => $this->translate('User Backends'),
+            'label' => $this->translate('Authentication'),
             'url'   => 'config/userbackend',
             'baseTarget' => '_main'
         ));
         $tabs->add('usergroupbackend', array(
             'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
-            'label' => $this->translate('User Group Backends'),
+            'label' => $this->translate('User Groups'),
             'url'   => 'usergroupbackend/list',
             'baseTarget' => '_main'
         ));
@@ -95,6 +95,7 @@ class ConfigController extends Controller
 
         $this->view->form = $form;
         $this->createApplicationTabs()->activate('general');
+        $this->createAuthenticationTabs();
     }
 
     /**
@@ -199,6 +200,7 @@ class ConfigController extends Controller
         $form->handleRequest();
 
         $this->view->form = $form;
+        $this->createApplicationTabs();
         $this->createAuthenticationTabs()->activate('userbackend');
         $this->render('userbackend/reorder');
     }
@@ -337,6 +339,7 @@ class ConfigController extends Controller
         $this->assertPermission('config/application/resources');
         $this->view->resources = Config::app('resources', true);
         $this->createApplicationTabs()->activate('resource');
+        $this->createAuthenticationTabs();
     }
 
     /**
diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index 112a244c1..b2fb1d960 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -154,14 +154,26 @@ class UsergroupbackendController extends Controller
     protected function createListTabs()
     {
         $tabs = $this->getTabs();
+        $tabs->add('general', array(
+            'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
+            'label' => $this->translate('General'),
+            'url'   => 'config/general',
+            'baseTarget' => '_main'
+        ));
+        $tabs->add('resource', array(
+            'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
+            'label' => $this->translate('Resources'),
+            'url'   => 'config/resource',
+            'baseTarget' => '_main'
+        ));
         $tabs->add('userbackend', array(
             'title' => $this->translate('Configure how users authenticate with and log into Icinga Web 2'),
-            'label' => $this->translate('User Backends'),
+            'label' => $this->translate('Authentication'),
             'url'   => 'config/userbackend'
         ));
         $tabs->add('usergroupbackend', array(
             'title' => $this->translate('Configure how users are associated with groups by Icinga Web 2'),
-            'label' => $this->translate('User Group Backends'),
+            'label' => $this->translate('User Groups'),
             'url'   => 'usergroupbackend/list'
         ));
         return $tabs;