From: Marcel Werk Date: Wed, 29 May 2013 15:15:09 +0000 (+0200) Subject: Small optimization X-Git-Tag: 2.0.0_Beta_1^0 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d26c957b698bd149a4bf1b03a198de597a14ff16;p=GitHub%2FWoltLab%2FWCF.git Small optimization --- diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml index 431929bd46..99f3c3fca3 100644 --- a/com.woltlab.wcf/acpMenu.xml +++ b/com.woltlab.wcf/acpMenu.xml @@ -24,7 +24,6 @@ wcf.acp.menu.link.option.management - 1 @@ -36,39 +35,28 @@ admin.system.package.canInstallPackage,admin.system.package.canUpdatePackage,admin.system.package.canUninstallPackage,admin.system.package.canEditServer - - wcf.acp.menu.link.package - 1 - - - wcf.acp.menu.link.package.management + wcf.acp.menu.link.package admin.system.canManageApplication - wcf.acp.menu.link.package.management + wcf.acp.menu.link.package admin.system.package.canUpdatePackage,admin.system.package.canUninstallPackage - wcf.acp.menu.link.package.management - admin.system.package.canInstallPackage - - - wcf.acp.menu.link.package - 2 + admin.system.package.canInstallPackage - wcf.acp.menu.link.package.server + wcf.acp.menu.link.package admin.system.package.canEditServer - 1 @@ -141,49 +129,35 @@ 1 - - wcf.acp.menu.link.user.management - 1 - - wcf.acp.menu.link.user.management.general + wcf.acp.menu.link.user.management admin.user.canSearchUser - 1 - wcf.acp.menu.link.user.management.general + wcf.acp.menu.link.user.management admin.user.canSearchUser - 2 - wcf.acp.menu.link.user.management.general - admin.user.canAddUser - 3 - - - wcf.acp.menu.link.user.management - 2 + admin.user.canAddUser - wcf.acp.menu.link.user.management.additional + wcf.acp.menu.link.user.management admin.user.canEditUser,admin.user.canDeleteUser,admin.user.canMailUser - 1 - wcf.acp.menu.link.user.management.additional + wcf.acp.menu.link.user.management admin.user.canMailUser - 2 @@ -199,43 +173,48 @@ 2 - - wcf.acp.menu.link.group - 1 - - - wcf.acp.menu.link.group.general + wcf.acp.menu.link.group admin.user.canEditGroup,admin.user.canDeleteGroup - 1 - wcf.acp.menu.link.group.general - admin.user.canAddGroup - 2 - - - wcf.acp.menu.link.group - 2 + admin.user.canAddGroup - wcf.acp.menu.link.group.additional + wcf.acp.menu.link.group admin.user.canMailUser - 1 + + wcf.acp.menu.link.user + module_user_rank + 3 + + + + wcf.acp.menu.link.user.rank + + admin.user.rank.canManageRank + + + + wcf.acp.menu.link.user.rank + + admin.user.rank.canManageRank + + wcf.acp.menu.link.user - 3 + 4 @@ -267,47 +246,10 @@ - - wcf.acp.menu.link.user - module_user_rank - - - - wcf.acp.menu.link.user.rank - - admin.user.rank.canManageRank - - - - wcf.acp.menu.link.user.rank - - admin.user.rank.canManageRank - - 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 @@ -318,27 +260,44 @@ wcf.acp.menu.link.style admin.style.canManageStyle - 1 wcf.acp.menu.link.style admin.style.canManageStyle - 2 wcf.acp.menu.link.style admin.style.canManageStyle - 3 + + + wcf.acp.menu.link.display + 2 + + + + + wcf.acp.menu.link.pageMenu + admin.display.canManagePageMenu + + + + + wcf.acp.menu.link.pageMenu + admin.display.canManagePageMenu + + + wcf.acp.menu.link.display + 3 @@ -365,6 +324,7 @@ wcf.acp.menu.link.display + 4 @@ -406,142 +366,121 @@ 4 - - wcf.acp.menu.link.content - - - - - wcf.acp.menu.link.attachment - admin.attachment.canManageAttachment - - - - wcf.acp.menu.link.content - - - - - wcf.acp.menu.link.bbcode - admin.content.bbcode.canManageBBCode - 1 - - - - - wcf.acp.menu.link.bbcode - admin.content.bbcode.canManageBBCode - 2 - - - - - wcf.acp.menu.link.bbcode - admin.content.bbcode.canManageBBCode - 3 - - - - - wcf.acp.menu.link.bbcode - admin.content.bbcode.canManageBBCode - 4 - - wcf.acp.menu.link.content + 1 - wcf.acp.menu.link.smiley admin.content.smiley.canManageSmiley - 1 - wcf.acp.menu.link.smiley admin.content.smiley.canManageSmiley - 2 - wcf.acp.menu.link.smiley admin.content.smiley.canManageSmiley - 3 - wcf.acp.menu.link.smiley admin.content.smiley.canManageSmiley - 4 - - - - wcf.acp.menu.link.content - - - - wcf.acp.menu.link.dashboard - - admin.content.dashboard.canEditDashboard wcf.acp.menu.link.content + 2 - wcf.acp.menu.link.label admin.content.label.canManageLabel - 1 - wcf.acp.menu.link.label admin.content.label.canManageLabel - 2 - wcf.acp.menu.link.label admin.content.label.canManageLabel - 3 - wcf.acp.menu.link.label admin.content.label.canManageLabel - 4 + + + + wcf.acp.menu.link.content + 3 + + + + wcf.acp.menu.link.bbcode + admin.content.bbcode.canManageBBCode + + + + wcf.acp.menu.link.bbcode + admin.content.bbcode.canManageBBCode + + + + wcf.acp.menu.link.bbcode + admin.content.bbcode.canManageBBCode + + + + wcf.acp.menu.link.bbcode + admin.content.bbcode.canManageBBCode wcf.acp.menu.link.content + 4 wcf.acp.menu.link.tag admin.content.tag.canManageTag - 1 wcf.acp.menu.link.tag admin.content.tag.canManageTag - 2 + + + + wcf.acp.menu.link.content + 5 + + + + + wcf.acp.menu.link.attachment + admin.attachment.canManageAttachment 5 + + + wcf.acp.menu.link.community + + + + wcf.acp.menu.link.dashboard + + admin.content.dashboard.canEditDashboard + diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml index 9964a11b27..1ea2a76e57 100644 --- a/com.woltlab.wcf/userGroupOption.xml +++ b/com.woltlab.wcf/userGroupOption.xml @@ -3,30 +3,29 @@ - - user - - - user.message - - - user.message - user user.profile - user.profile - user.profile + + user + + + user.message + + + user.message + + mod diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index 4393caede4..40327424a8 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -60,7 +60,7 @@
- + {if $errorType.priority|isset} {lang}wcf.acp.group.priority.error.{@$errorType.priority}{/lang}