From 888bbf6ff4e465ff8f60a34f0859796fe4adc09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Dr=C3=B6scher?= <dhn2@users.sourceforge.net>
Date: Thu, 31 Aug 2006 22:11:30 +0000
Subject: [PATCH] Forgot to check whether visual confirmation displayed
 properly with the new reauth layout. I didn't. Did I mention that I hate
 working with tables for layout? Thank the gods for the new style. ;-)

git-svn-id: file:///svn/phpbb/trunk@6341 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../styles/subSilver/template/login_body.html | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/phpBB/styles/subSilver/template/login_body.html b/phpBB/styles/subSilver/template/login_body.html
index 49e731139a..8aa0b497b5 100644
--- a/phpBB/styles/subSilver/template/login_body.html
+++ b/phpBB/styles/subSilver/template/login_body.html
@@ -4,11 +4,15 @@
 
 <table class="tablebg" width="100%" cellspacing="1">
 <tr>
-	<th <!-- IF not S_ADMIN_AUTH -->colspan="2"<!-- ENDIF -->>{L_LOGIN}</th>
+	<!-- IF not S_ADMIN_AUTH -->
+		<th colspan="2">{L_LOGIN}</th>
+	<!-- ELSE -->
+		<th>{LOGIN_EXPLAIN}</th>
+	<!-- ENDIF -->
 </tr>
-<!-- IF LOGIN_EXPLAIN -->
+<!-- IF LOGIN_EXPLAIN && not S_ADMIN_AUTH  -->
 	<tr>
-		<td class="row3" <!-- IF not S_ADMIN_AUTH -->colspan="2"<!-- ENDIF -->align="center"><span class="gensmall">{LOGIN_EXPLAIN}</td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall">{LOGIN_EXPLAIN}</td>
 	</tr>
 <!-- ENDIF -->
 <tr><!-- IF not S_ADMIN_AUTH -->
@@ -20,9 +24,9 @@
 		</p>
 	</td>
 	<!-- ENDIF -->
-	<td <!-- IF not S_ADMIN_AUTH -->class="row2"<!-- ELSE -->class="row1" style="text-align: center;"<!-- ENDIF -->>
+	<td <!-- IF not S_ADMIN_AUTH -->class="row2"<!-- ELSE -->class="row1"<!-- ENDIF -->>
 	
-		<table cellspacing="1" cellpadding="4">
+		<table align="center" cellspacing="1" cellpadding="4">
 		<!-- IF LOGIN_ERROR -->
 			<tr>
 				<td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td>
@@ -30,7 +34,7 @@
 		<!-- ENDIF -->
 
 		<tr>
-			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="text-align: right;"<!-- ENDIF -->><b class="gensmall">{L_USERNAME}:</b></td>
+			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: right;"<!-- ENDIF -->><b class="gensmall">{L_USERNAME}:</b></td>
 			<td><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" tabindex="1" />
 				<!-- IF not S_ADMIN_AUTH -->
 					<br /><a class="gensmall" href="{U_REGISTER}">{L_REGISTER}</a>
@@ -38,8 +42,8 @@
 			</td>
 		</tr>
 		<tr>
-			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="text-align: right;"<!-- ENDIF -->><b class="gensmall">{L_PASSWORD}:</b></td>
-			<td <!-- IF S_ADMIN_AUTH -->style="text-align: left;"<!-- ENDIF -->>
+			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: right;"<!-- ENDIF -->><b class="gensmall">{L_PASSWORD}:</b></td>
+			<td>
 				<input class="post" type="password" name="password" size="25" maxlength="100" tabindex="2" />
 				<!-- IF U_SEND_PASSWORD --><br /><a class="gensmall" href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a><!-- ENDIF -->
 				<!-- IF U_RESEND_ACTIVATION and not S_ADMIN_AUTH --><br /><a class="gensmall" href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a><!-- ENDIF -->
@@ -58,7 +62,10 @@
 		</table>
 	</td>
 </tr>
+
 <!-- IF S_CONFIRM_CODE -->
+</table>
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
 		<th colspan="2" valign="middle">{L_LOGIN_CONFIRMATION}</th>
 	</tr>