From 1aeec5df03baf242c4170cebe5464c8290b0a247 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 23 Aug 2009 15:08:37 +0000
Subject: [PATCH] Some more cleanup. Mostly whitespace changes.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10047 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../prosilver/template/captcha_default.html   |  5 +--
 .../styles/prosilver/template/captcha_qa.html |  2 +-
 .../prosilver/template/captcha_recaptcha.html | 16 ++++-----
 .../subsilver2/template/captcha_default.html  |  5 +--
 .../subsilver2/template/captcha_qa.html       |  6 ++--
 .../template/captcha_recaptcha.html           | 36 +++++++++----------
 6 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html
index 87a3ba1575..35771fce4e 100644
--- a/phpBB/styles/prosilver/template/captcha_default.html
+++ b/phpBB/styles/prosilver/template/captcha_default.html
@@ -6,8 +6,8 @@
 	<p>{L_CONFIRM_EXPLAIN}</p>
 
 	<fieldset class="fields2">
-
 <!-- ENDIF -->
+
 	<dl>
 		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
 		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
@@ -16,8 +16,9 @@
 		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
 		<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
 	</dl>
+
 <!-- IF S_TYPE == 1 -->
 	</fieldset>
 	<span class="corners-bottom"><span></span></span></div>
 </div>
-<!-- ENDIF -->
\ No newline at end of file
+<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html
index 9de9bb8dc7..fa64e76114 100644
--- a/phpBB/styles/prosilver/template/captcha_qa.html
+++ b/phpBB/styles/prosilver/template/captcha_qa.html
@@ -9,7 +9,7 @@
 	<dl>
 	<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
 	<dd>
-		<input type="text" tabindex="10" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />
+		<input type="text" tabindex="10" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
 		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
 	</dd>
 	</dl>
diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html
index 510a1d3124..18113b7632 100644
--- a/phpBB/styles/prosilver/template/captcha_recaptcha.html
+++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html
@@ -16,18 +16,18 @@
 		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
 		// <![CDATA[
 		var RecaptchaOptions = {
-		   lang : {L_RECAPTCHA_LANG}
+			lang : {L_RECAPTCHA_LANG}
 		};
 		// ]]>
 		</script>
 
-	<noscript>
-	<div>
-		<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
-		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-		<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
-	</div>
-	</noscript>
+		<noscript>
+		<div>
+			<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
+			<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+			<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
+		</div>
+		</noscript>
 
 	</dd>
 	</dl>
diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html
index 61fc4ad68c..76d0edbec4 100644
--- a/phpBB/styles/subsilver2/template/captcha_default.html
+++ b/phpBB/styles/subsilver2/template/captcha_default.html
@@ -9,7 +9,8 @@
 		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>
 	</tr>
 	<tr>
-		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
+		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}
+</span></td>
 		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" />
 		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>
-	</tr>
\ No newline at end of file
+	</tr>
diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html
index c9f2ecbb4d..dc8d5505a1 100644
--- a/phpBB/styles/subsilver2/template/captcha_qa.html
+++ b/phpBB/styles/subsilver2/template/captcha_qa.html
@@ -2,7 +2,7 @@
 		<th colspan="2" valign="middle">{QA_CONFIRM_QUESTION}</th>
 	</tr>
 	<tr>
-		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}: </b><br /></td>
-		<td class="row2"><input class="post" type="text" name="qa_answer" size="80"  /></td>
+		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}:</b><br /></td>
+		<td class="row2"><input class="post" type="text" name="qa_answer" size="80" /></td>
 		<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>
-	</tr>
\ No newline at end of file
+	</tr>
diff --git a/phpBB/styles/subsilver2/template/captcha_recaptcha.html b/phpBB/styles/subsilver2/template/captcha_recaptcha.html
index f6e3c8a217..d8b06d2c51 100644
--- a/phpBB/styles/subsilver2/template/captcha_recaptcha.html
+++ b/phpBB/styles/subsilver2/template/captcha_recaptcha.html
@@ -2,25 +2,25 @@
 	<tr>
 		<th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>
 	</tr>
-	<tr><td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_RECAPTCHA_EXPLAIN} 
-</span></td>
-	<td class="row2">
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
-		//<![CDATA[
-		var RecaptchaOptions = {
-		   lang : {L_RECAPTCHA_LANG}
-		};
-		// ]]>
-		</script>
+	<tr>
+		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}:</b><br /><span class="gensmall">{L_RECAPTCHA_EXPLAIN}</span></td>
+		<td class="row2">
+			<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
+			//<![CDATA[
+			var RecaptchaOptions = {
+				lang : {L_RECAPTCHA_LANG}
+			};
+			// ]]>
+			</script>
+
+			<noscript>
+				<iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br />
+				<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+				<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
+			</noscript>
+		</td>
+	</tr>
 
-	<noscript>
-  		<iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript></td></tr>
-	
 <!-- ELSE -->
 {L_RECAPTCHA_NOT_AVAILABLE}
 <!-- ENDIF -->
-
-	
\ No newline at end of file