From: Alexander Ebert Date: Wed, 2 Jan 2013 00:01:31 +0000 (+0100) Subject: Merged com.woltlab.wcf.acp.style X-Git-Tag: 2.0.0_Beta_1~612 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6c80f0dfb3ec67d2285ba4625a2341a12261fad5;p=GitHub%2FWoltLab%2FWCF.git Merged com.woltlab.wcf.acp.style --- diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml index e54538c985..1a8f1ba5c4 100644 --- a/com.woltlab.wcf/acpMenu.xml +++ b/com.woltlab.wcf/acpMenu.xml @@ -254,7 +254,55 @@ 3 - + + + wcf.acp.menu.link.display + + + + + wcf.acp.menu.link.pageMenu + admin.display.canManagePageMenu + 1 + + + + + wcf.acp.menu.link.pageMenu + admin.display.canManagePageMenu + 2 + + + + + + wcf.acp.menu.link.display + 1 + + + + + wcf.acp.menu.link.style + admin.style.canEditStyle,admin.style.canDeleteStyle + 1 + + + + + wcf.acp.menu.link.style + admin.style.canAddStyle + 2 + + + + + wcf.acp.menu.link.style + admin.style.canAddStyle + 3 + + + + wcf.acp.menu.link.display @@ -292,27 +340,7 @@ wcf.acp.menu.link.language.server admin.language.canAddServer - - - - - wcf.acp.menu.link.display - - - - - wcf.acp.menu.link.pageMenu - admin.display.canManagePageMenu - 1 - - - - - wcf.acp.menu.link.pageMenu - admin.display.canManagePageMenu - 2 - - + 4 diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml index d1069f6033..70782701b0 100644 --- a/com.woltlab.wcf/userGroupOption.xml +++ b/com.woltlab.wcf/userGroupOption.xml @@ -208,6 +208,27 @@ 0 1 + + +