From c7ce1498bf34efc435d2fa8d2252eb25c50c297d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 1 Jun 2015 16:10:23 +0200
Subject: [PATCH] Introduce menu entry "Configuration"

---
 library/Icinga/Web/Menu.php          | 35 ++++++++++++++++------------
 modules/doc/configuration.php        |  4 ++--
 modules/monitoring/configuration.php |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 014909ff0..7e092cc92 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -233,50 +233,55 @@ class Menu implements RecursiveIterator
             ));
 
             $section = $this->add(t('System'), array(
-                'icon'     => 'wrench',
+                'icon'     => 'services',
                 'priority' => 200,
                 'renderer' => 'ProblemMenuItemRenderer'
             ));
+            if (Logger::writesToFile()) {
+                $section->add(t('Application Log'), array(
+                    'url'      => 'list/applicationlog',
+                    'priority' => 300
+                ));
+            }
+
+            $section = $this->add(t('Configuration'), array(
+                'icon'          => 'wrench',
+                'permission'    => 'config/*',
+                'priority'      => 400
+            ));
             $section->add(t('User-Management'), array(
                 'url'           => 'user/list',
                 'permission'    => 'config/application/*',
-                'priority'      => 300
+                'priority'      => 500
             ));
             $section->add(t('UserGroupBackends'), array(
                 'url'           => 'usergroupbackend/list',
                 'permission'    => 'config/application/usergroupbackend/*',
-                'priority'      => 301
+                'priority'      => 510
             ));
             $section->add(t('Configuration'), array(
                 'url'           => 'config',
                 'permission'    => 'config/application/*',
-                'priority'      => 400
+                'priority'      => 600
             ));
             $section->add(t('Modules'), array(
                 'url'           => 'config/modules',
                 'permission'    => 'config/modules',
-                'priority'      => 500
+                'priority'      => 700
             ));
 
-            if (Logger::writesToFile()) {
-                $section->add(t('Application Log'), array(
-                    'url'      => 'list/applicationlog',
-                    'priority' => 600
-                ));
-            }
-
             $section = $this->add($auth->getUser()->getUsername(), array(
                 'icon'     => 'user',
-                'priority' => 700
+                'priority' => 800
             ));
             $section->add(t('Preferences'), array(
                 'url'      => 'preference',
-                'priority' => 701
+                'priority' => 810
             ));
 
             $section->add(t('Logout'), array(
                 'url'      => 'authentication/logout',
-                'priority' => 800,
+                'priority' => 890,
                 'renderer' => 'ForeignMenuItemRenderer'
             ));
         }
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php
index 031a62e64..ee3d9ebdd 100644
--- a/modules/doc/configuration.php
+++ b/modules/doc/configuration.php
@@ -7,7 +7,7 @@ $section = $this->menuSection($this->translate('Documentation'), array(
     'title'    => 'Documentation',
     'icon'     => 'book',
     'url'      => 'doc',
-    'priority' => 190
+    'priority' => 390
 ));
 
 $section->add('Icinga Web 2', array(
@@ -18,7 +18,7 @@ $section->add('Module documentations', array(
 ));
 $section->add($this->translate('Developer - Style'), array(
     'url' => 'doc/style/guide',
-    'priority' => 200,
+    'priority' => 399
 ));
 
 $this->provideSearchUrl($this->translate('Doc'), 'doc/search', -10);
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index fd3ee334d..aa3b4a2fd 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -208,7 +208,7 @@ $section->add($this->translate('Alert Summary'), array(
 $section = $this->menuSection($this->translate('System'));
 $section->add($this->translate('Monitoring Health'), array(
     'url'      => 'monitoring/process/info',
-    'priority' => 120,
+    'priority' => 220,
     'renderer'  => 'Icinga\Module\Monitoring\Web\Menu\BackendAvailabilityMenuItemRenderer'
 ));