Small optimizations

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 9d52085e89a57f9ebf21a43a6fd0b9f76bb66ffe..398bf21750bfc118b9d25771bee91a2f2cfe44aa 100644 (file)
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -148,25 +148,24 @@
                        <parent>wcf.acp.menu.link.user.management</parent>
                        <showorder>1</showorder>
                </acpmenuitem>
+               <acpmenuitem name="wcf.acp.menu.link.user.search">
+                       <controller><![CDATA[wcf\acp\form\UserSearchForm]]></controller>
+                       <parent>wcf.acp.menu.link.user.management.general</parent>
+                       <permissions>admin.user.canSearchUser</permissions>
+                       <showorder>1</showorder>
+               </acpmenuitem>
                
                <acpmenuitem name="wcf.acp.menu.link.user.list">
                        <controller><![CDATA[wcf\acp\page\UserListPage]]></controller>
                        <parent>wcf.acp.menu.link.user.management.general</parent>
                        <permissions>admin.user.canSearchUser</permissions>
-                       <showorder>1</showorder>
+                       <showorder>2</showorder>
                </acpmenuitem>
                
                <acpmenuitem name="wcf.acp.menu.link.user.add">
                        <controller><![CDATA[wcf\acp\form\UserAddForm]]></controller>
                        <parent>wcf.acp.menu.link.user.management.general</parent>
                        <permissions>admin.user.canAddUser</permissions>
-                       <showorder>2</showorder>
-               </acpmenuitem>
-               
-               <acpmenuitem name="wcf.acp.menu.link.user.search">
-                       <controller><![CDATA[wcf\acp\form\UserSearchForm]]></controller>
-                       <parent>wcf.acp.menu.link.user.management.general</parent>
-                       <permissions>admin.user.canSearchUser</permissions>
                        <showorder>3</showorder>
                </acpmenuitem>
                

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 638bc0b99b2dd514118cb701b7d8086d5cc42baf..4b2f3345d6bb3ff95361fe33d775da4ceda8509f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -28,7 +28,6 @@
        <nav>
                <ul>
                        <li><a href="{link controller='UserList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
-                       <li><a href="{link controller='UserSearch'}{/link}" class="button"><span class="icon icon16 icon-search"></span> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        
                        {event name='contentNavigationButtons'}
                </ul>

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index d31ebbe600bdb5aacdef2280007230fede222e48..6014197b3ae64bdd4f6570e43eef87251eb121e0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -39,7 +39,6 @@
                        {if $__wcf->session->getPermission('admin.user.canAddUser')}
                                <li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                        {/if}
-                       <li><a href="{link controller='UserSearch'}{/link}" class="button"><span class="icon icon16 icon-search"></span> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        
                        {event name='contentNavigationButtonsTop'}
                </ul>
@@ -107,7 +106,6 @@
                                {if $__wcf->session->getPermission('admin.user.canAddUser')}
                                        <li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                                {/if}
-                               <li><a href="{link controller='UserSearch'}{/link}" class="button"><span class="icon icon16 icon-search"></span> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                                
                                {event name='contentNavigationButtonsBottom'}
                        </ul>

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index be594950e9bc61443d274c42f1d0c51e633c6953..3927e669edffef662e6fabbf4d9e3ce50d3f7c51 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -20,11 +20,6 @@
 <div class="contentNavigation">
        <nav>
                <ul>
-                       {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                               <li><a href="{link controller='UserAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
-                       {/if}
-                       <li><a href="{link controller='UserList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
-                       
                        {event name='contentNavigationButtons'}
                </ul>
        </nav>