From 6abcb65273fbcfaa4b84ff6dbc78dde080e564f2 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Fri, 11 Mar 2016 11:38:49 +0100
Subject: [PATCH] Fixed issue #10731: Configuration menu reviewed

---
 .../views/admin/super/_configuration_menu.php | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/application/views/admin/super/_configuration_menu.php b/application/views/admin/super/_configuration_menu.php
index b872870939e..f29f69c9fc8 100644
--- a/application/views/admin/super/_configuration_menu.php
+++ b/application/views/admin/super/_configuration_menu.php
@@ -118,16 +118,33 @@
         <!-- Advanced -->
 
         <li class="col-sm-2">
-            <?php if(Permission::model()->hasGlobalPermission('superadmin','read')): ?>
-                <ul>
+            <ul>
 
-                    <!-- Advanced -->
-                    <li class="dropdown-header">
-                        <span class="icon-tools" ></span>
-                        <?php eT('Advanced');?>
+                <!-- Advanced -->
+                <li class="dropdown-header">
+                    <span class="icon-tools" ></span>
+                    <?php eT('Advanced');?>
+                </li>
+                <?php if(Permission::model()->hasGlobalPermission('templates','read')): ?>
+                    <!-- Template Editor -->
+                    <li class="dropdown-item">
+                        <a href="<?php echo $this->createUrl("admin/templates/sa/view"); ?>">
+                            <?php eT("Template editor");?>
+                        </a>
                     </li>
+                    <?php endif;?>
+                <?php if(Permission::model()->hasGlobalPermission('labelsets','read')): ?>
+                    <!-- Edit label sets -->
+                    <li class="dropdown-item">
+                        <a href="<?php echo $this->createUrl("admin/labels/sa/view"); ?>">
+                            <?php eT("Manage label sets");?>
+                        </a>
+                    </li>
+                    <?php endif;?>
+
+                <!-- Check Data Integrity -->
+                <?php if(Permission::model()->hasGlobalPermission('superadmin','read')): ?>
 
-                    <!-- Check Data Integrity -->
                     <li class="dropdown-item">
                         <a href="<?php echo $this->createUrl("admin/checkintegrity"); ?>">
                             <?php eT("Check data integrity");?>
@@ -141,14 +158,9 @@
                         </a>
                     </li>
 
-                    <!-- Plugin manager -->
-                    <li class="dropdown-item">
-                        <a href="<?php echo $this->createUrl("/admin/pluginmanager/sa/index"); ?>">
-                            <?php eT("Plugin manager");?>
-                        </a>
-                    </li>
-                </ul>
-                <?php endif;?>
+                    <?php endif;?>
+                <!-- Plugin manager -->
+            </ul>
 
         </li>
 
@@ -223,23 +235,13 @@
                             <?php eT("Global settings");?>
                         </a>
                     </li>
-                    <?php endif;?>
-                <?php if(Permission::model()->hasGlobalPermission('labelsets','read')): ?>
-                    <!-- Edit label sets -->
-                    <li class="dropdown-item">
-                        <a href="<?php echo $this->createUrl("admin/labels/sa/view"); ?>">
-                            <?php eT("Edit label sets");?>
-                        </a>
-                    </li>
-                    <?php endif;?>
-                <?php if(Permission::model()->hasGlobalPermission('templates','read')): ?>
-                    <!-- Template Editor -->
                     <li class="dropdown-item">
-                        <a href="<?php echo $this->createUrl("admin/templates/sa/view"); ?>">
-                            <?php eT("Template editor");?>
+                        <a href="<?php echo $this->createUrl("/admin/pluginmanager/sa/index"); ?>">
+                            <?php eT("Plugin manager");?>
                         </a>
                     </li>
                     <?php endif;?>
+
             </ul>
         </li>
     </ul>