From 66fd7dfd9313f76911ffefdf568a674809665e67 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 16:35:27 +0200
Subject: [PATCH] ConfigController: Rename applicationAction to generalAction

---
 application/controllers/ConfigController.php     | 16 ++++++++--------
 .../config/{application.phtml => general.phtml}  |  0
 library/Icinga/Web/Menu.php                      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename application/views/scripts/config/{application.phtml => general.phtml} (100%)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 77b5b66d9..321fcf882 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -38,12 +38,12 @@ class ConfigController extends Controller
         $auth = $this->Auth();
         $allowedActions = array();
         if ($auth->hasPermission('config/application/general')) {
-            $tabs->add('application', array(
+            $tabs->add('general', array(
                 'title' => $this->translate('Adjust the general configuration of Icinga Web 2'),
-                'label' => $this->translate('Application'),
-                'url'   => 'config/application'
+                'label' => $this->translate('General'),
+                'url'   => 'config/general'
             ));
-            $allowedActions[] = 'application';
+            $allowedActions[] = 'general';
         }
         if ($auth->hasPermission('config/application/authentication')) {
             $tabs->add('authentication', array(
@@ -96,11 +96,11 @@ class ConfigController extends Controller
     }
 
     /**
-     * Application configuration
+     * General configuration
      *
-     * @throws SecurityException    If the user lacks the permission for configuring the application
+     * @throws SecurityException    If the user lacks the permission for configuring the general configuration
      */
-    public function applicationAction()
+    public function generalAction()
     {
         $this->assertPermission('config/application/general');
         $form = new GeneralConfigForm();
@@ -108,7 +108,7 @@ class ConfigController extends Controller
         $form->handleRequest();
 
         $this->view->form = $form;
-        $this->view->tabs->activate('application');
+        $this->view->tabs->activate('general');
     }
 
     /**
diff --git a/application/views/scripts/config/application.phtml b/application/views/scripts/config/general.phtml
similarity index 100%
rename from application/views/scripts/config/application.phtml
rename to application/views/scripts/config/general.phtml
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 1757f0e88..e5fd610ad 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -250,7 +250,7 @@ class Menu implements RecursiveIterator
                 'priority'      => 400
             ));
             $section->add(t('Application'), array(
-                'url'           => 'config/application',
+                'url'           => 'config',
                 'permission'    => 'config/application/*',
                 'priority'      => 450
             ));