From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 20 May 2013 17:11:53 +0000 (+0200)
Subject: Resolved some todos
X-Git-Tag: 2.0.0_Beta_1~136^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5859790d4be87846d718484a7dfe8ec701271c16;p=GitHub%2FWoltLab%2FWCF.git

Resolved some todos
---

diff --git a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
index d961da3a13..c7d6d615f0 100644
--- a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
@@ -214,29 +214,28 @@
 				<fieldset>
 					<legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
 					
-					<dl{if $errorField == 'from'} class="formError"{/if}>
-						<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
+					<dl{if $errorField == 'subject'} class="formError"{/if}>
+						<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
 						<dd>
-							<input type="email" id="from" name="from" value="{$from}" class="medium" />
-							{if $errorField == 'from'}
+							<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
+							{if $errorField == 'subject'}
 								<small class="innerError">
 									{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
 								</small>
 							{/if}
-							<small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
 						</dd>
 					</dl>
 					
-					<dl{if $errorField == 'subject'} class="formError"{/if}>
-						<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
+					<dl{if $errorField == 'from'} class="formError"{/if}>
+						<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
 						<dd>
-							<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
-							{if $errorField == 'subject'}
+							<input type="email" id="from" name="from" value="{$from}" class="medium" />
+							{if $errorField == 'from'}
 								<small class="innerError">
 									{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
 								</small>
 							{/if}
-							<small>{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
+							<small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
 						</dd>
 					</dl>
 					
@@ -249,7 +248,6 @@
 									{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
 								</small>
 							{/if}
-							<small>{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
 						</dd>
 					</dl>
 					
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index aaa63f739a..35585de709 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -108,7 +108,7 @@
 							{/if}
 						</small>
 					{/if}
-					<small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small><!-- ToDo: Language variable contains paragraphs! -->
+					<small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
 				</dd>
 			</dl>
 			
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 44da9dcb64..ca31033088 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -769,9 +769,9 @@
 		<item name="wcf.acp.user.sendMail.all"><![CDATA[E-Mail an alle Benutzer senden]]></item>
 		<item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[E-Mail als HTML versenden]]></item>
 		<item name="wcf.acp.user.sendMail.from"><![CDATA[Absender]]></item>
-		<item name="wcf.acp.user.sendMail.from.description"><![CDATA[<p>Hier können Sie die E-Mail-Adresse des Absenders definieren.{if MAIL_USE_FORMATTED_ADDRESS} Es ist auch folgendes Format möglich:{/if}</p>
-{if MAIL_USE_FORMATTED_ADDRESS}<p style="line-height: 2em;"><code>Absender Name &lt;email@absender.tld&gt;</code></p>{/if}
-<p>Wenn Sie unter <em>System -&gt; Optionen -&gt; Allgemein -&gt; E-Mails</em> alles ausgefüllt haben, wird dieses Feld automatisch ausgefüllt. Sollten Sie E-Mails per SMTP senden, so achten Sie darauf, dass die E-Mail-Adresse des Absenders auch vom Server akzeptiert werden muss.</p>]]></item>
+		<item name="wcf.acp.user.sendMail.from.description"><![CDATA[Hier können Sie die E-Mail-Adresse des Absenders definieren.{if MAIL_USE_FORMATTED_ADDRESS} Es ist auch folgendes Format möglich:{/if}<br />
+{if MAIL_USE_FORMATTED_ADDRESS}<em>Absender Name &lt;email@absender.tld&gt;</em><br />{/if}
+Wenn Sie unter <em>System -&gt; Optionen -&gt; Allgemein -&gt; E-Mails</em> alles ausgefüllt haben, wird dieses Feld automatisch ausgefüllt. Sollten Sie E-Mails per SMTP senden, so achten Sie darauf, dass die E-Mail-Adresse des Absenders auch vom Server akzeptiert werden muss.]]></item>
 		<item name="wcf.acp.user.sendMail.group"><![CDATA[E-Mail an Gruppenmitglieder senden]]></item>
 		<item name="wcf.acp.user.sendMail.groups"><![CDATA[E-Mail an die Mitglieder folgender Benutzergruppen senden]]></item>
 		<item name="wcf.acp.user.sendMail.mail"><![CDATA[E-Mail]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index ca722b0640..7cb5034198 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -769,9 +769,9 @@
 		<item name="wcf.acp.user.sendMail.all"><![CDATA[Send email to all users]]></item>
 		<item name="wcf.acp.user.sendMail.enableHTML"><![CDATA[Enable HTML for email]]></item>
 		<item name="wcf.acp.user.sendMail.from"><![CDATA[Sender]]></item>
-		<item name="wcf.acp.user.sendMail.from.description"><![CDATA[<p>Specify the sender’s email address.{if MAIL_USE_FORMATTED_ADDRESS} It is possible to use the following format:{/if}</p>
-{if MAIL_USE_FORMATTED_ADDRESS}<p style="line-height: 2em;"><code>Sender Name &lt;email@example.com&gt;</code></p>{/if}
-<p>You can define the default sender in <em>System -&gt; Options -&gt; General -&gt; Emails</em>. The sender’s email must be known to the server if using SMTP, otherwise it would be rejected.</p>]]></item>
+		<item name="wcf.acp.user.sendMail.from.description"><![CDATA[Specify the sender’s email address.{if MAIL_USE_FORMATTED_ADDRESS} It is possible to use the following format:{/if}<br />
+{if MAIL_USE_FORMATTED_ADDRESS}<em>Sender Name &lt;email@example.com&gt;</em><br />{/if}
+You can define the default sender in <em>System -&gt; Options -&gt; General -&gt; Emails</em>. The sender’s email must be known to the server if using SMTP, otherwise it would be rejected.]]></item>
 		<item name="wcf.acp.user.sendMail.group"><![CDATA[Email to user group]]></item>
 		<item name="wcf.acp.user.sendMail.groups"><![CDATA[Send email to members of the following user groups]]></item>
 		<item name="wcf.acp.user.sendMail.mail"><![CDATA[Email]]></item>