Removed obsolete code

diff --git a/com.woltlab.wcf/clipboardAction.xml b/com.woltlab.wcf/clipboardAction.xml
index 42bc692bb9a432174130ce63363411ad473c913d..e4ed44b8da9ce2ae6b088aaf60daa4374e66dbd4 100644 (file)
--- a/com.woltlab.wcf/clipboardAction.xml
+++ b/com.woltlab.wcf/clipboardAction.xml
@@ -27,7 +27,7 @@
                
                <action name="sendMail">
                        <actionclassname><![CDATA[wcf\system\clipboard\action\UserClipboardAction]]></actionclassname>
-                       <showorder>4</showorder>
+                       <showorder>5</showorder>
                        <pages>
                                <page><![CDATA[wcf\acp\page\UserListPage]]></page>
                        </pages>
@@ -35,7 +35,7 @@
 
                <action name="exportMailAddress">
                        <actionclassname><![CDATA[wcf\system\clipboard\action\UserClipboardAction]]></actionclassname>
-                       <showorder>5</showorder>
+                       <showorder>6</showorder>
                        <pages>
                                <page><![CDATA[wcf\acp\page\UserListPage]]></page>
                        </pages>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
deleted file mode 100644 (file)
index 4eda716..0000000
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-{include file='header' pageTitle='wcf.acp.packageUpdate.auth'}
-
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.packageUpdate.auth{/lang}</h1>
-</header>
-
-{if $errorField}
-       <p class="error">{lang}wcf.global.form.error{/lang}</p>
-{/if}
-
-<form method="{$requestMethod}" action="index.php{if $getParameters}?{@$getParameters}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.packageUpdate.auth.data{/lang}</legend>
-                       
-                       <dl>
-                               <dt>{lang}wcf.acp.packageUpdate.auth.url{/lang}</dt>
-                               <dd>{$url}</dd>
-                       </dl>
-                       {if $realm}
-                               <dl>
-                                       <dt>{lang}wcf.acp.packageUpdate.auth.realm{/lang}</dt>
-                                       <dd>{$realm}</dd>
-                               </dl>
-                       {/if}
-                       {if $message}
-                               <dl>
-                                       <dt>{lang}wcf.acp.packageUpdate.auth.message{/lang}</dt>
-                                       <dd>{@$message}</dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='dataFields'}
-               </fieldset>
-               
-               <fieldset>
-                       <legend>{lang}wcf.acp.packageUpdate.auth.input{/lang}</legend>
-                       
-                       <dl{if $errorField == 'loginPassword'} class="wcf-formError"{/if}>
-                               <dt><label for="loginUsername">{lang}wcf.acp.packageUpdate.auth.loginUsername{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="long" />
-                                       <small>{lang}wcf.acp.packageUpdate.auth.loginUsername.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'loginPassword'} class="wcf-formError"{/if}>
-                               <dt><label for="loginPassword">{lang}wcf.acp.packageUpdate.auth.loginPassword{/lang}</label></dt>
-                               <dd>
-                                       <input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="medium" />
-                                       {if $errorField == 'loginPassword'}
-                                               <small class="wcf-innerError">
-                                                       {if $errorType == 'invalid'}{lang}wcf.acp.packageUpdate.auth.error{/lang}{/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt>
-                                       <label><input type="checkbox" id="saveAuthData" name="saveAuthData" value="1" {if $saveAuthData == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.auth.save{/lang}</label>
-                               </dt>
-                               <dd><small>{lang}wcf.acp.packageUpdate.auth.save.description{/lang}</small></dd>
-                       </dl>
-                       
-                       {event name='authFields'}
-               </fieldset>
-               
-               {event name='fieldsets'}
-       </div>
-       
-       <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               <input type="hidden" name="form" value="PackageUpdateAuth" />
-               <input type="hidden" name="id" value="{@$packageUpdateServerID}" />
-               {@$postParameters}
-       </div>
-</form>
-
-{include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 411d8ceb741722d3d50292ef675d777c560d6e12..5f631f964f1937a0cd446889bd9dbe15e19c996f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -35,7 +35,7 @@
                <fieldset>
                        <legend>{lang}wcf.acp.user.groups{/lang}</legend>
                        
-                       <dl{if $errorField == 'groupIDs'} class="wcf-formError"{/if}>
+                       <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
                                <dd>
                                        {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
                                        {if $errorField == 'groupIDs'}