Overhauled configuration section in acp menu

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index d5810dda14cc7459e8760820ebfb0c3dd74d7045..bc44b13051427fc371b9556d5d28977ca79ab40e 100644 (file)
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -18,41 +18,6 @@
                                <parent>wcf.acp.menu.link.option</parent>
                                <showorder>1</showorder>
                        </acpmenuitem>
-                       
-                       <acpmenuitem name="wcf.acp.menu.link.option.management">
-                               <parent>wcf.acp.menu.link.option</parent>
-                               <showorder>2</showorder>
-                       </acpmenuitem>
-                       
-                       <acpmenuitem name="wcf.acp.menu.link.activityPoint">
-                               <parent>wcf.acp.menu.link.option</parent>
-                               <controller><![CDATA[wcf\acp\form\UserActivityPointOptionForm]]></controller>
-                               <permissions>admin.user.canEditActivityPoints</permissions>
-                       </acpmenuitem>
-                       
-                       <acpmenuitem name="wcf.acp.menu.link.notificationPresetSettings">
-                               <parent>wcf.acp.menu.link.option</parent>
-                               <controller><![CDATA[wcf\acp\form\NotificationPresetSettingsForm]]></controller>
-                               <permissions>admin.user.canEditUser</permissions>
-                       </acpmenuitem>
-                       
-                       <acpmenuitem name="wcf.acp.menu.link.userOptionDefaults">
-                               <controller><![CDATA[wcf\acp\form\UserOptionSetDefaultsForm]]></controller>
-                               <parent>wcf.acp.menu.link.option</parent>
-                               <permissions>admin.user.canManageUserOption</permissions>
-                       </acpmenuitem>
-                       
-                       <acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
-                               <parent>wcf.acp.menu.link.option</parent>
-                               <controller><![CDATA[wcf\acp\page\CaptchaQuestionListPage]]></controller>
-                               <permissions>admin.captcha.canManageCaptchaQuestion</permissions>
-                       </acpmenuitem>
-                       <acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
-                               <parent>wcf.acp.menu.link.captcha.question.list</parent>
-                               <controller><![CDATA[wcf\acp\form\CaptchaQuestionAddForm]]></controller>
-                               <permissions>admin.captcha.canManageCaptchaQuestion</permissions>
-                               <icon>fa-plus</icon>
-                       </acpmenuitem>
                        <!-- /option -->
                        
                        <!-- package -->
@@ -88,6 +53,36 @@
                        </acpmenuitem>
                        <!-- /package -->
                
+                       <!-- other -->
+                       <acpmenuitem name="wcf.acp.menu.link.other">
+                               <parent>wcf.acp.menu.link.configuration</parent>
+                               <showorder>3</showorder>
+                       </acpmenuitem>
+                       <acpmenuitem name="wcf.acp.menu.link.activityPoint">
+                               <parent>wcf.acp.menu.link.other</parent>
+                               <controller><![CDATA[wcf\acp\form\UserActivityPointOptionForm]]></controller>
+                               <permissions>admin.user.canEditActivityPoints</permissions>
+                       </acpmenuitem>
+                       
+                       <acpmenuitem name="wcf.acp.menu.link.notificationPresetSettings">
+                               <parent>wcf.acp.menu.link.other</parent>
+                               <controller><![CDATA[wcf\acp\form\NotificationPresetSettingsForm]]></controller>
+                               <permissions>admin.user.canEditUser</permissions>
+                       </acpmenuitem>
+                       
+                       <acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
+                               <parent>wcf.acp.menu.link.other</parent>
+                               <controller><![CDATA[wcf\acp\page\CaptchaQuestionListPage]]></controller>
+                               <permissions>admin.captcha.canManageCaptchaQuestion</permissions>
+                       </acpmenuitem>
+                       <acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
+                               <parent>wcf.acp.menu.link.captcha.question.list</parent>
+                               <controller><![CDATA[wcf\acp\form\CaptchaQuestionAddForm]]></controller>
+                               <permissions>admin.captcha.canManageCaptchaQuestion</permissions>
+                               <icon>fa-plus</icon>
+                       </acpmenuitem>
+                       <!-- /other -->
+               
                <!-- /configuration -->
                
                <!-- user -->
