From 3d9fb846ed28aeff4e14bd007348a23f70989ee7 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 29 Jun 2015 11:15:23 +0200
Subject: [PATCH] Services: add tabs, remove menu item & legacy actions

---
 application/controllers/ListController.php | 24 ++--------------------
 configuration.php                          |  2 --
 library/Director/ActionController.php      | 11 ++++++++++
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index f69406fb..a89ea308 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -41,6 +41,7 @@ class Director_ListController extends ActionController
 
     public function servicesAction()
     {
+        $this->setHostTabs()->activate('services');
         $this->view->addLink = $this->view->qlink(
             $this->translate('Add Service'),
             'director/object/service'
@@ -52,6 +53,7 @@ class Director_ListController extends ActionController
 
     public function servicegroupsAction()
     {
+        $this->setHostTabs()->activate('servicegroups');
         $this->view->addLink = $this->view->qlink(
             $this->translate('Add Servicegroup'),
             'director/object/servicegroup'
@@ -61,28 +63,6 @@ class Director_ListController extends ActionController
         $this->render('table');
     }
 
-    public function servicegroupmembersAction()
-    {
-        $this->view->addLink = $this->view->qlink(
-            $this->translate('Add Servicegroup Member'),
-            'director/object/servicegroupmember'
-        );
-        $this->view->title = $this->translate('Icinga Servicegroup Members');
-        $this->view->table = $this->loadTable('icingaServiceGroupMember')->setConnection($this->db());
-        $this->render('table');
-    }
-
-    public function servicevarsAction()
-    {
-        $this->view->addLink = $this->view->qlink(
-            $this->translate('Add Service Variable'),
-            'director/object/servicevar'
-        );
-        $this->view->title = $this->translate('Icinga Service Variables');
-        $this->view->table = $this->loadTable('icingaServiceVar')->setConnection($this->db());
-        $this->render('table');
-    }
-
     public function commandsAction()
     {
         $this->view->addLink = $this->view->qlink(
diff --git a/configuration.php b/configuration.php
index f6656e8f..6c32a297 100644
--- a/configuration.php
+++ b/configuration.php
@@ -24,8 +24,6 @@ $section->add($this->translate('Hosts'))
 // SERVICE
 $section->add($this->translate('Services'))
     ->setUrl('director/list/services');
-$section->add($this->translate('Servicegroups'))
-    ->setUrl('director/list/servicegroups');
 
 // USER
 $section->add($this->translate('Users'))
diff --git a/library/Director/ActionController.php b/library/Director/ActionController.php
index 5025a353..c2247c9e 100644
--- a/library/Director/ActionController.php
+++ b/library/Director/ActionController.php
@@ -57,6 +57,17 @@ abstract class ActionController extends Controller
         return $this->view->tabs;
     }
 
+    protected function setServiceTabs()
+    {
+        $this->view->tabs = Widget::create('tabs')->add('services', array(
+            'label' => $this->translate('Hosts'),
+            'url'   => 'director/list/services')
+        )->add('servicegroups', array(
+            'label' => $this->translate('Servicegroups'),
+            'url'   => 'director/list/servicegroups')
+        );
+        return $this->view->tabs;
+    }
 
     protected function setIcingaTabs()
     {