@@ -215,6 +210,12 @@
                                <permissions>admin.user.canManageUserOption</permissions>
                                <icon>fa-plus</icon>
                        </acpmenuitem>
+               
+                       <acpmenuitem name="wcf.acp.menu.link.userOptionDefaults">
+                               <controller><![CDATA[wcf\acp\form\UserOptionSetDefaultsForm]]></controller>
+                               <parent>wcf.acp.menu.link.user.option</parent>
+                               <permissions>admin.user.canManageUserOption</permissions>
+                       </acpmenuitem>
                        <!-- /option -->
                        
                        <!-- notice -->

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index c12bf9810aef3bb32a0e7eec5b18659cdc78bbd0..d8a876dcf77564366c6f57fbc0911b8760155a96 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -12,7 +12,7 @@
                                <category name="module.user">
                                        <parent>module</parent>
                                </category>
-                               <category name="module.display">
+                               <category name="module.customization">
                                        <parent>module</parent>
                                </category>
                                <category name="module.content">
@@ -339,7 +339,7 @@
                        </option>
                        
                        <option name="module_smiley">
-                               <categoryname>module.content</categoryname>
+                               <categoryname>module.customization</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
                        </option>
@@ -400,7 +400,7 @@
                        </option>
                        
                        <option name="module_wcf_ad">
-                               <categoryname>module.display</categoryname>
+                               <categoryname>module.customization</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
                        </option>

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 9819df91c101c3a9990622588072bdb41a8dc36f..ffa05a6fd44fa6846848c45fbe989500dbd1e9b1 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -724,6 +724,7 @@
                <item name="wcf.acp.menu.item.link.internal"><![CDATA[Interner Link]]></item>
                <item name="wcf.acp.menu.item.list"><![CDATA[Menüpunkte]]></item>
                <item name="wcf.acp.menu.item.parentItem"><![CDATA[Übergeordneter Menüpunkt]]></item>
+               <item name="wcf.acp.menu.link.other"><![CDATA[Sonstiges]]></item>
        </category>
        
        <category name="wcf.acp.notice">
@@ -803,7 +804,7 @@
                <item name="wcf.acp.option.category.module.user"><![CDATA[Benutzer]]></item>
                <item name="wcf.acp.option.category.module.system"><![CDATA[System]]></item>
                <item name="wcf.acp.option.category.module.community"><![CDATA[Community]]></item>
-               <item name="wcf.acp.option.category.module.display"><![CDATA[Darstellung]]></item>
+               <item name="wcf.acp.option.category.module.customization"><![CDATA[Anpassung]]></item>
                <item name="wcf.acp.option.category.security"><![CDATA[Sicherheit]]></item>
                <item name="wcf.acp.option.category.security.blacklist"><![CDATA[Blacklist]]></item>
                <item name="wcf.acp.option.category.security.general"><![CDATA[Allgemein]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 7f7dbbbb0095aaf2f63ec3a42e98ea7dcac66807..cc7c35608ce508ec50e83eca4b64d653b6d06b9a 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -722,6 +722,7 @@ Examples for medium ID detection:
                <item name="wcf.acp.menu.item.link.internal"><![CDATA[Internal link]]></item>
                <item name="wcf.acp.menu.item.list"><![CDATA[Menu Items]]></item>
                <item name="wcf.acp.menu.item.parentItem"><![CDATA[Parent Menu Item]]></item>
+               <item name="wcf.acp.menu.link.other"><![CDATA[Other]]></item>
        </category>
        
        <category name="wcf.acp.notice">
@@ -802,7 +803,7 @@ Examples for medium ID detection:
                <item name="wcf.acp.option.category.module.user"><![CDATA[Users]]></item>
                <item name="wcf.acp.option.category.module.system"><![CDATA[System]]></item>
                <item name="wcf.acp.option.category.module.community"><![CDATA[Community]]></item>
-               <item name="wcf.acp.option.category.module.display"><![CDATA[Appearance]]></item>
+               <item name="wcf.acp.option.category.module.customization"><![CDATA[Customization]]></item>
                <item name="wcf.acp.option.category.security"><![CDATA[Security]]></item>
                <item name="wcf.acp.option.category.security.blacklist"><![CDATA[Blacklist]]></item>
                <item name="wcf.acp.option.category.security.general"><![CDATA[General]]></item>