Updates to get around IE6b handling of div wrapper

git-svn-id: file:///svn/phpbb/trunk@689 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2001-07-18 12:25:42 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2001-07-18 12:25:42 +0000
commit: b4d7f7aa0c9ded382a3946caf210d601c4fc468e (patch)
tree: 8ea2d306517aa38da2caec3bdd070d308be3861f /phpBB
parent: 8bed481f5ddcc04ec28a830ce603cdab14cda500 (diff)
download: forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.tar
forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.tar.gz
forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.tar.bz2
forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.tar.xz
forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.zip
18 files changed, 203 insertions, 208 deletions
diff --git a/phpBB/templates/PSO/agreement.tpl b/phpBB/templates/PSO/agreement.tpl
index 18b6f53560..d3b8176b75 100644
--- a/phpBB/templates/PSO/agreement.tpl
+++ b/phpBB/templates/PSO/agreement.tpl
@@ -1,22 +1,22 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="/">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr>
-		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="3" cellspacing="1" width="100%">
+		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
-				<td width="100%" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{SITENAME} - Forums Registration Agreement<b></font></td>
+				<td class="cat" width="100%" align="center"><span class="cattitle"><b>{SITENAME} - Forums Registration Agreement<b></span></td>
 	        </tr>
 	        <tr>
-	        	<td width="100%" align="center" bgcolor="{T_TD_COLOR1}"><table width="80%" border="0">
+	        	<td class="row1" width="100%"><table width="80%" cellspacing="2" cellpadding="2" border="0" align="center">
 					<tr>
-						<td><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><br />While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.<br /><br /><br /><div align="center"><a href="{U_AGREE_OVER13}">I Agree to these terms (and am over 13 years of age)</a><br /><br /><a href="{U_AGREE_UNDER13}">I Agree to these terms (and am <b>under</b> 13 years of age)</a><br /><br /><a href="{U_INDEX}">I do not agree to these terms</a></div><br /></font></td>
+						<td><span class="gen"><br />While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.<br /><br /><br /><div align="center"><a href="{U_AGREE_OVER13}">I Agree to these terms (and am over 13 years of age)</a><br /><br /><a href="{U_AGREE_UNDER13}">I Agree to these terms (and am <b>under</b> 13 years of age)</a><br /><br /><a href="{U_INDEX}">I do not agree to these terms</a></div><br /></span></td>
 					</tr>
 				</table></td>
 			</tr>
 		</table></td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/groupcp_list_body.tpl b/phpBB/templates/PSO/groupcp_list_body.tpl
index e03ae66560..897c5a219e 100644
--- a/phpBB/templates/PSO/groupcp_list_body.tpl
+++ b/phpBB/templates/PSO/groupcp_list_body.tpl
@@ -1,4 +1,5 @@
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+
+<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
 	<tr>
 		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
@@ -55,11 +56,11 @@
 			</tr>
 		</table></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table width="98%" cellspacing="2" border="0">
+<table width="98%" cellspacing="2" border="0" align="center">
 	<tr>
 		<td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/index_body.tpl b/phpBB/templates/PSO/index_body.tpl
index 66720a5e35..347bef77c0 100644
--- a/phpBB/templates/PSO/index_body.tpl
+++ b/phpBB/templates/PSO/index_body.tpl
@@ -1,10 +1,10 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 	</tr>
 </table></div>
 
-<div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr>
 		<td class="tablebg"><table width="100%" cellpadding="3" cellspacing="1" border="0">
 			<tr>
@@ -46,9 +46,9 @@
 			</tr>
 		</table></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table align="center" border="0" width="98%">
+<table align="center" border="0" width="98%" align="center">
 	<tr>
 		<td width="30" align="center"><img src="images/folder_new.gif"></td>
 		<td><span class="gensmall">{L_NEWPOSTS}</span></td>
diff --git a/phpBB/templates/PSO/memberlist_body.tpl b/phpBB/templates/PSO/memberlist_body.tpl
index edb09f8b54..6c8b568a8c 100644
--- a/phpBB/templates/PSO/memberlist_body.tpl
+++ b/phpBB/templates/PSO/memberlist_body.tpl
@@ -1,21 +1,21 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr><form method="post" action="{S_MODE_ACTION}">
 		<td align="left" valign="bottom"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 		<td align="right"><span class="gen">{L_SELECT_SORT_METHOD}:&nbsp;{S_MODE_SELECT}&nbsp;&nbsp;{L_ORDER}&nbsp;{S_ORDER_SELECT}&nbsp;&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}"></span></td>
 	</form></tr>
-</table></div>
+</table>
 
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
 	<tr>
 		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
 				<th>&nbsp;</th>
-				<th><b>{L_USERNAME}</b></td>
-				<th><b>{L_EMAIL}</b></td>
-				<th><b>{L_FROM}</b></td>
-				<th><b>{L_JOINED}</b></td>
-				<th><b>{L_POSTS}</b></td>
-				<th><b>{L_WEBSITE}</b></td>
+				<th>{L_USERNAME}</td>
+				<th>{L_EMAIL}</td>
+				<th>{L_FROM}</td>
+				<th>{L_JOINED}</td>
+				<th>{L_POSTS}</td>
+				<th>{L_WEBSITE}</td>
 			</tr>
 			<!-- BEGIN memberrow -->
 			<tr>
@@ -38,11 +38,11 @@
 			</tr>
 		</table></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table width="98%" cellspacing="2" border="0">
+<table width="98%" cellspacing="2" border="0" align="center">
 	<tr>
 		<td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/message_body.tpl b/phpBB/templates/PSO/message_body.tpl
index b7684a380d..994d13b74a 100644
--- a/phpBB/templates/PSO/message_body.tpl
+++ b/phpBB/templates/PSO/message_body.tpl
@@ -1,5 +1,5 @@
 
-<div align="center"><table width="80%" cellpadding="0" cellspacing="1" border="0">
+<table width="80%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr>
 		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
diff --git a/phpBB/templates/PSO/modcp_body.tpl b/phpBB/templates/PSO/modcp_body.tpl
index a80d1ac0ea..322a8e247e 100644
--- a/phpBB/templates/PSO/modcp_body.tpl
+++ b/phpBB/templates/PSO/modcp_body.tpl
@@ -1,12 +1,12 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
-	<tr><form method="post" action="{S_POST_DAYS_ACTION}">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
+	<tr>
 		<td align="left" valign="bottom" nowrap><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
-	</form></tr>
-</table></div>
+	</tr>
+</table>
 
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
 	<tr><form method="post" action="{S_MODCP_ACTION}">
-		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
+		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
 				<td class="cat" colspan="5" align="center"><span class="cattitle">{L_MOD_CP}</span><br><span class="gensmall">{L_MOD_CP_EXPLAIN}</span></td>
 			</tr>
@@ -37,11 +37,11 @@
 			</tr>
 		</table></td>
 	</form></tr>
-</table></div>
+</table><
 
-<div align="center"><table cellspacing="2" border="0" width="98%">
+<table cellspacing="2" border="0" width="98%" align="center">
 	<tr>
 		<td width="40%"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}<br><span class="gensmall">{S_AUTH_LIST}</span></td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/overall_footer.tpl b/phpBB/templates/PSO/overall_footer.tpl
index 7304df3c43..d503ccbef9 100644
--- a/phpBB/templates/PSO/overall_footer.tpl
+++ b/phpBB/templates/PSO/overall_footer.tpl
@@ -1,6 +1,6 @@
 <br clear="all" />
 
-<div align="center" />
+<div align="center">
 <span class="gensmall">{ADMIN_LINK}</span>
 <br clear="all" /><br />
 <!-- 
diff --git a/phpBB/templates/PSO/overall_header.tpl b/phpBB/templates/PSO/overall_header.tpl
index f33f70acb1..9a920e791d 100644
--- a/phpBB/templates/PSO/overall_header.tpl
+++ b/phpBB/templates/PSO/overall_header.tpl
@@ -33,7 +33,7 @@ INPUT.text	{font-family:"Courier New",courier;font-size:8pt;}
 
 <a name="#top"></a>
 
-<div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr>
 		<td class="tablebg" width="100%"><table width="100%" cellspacing="1" cellpadding="4" border="0">
 			<tr>
@@ -56,9 +56,6 @@ INPUT.text	{font-family:"Courier New",courier;font-size:8pt;}
 			</tr>
 		</table></td>
 	</tr>
-	<tr>
-		
-	</tr>
-</table></div>
+</table>
 
 <br clear="all" /><br />
diff --git a/phpBB/templates/PSO/posting_body.tpl b/phpBB/templates/PSO/posting_body.tpl
index 6b58e4c017..893270d873 100644
--- a/phpBB/templates/PSO/posting_body.tpl
+++ b/phpBB/templates/PSO/posting_body.tpl
@@ -1,8 +1,8 @@
-<div align="center"><table width="80%" cellspacing="0" cellpadding="4" border="0">
+<table width="80%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
 	</tr>
-</table></div>
+</table>
 
 <script language="JavaScript" type="text/javascript">
 <!--
@@ -31,7 +31,7 @@ function submit_check_alert(formObj)
 //-->
 </script>
 
-<div align="center"><table width="80%" cellpadding="1" cellspacing="0" border="0">
+<table width="80%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr><form action="{S_POST_ACTION}" method="POST" onSubmit="return submit_check_alert(this);">
 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
@@ -40,6 +40,7 @@ function submit_check_alert(formObj)
 			<tr>
 				<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
 				<td class="row2">{USERNAME_INPUT}</td>
+			</tr>
             <tr>
 				<td class="row1"><span class="gen"><b>{L_SUBJECT}</b></span></td>
 				<td class="row2"><span class="courier">{SUBJECT_INPUT}</span></td>
@@ -62,11 +63,11 @@ function submit_check_alert(formObj)
 			</tr>
 		</table></td>
 	</form></tr>
-</table></div>
+</table>
 
-<div align="center"><table cellspacing="2" border="0" width="80%">
+<table cellspacing="2" border="0" width="80%" align="center">
 	<tr>
 		<td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/posting_preview.tpl b/phpBB/templates/PSO/posting_preview.tpl
index 9abe6a37e6..a14deb24b4 100644
--- a/phpBB/templates/PSO/posting_preview.tpl
+++ b/phpBB/templates/PSO/posting_preview.tpl
@@ -1,29 +1,29 @@
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
 	<tr>
-		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="4" cellspacing="1" width="100%">
+		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
 			<tr>
-		        <td colspan="2" bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" cellpadding="0" border="0"> 
+		        <td class="cat" colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> 
 	                <tr>
-               			<td><font face="{T_FONTFACE1}" size="{T_FONTSIZE3}"><b>{L_PREVIEW}</b></font></td> 
+               			<td><span class="cattitle"><b>{L_PREVIEW}</b></span></td> 
 	               </tr>
       			</table></td>
 			</tr>
 			<tr>
-				<td width="20%" bgcolor="{T_TH_COLOR3}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_AUTHOR}</b></font></td>
-				<td bgcolor="{T_TH_COLOR3}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_MESSAGE}</b></font></td>
+				<th width="20%">&nbsp;{L_AUTHOR}&nbsp;</th>
+				<th>&nbsp;{L_MESSAGE}&nbsp;</th>
 			</tr>
 			<tr bgcolor="{ROW_COLOR}">
 				<td width="20%" align="left" valign="top"><table height="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
-						<td valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{POSTER_NAME}</b></font><br><br></td>
+						<td valign="top"><span class="gen"><b>{POSTER_NAME}</b></span><br><br></td>
 					</tr>
 				</table></td>
 				<td width="80%" height="100%"><table width="100%" height="100%" cellspacing="1" cellpadding="0" border="0">
 					<tr>
-						<td><img src="images/posticon.gif" alt="Post image icon"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_POSTED}: {POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post Subject: {POST_SUBJECT}</font><hr></td>
+						<td><img src="images/icon_minipost.gif" alt="Post image icon"><span class="gensmall">{L_POSTED}: {POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post Subject: {POST_SUBJECT}</span><hr></td>
 					</tr>
 					<tr>
-						<td height="100%" valign="top"><font face="{T_FONTFACE3}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{MESSAGE}</font></td>
+						<td height="100%" valign="top"><span class="gen">{MESSAGE}</span></td>
 					</tr>
 					<tr>
 						<td><hr></td>
@@ -32,6 +32,6 @@
 			</tr>
 		</table></td>
 	</tr>
-</table></div>
+</table>
 
 <br clear="all" />
diff --git a/phpBB/templates/PSO/privmsgs_body.tpl b/phpBB/templates/PSO/privmsgs_body.tpl
index 405a83f375..5f6cb9f797 100644
--- a/phpBB/templates/PSO/privmsgs_body.tpl
+++ b/phpBB/templates/PSO/privmsgs_body.tpl
@@ -1,54 +1,54 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr><form method="post" action="{S_MSG_DAYS_ACTION}">
 		<td align="left" valign="bottom"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 		<td align="right" valign="bottom" nowrap><span class="gensmall">{L_DISPLAY_MESSAGES}: {S_SELECT_MSG_DAYS} <input type="submit" value="Go"></span></td>
 	</form></tr>
-</table></div>
+</table>
 
-<div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr><form method="post" action="{S_PRIVMSGS_ACTION}">
 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
-				<td colspan="5" bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<td class="cat" colspan="5"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
-						<td>&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE3}">{INBOX}&nbsp;&nbsp;&nbsp;{SENTBOX}&nbsp;&nbsp;&nbsp;{OUTBOX}&nbsp;&nbsp;&nbsp;{SAVEBOX}</font></td>
+						<td>&nbsp;<span class="cattitle">{INBOX}&nbsp;&nbsp;&nbsp;{SENTBOX}&nbsp;&nbsp;&nbsp;{OUTBOX}&nbsp;&nbsp;&nbsp;{SAVEBOX}</span></td>
 						<td align="right">{S_POST_NEW_MSG}</td>
 					</tr>
 				</table></td>
 			</tr>
 			<tr>
-				<td width="5%" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE2}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><b>{L_FLAG}</b></font></td>
-				<td width="20%" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE2}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><b>{L_FROM_OR_TO}</b></font></td>
-				<td width="55%" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE2}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><b>{L_SUBJECT}</b></font></td>
-				<td width="15%" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE2}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><b>{L_DATE}</b></font></td>
-				<td width="5%" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE2}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><b>{L_MARK}</b></td>
+				<th width="5%">&nbsp;{L_FLAG}&nbsp;</th>
+				<th width="20%">&nbsp;{L_FROM_OR_TO}&nbsp;</th>
+				<th width="55%">&nbsp;{L_SUBJECT}&nbsp;</th>
+				<th width="15%">&nbsp;{L_DATE}&nbsp;</th>
+				<th width="5%">&nbsp;{L_MARK}&nbsp;</th>
 			</tr>
 			<!-- BEGIN listrow -->
-			<tr>
-				<td width="5%"bgcolor="{listrow.ROW_COLOR}" align="center" valign="middle">{listrow.ICON_FLAG_IMG}</td>
-				<td width="20%" bgcolor="{listrow.ROW_COLOR}" valign="middle">&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><a href="{listrow.U_FROM_USER_PROFILE}">{listrow.FROM}</a></font></td>
-				<td width="55%" bgcolor="{listrow.ROW_COLOR}" valign="middle">&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><a href="{listrow.U_READ}">{listrow.SUBJECT}</a></font></td>
-				<td width="15%" bgcolor="{listrow.ROW_COLOR}" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{listrow.DATE}</font></td>
-				<td width="5%" bgcolor="{listrow.ROW_COLOR}" align="center" valign="middle">{listrow.S_DEL_CHECKBOX}</td>
+			<tr bgcolor="{listrow.ROW_COLOR}">
+				<td width="5%" align="center" valign="middle">{listrow.ICON_FLAG_IMG}</td>
+				<td width="20%" valign="middle">&nbsp;<span class="gen"><a href="{listrow.U_FROM_USER_PROFILE}">{listrow.FROM}</a></span></td>
+				<td width="55%" valign="middle">&nbsp;<span class="gen"><a href="{listrow.U_READ}">{listrow.SUBJECT}</a></span></td>
+				<td width="15%" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{listrow.DATE}</span></td>
+				<td width="5%" align="center" valign="middle">{listrow.S_DEL_CHECKBOX}</td>
 			</tr>
 			<!-- END listrow -->
 			<tr>
-				<td colspan="5" bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<td class="cat" colspan="5"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td width="5" align="left" valign="middle">{S_POST_NEW_MSG}</td>
-						<td align="left" valign="middle">&nbsp;&nbsp;&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></font>&nbsp;</td>
-						<td align="right" valign="middle"><font face="{T_FONTFACE2}" size="{T_FONTSIZE2}">{PAGINATION}&nbsp;</font></td>
+						<td align="left" valign="middle">&nbsp;&nbsp;&nbsp;<span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span>&nbsp;</td>
+						<td align="right" valign="middle"><span class="gen">{PAGINATION}&nbsp;</span></td>
 						<td align="right" valign="middle">{S_HIDDEN_FIELDS}<input type="submit" name="save" value="Save Marked">&nbsp;<input type="submit" name="delete" value="Delete Marked">&nbsp;<input type="submit" name="deleteall" value="Delete All"></td>
 					</tr>
 				</table></td>
 			</tr>
 		</table></td>
 	</form></tr>
-</table></div>
+</table>
 
-<div align="center"><table align="center" border="0" width="98%">
+<table align="center" border="0" width="98%" align="center">
 	<tr>
-		<td valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
+		<td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" nowrap>{JUMPBOX}</td>
 	</tr>
 </table>
 \ No newline at end of file
diff --git a/phpBB/templates/PSO/privmsgs_posting_body.tpl b/phpBB/templates/PSO/privmsgs_posting_body.tpl
index 5647574ef4..7364cab2d7 100644
--- a/phpBB/templates/PSO/privmsgs_posting_body.tpl
+++ b/phpBB/templates/PSO/privmsgs_posting_body.tpl
@@ -1,8 +1,8 @@
-<div align="center"><table width="80%" cellspacing="0" cellpadding="4" border="0">
+<table width="80%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 	</tr>
-</table></div>
+</table>
 
 <script language="JavaScript" type="text/javascript">
 <!--
@@ -13,43 +13,43 @@ function insertCode(formObj, selectObj){
 //-->
 </script>
 
-<div align="center"><table width="80%" cellpadding="1" cellspacing="0" border="0">
-	<tr><form action="{S_POST_ACTION}" method="POST">
-		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="3" cellspacing="1" width="100%">
+<table width="80%" cellpadding="1" cellspacing="0" border="0" align="center">
+	<tr><form action="{S_POST_ACTION}" method="POST" onSubmit="return submit_check_alert(this);">
+		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
-				<td colspan="2" bgcolor="{T_TH_COLOR3}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_POST_A}</b></font></td>
-			</tr>
+				<th class="secondary" colspan="2"><b>{L_POST_A}</b></td>
+	        </tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_USERNAME}</b></font></td>
-				<td bgcolor="{T_TD_COLOR2}">{S_NAMES_SELECT}&nbsp;{S_ALPHA_SELECT}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="gensmall">{L_FIND_USERNAME}:</span>&nbsp;&nbsp;<font face="{T_FONTFACE3}" size="{T_FONTSIZE2}">{S_USERNAME_INPUT}</font>&nbsp;<input type="submit" name="usersubmit" value="{L_SEARCH}"></td>
+				<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
+				<td class="row2">{S_NAMES_SELECT}&nbsp;{S_ALPHA_SELECT}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="gensmall">{L_FIND_USERNAME}:</span>&nbsp;&nbsp;<span class="courier">{S_USERNAME_INPUT}</span>&nbsp;<input type="submit" name="usersubmit" value="{L_SEARCH}"></td>
 			</tr>
-			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_SUBJECT}</b></font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE3}" size="{T_FONTSIZE2}">{SUBJECT_INPUT}</font></td>
+            <tr>
+				<td class="row1"><span class="gen"><b>{L_SUBJECT}</b></span></td>
+				<td class="row2"><span class="courier">{SUBJECT_INPUT}</span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_MESSAGE_BODY}</b></font><br><br><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{HTML_STATUS}<br>{BBCODE_STATUS}</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<td class="row1"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br><br><span class="gensmall">{HTML_STATUS}<br>{BBCODE_STATUS}</span></td>
+				<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
-						<td><font face="{T_FONTFACE3}" size="{T_FONTSIZE2}">{MESSAGE_INPUT}</font></td>
-						<td valign="top">&nbsp;&nbsp;<font face="{T_FONTFACE2}" size="{T_FONTSIZE1}">BBcodes:</font><br><font face="{T_FONTFACE3}" size="{T_FONTSIZE1}"><select class="small" name="addbbcode" size="6" onchange="insertCode(this.form, this);"> <option value="[b][/b]">[b] [/b]</option> <option value="[i][/i]">[i] [/i]</option> <option value="[quote][/quote]">[quote] [/quote]</option> <option value="[code][/code]">[code] [/code]</option> <option value="[list][/list]">[list] [/list]</option> <option value="[list=][/list]">[list=] [/list]</option>	<option value="[img][/img]">[img] [/img]</option> <option value="[url][/url]">[url] [/url]</option></select></font><br clear="all">&nbsp;&nbsp;<font face="{T_FONTFACE2}" size="{T_FONTSIZE1}">Smiley codes:</font><br><font face="{T_FONTFACE3}" size="{T_FONTSIZE1}"><select class="small" name="addsmiley" size="1" onchange="insertCode(this.form, this);"> <option value=":)">Smiley</option> <option value=":(">Frown</option> <option value=":d">Big Grin</option> <option value=";)">Wink</option> <option value=":o">Eek!</option> <option value="8)">Cool</option> <option value=":?">Confused</option> <option value=":p">Razz</option> <option value=":|">Mad</option></select></font></td>
+						<td><span class="gen">{MESSAGE_INPUT}</span></td>
+						<td valign="top">&nbsp;<span class="gensmall">BBcodes:</span><br><span class="couriersmall"><select class="small" name="addbbcode" size="6" onchange="insertCode(this.form, this);"> <option value="[b][/b]">[b] [/b]</option> <option value="[i][/i]">[i] [/i]</option> <option value="[quote][/quote]">[quote] [/quote]</option> <option value="[code][/code]">[code] [/code]</option> <option value="[list][/list]">[list] [/list]</option> <option value="[list=][/list]">[list=] [/list]</option>	<option value="[img][/img]">[img] [/img]</option> <option value="[url][/url]">[url] [/url]</option></select></span><br clear="all">&nbsp;<span class="gensmall">Smiley codes:</span><br><span class="couriersmall"><select class="small" name="addsmiley" size="1" onchange="insertCode(this.form, this);"> <option value=":)">Smiley</option> <option value=":(">Frown</option> <option value=":d">Big Grin</option> <option value=";)">Wink</option> <option value=":o">Eek!</option> <option value="8)">Cool</option> <option value=":?">Confused</option> <option value=":p">Razz</option> <option value=":|">Mad</option></select></span></td>
 					</tr>
 				</table></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_OPTIONS}</b></font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{HTML_TOGGLE}<br>{BBCODE_TOGGLE}<br>{SMILE_TOGGLE}<br>{SIG_TOGGLE}</font></td>
+				<td class="row1"><span class="gen"><b>{L_OPTIONS}</b></span></td>
+				<td class="row2"><span class="gen">{HTML_TOGGLE}<br>{BBCODE_TOGGLE}<br>{SMILE_TOGGLE}<br>{SIG_TOGGLE}</td>
 			</tr>
 			<tr>
-				<td colspan="2" bgcolor="{T_TH_COLOR3}" align="center">{S_HIDDEN_FORM_FIELDS}<input type="submit" name="preview" value="{L_PREVIEW}">&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;<input type="submit" name="cancel" value="{L_CANCEL}"></td>
+				<td class="cat" colspan="2" align="center">{S_HIDDEN_FORM_FIELDS}<input type="submit" name="preview" value="{L_PREVIEW}">&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;<input type="submit" name="cancel" value="{L_CANCEL}"></td>
 			</tr>
 		</table></td>
 	</form></tr>
-</table></div>
+</table>
 
-<div align="center"><table cellspacing="2" border="0" width="80%">
+<table cellspacing="2" border="0" width="80%" align="center">
 	<tr>
-		<td valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
+		<td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/privmsgs_read_body.tpl b/phpBB/templates/PSO/privmsgs_read_body.tpl
index cd6f901da3..403888bd48 100644
--- a/phpBB/templates/PSO/privmsgs_read_body.tpl
+++ b/phpBB/templates/PSO/privmsgs_read_body.tpl
@@ -1,10 +1,10 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
 		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
 	<tr><form method="post" action="{S_PRIVMSGS_ACTION}">
 		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="4" cellspacing="1" width="100%">
 			<tr>
@@ -52,11 +52,11 @@
 			</tr>
 		</table></td>
 	</form></tr>
-</table></div>
+</table>
 
-<div align="center"><table width="98%" cellspacing="2" border="0">
+<table width="98%" cellspacing="2" border="0" align="center">
 	<tr>
 		<td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl
index e298484977..e74ef63cb2 100644
--- a/phpBB/templates/PSO/profile_add_body.tpl
+++ b/phpBB/templates/PSO/profile_add_body.tpl
@@ -1,10 +1,10 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr><form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post">
 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
@@ -74,7 +74,7 @@
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_HIDE_USER}:</span></td>
-				<td class="row2"><input type="radio" name="allowviewonline" value="1" {HIDE_USER_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowviewonline" value="0" {HIDE_USER_NO}> <span class="gen">{L_NO}</span></td>
+				<td class="row2"><input type="radio" name="hideonline" value="1" {HIDE_USER_YES}> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="hideonline" value="0" {HIDE_USER_NO}> <span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td>
@@ -148,12 +148,12 @@
 			<!-- IF $S_ALLOW_AVATAR_LOCAL eq TRUE -->
 			<tr>
 				<td class="row1"><span class="gen">{L_AVATAR_GALLERY}:</span></td>
-				<td class="row2">&nbsp;</td>
+				<td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}"></td>
 			</tr>
 			<!-- ENDIF -->
 			<tr>
-			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;&nbsp;<input type="reset" value="{L_RESET}"</td>
+			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}">&nbsp;&nbsp;<input type="reset" value="{L_RESET}"></td>
 			</tr>
 		</table></td>
 	</form></tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/profile_view_body.tpl b/phpBB/templates/PSO/profile_view_body.tpl
index 537bca9dcf..009138d0b5 100644
--- a/phpBB/templates/PSO/profile_view_body.tpl
+++ b/phpBB/templates/PSO/profile_view_body.tpl
@@ -1,70 +1,70 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="/">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr>
-		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="3" cellspacing="1" width="100%">
+		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
-				<td colspan="2" bgcolor="{T_TH_COLOR3}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_VIEWING_PROFILE} {USERNAME}</b></font></td>
+				<th colspan="2"><span class="gen"><b>{L_VIEWING_PROFILE} {USERNAME}</b></th>
 			</tr>
 			<tr>
-	           <td bgcolor="{T_TD_COLOR1}" width="20%"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_USERNAME}:</font></td>
-	           <td bgcolor="{T_TD_COLOR2}" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{USERNAME}</b> [<a href="{U_SEARCH_USER}">{L_VIEW_USERS_POSTS}</a>]</font></td>
+	           <td class="row1" width="20%"><span class="gen">{L_USERNAME}:</span></td>
+	           <td class="row2" valign="middle"><span class="gen"><b>{USERNAME}</b> [<a href="{U_SEARCH_USER}">{L_VIEW_USERS_POSTS}</a>]</span></td>
             </tr>
             <tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_JOINED}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{JOINED}</b> [{POSTS_PER_DAY} {L_PER_DAY}]</font></td>
+				<td class="row1"><span class="gen">{L_JOINED}:</span></td>
+				<td class="row2"><span class="gen"><b>{JOINED}</b> [{POSTS_PER_DAY} {L_PER_DAY}]</span></td>
 			</tr>
             <tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_POSTS}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{POSTS}</b> [{PERCENTAGE} {L_OF_TOTAL}]</font></td>
+				<td class="row1"><span class="gen">{L_POSTS}:</span></td>
+				<td class="row2"><span class="gen"><b>{POSTS}</b> [{PERCENTAGE} {L_OF_TOTAL}]</span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_EMAIL_ADDRESS}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{EMAIL}</font></td>
+				<td class="row1"><span class="gen">{L_EMAIL_ADDRESS}:</span></td>
+				<td class="row2"><span class="gen">{EMAIL}</span>&nbsp;{PM_IMG}</td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_ICQ_NUMBER}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{ICQ}</font></td>
+				<td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td>
+				<td class="row2"><span class="gen">{ICQ}</span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_AIM}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{AIM}</b></font></td>
+				<td class="row1"><span class="gen">{L_AIM}:</span></td>
+				<td class="row2"><span class="gen">{AIM}</b></span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_MESSENGER}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{MSN}</b></font></td>
+				<td class="row1"><span class="gen">{L_MESSENGER}:</span></td>
+				<td class="row2"><span class="gen">{MSN}</b></span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_YAHOO}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{YIM}</b></font></td>
+				<td class="row1"><span class="gen">{L_YAHOO}:</span></td>
+				<td class="row2"><span class="gen">{YIM}</b></span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_WEBSITE}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><a href="{U_USER_WEBSITE}" target="_userwww">{WEBSITE}</a></b></font></td>
+				<td class="row1"><span class="gen">{L_WEBSITE}:</span></td>
+				<td class="row2"><span class="gen"><a href="{U_USER_WEBSITE}" target="_userwww">{WEBSITE}</a></b></span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_LOCATION}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{LOCATION}</b></font></td>
+				<td class="row1"><span class="gen">{L_LOCATION}:</span></td>
+				<td class="row2"><span class="gen"><b>{LOCATION}</b></span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_OCCUPATION}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{OCCUPATION}</b></font></td>
+				<td class="row1"><span class="gen">{L_OCCUPATION}:</span></td>
+				<td class="row2"><span class="gen"><b>{OCCUPATION}</b></span></td>
 			</tr>
 			<tr>
-				<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{L_INTERESTS}:</font></td>
-				<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{INTERESTS}</b></font></td>
+				<td class="row1"><span class="gen">{L_INTERESTS}:</span></td>
+				<td class="row2"><span class="gen"><b>{INTERESTS}</b></span></td>
 			</tr>
 		</table></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table cellspacing="2" border="0" width="98%">
+<table cellspacing="2" border="0" width="98%" align="center">
 	<tr>
-		<td width="40%" valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
+		<td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/viewforum_body.tpl b/phpBB/templates/PSO/viewforum_body.tpl
index c442311070..a0c5b08c25 100644
--- a/phpBB/templates/PSO/viewforum_body.tpl
+++ b/phpBB/templates/PSO/viewforum_body.tpl
@@ -1,18 +1,18 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr><form method="post" action="{S_POST_DAYS_ACTION}">
 		<td align="left" valign="bottom" nowrap><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> {FORUM_NAME}</span></td>
 		<td align="right" valign="bottom" nowrap><span class="gensmall">{L_DISPLAY_TOPICS}:&nbsp;{S_SELECT_POST_DAYS}&nbsp;<input type="submit"  value="Go"></span></td>
 	</form></tr>
-</table></div>
+</table>
 
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
 	<tr>
 		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
 			<tr>
 				<td class="cat" colspan="6"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td><span class="cattitle">{FORUM_NAME}</span><br><span class="gensmall">{L_MODERATOR}: {MODERATORS}</span></TD>
-						<td align="right"><a href="{U_POST_NEW_TOPIC}"><img src="templates/PSO/images/post.gif" border="1"></a></td>
+						<td align="right"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="1"></a></td>
 					</tr>
 				</table></td>
 			</tr>
@@ -45,32 +45,28 @@
 			</tr>
 		</table></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table cellspacing="2" border="0" width="98%">
+<table cellspacing="2" border="0" width="98%" align="center">
 	<tr>
-		<td width="20"></td>
-		<td width="40%"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
-		<td rowspan="6" align="right" valign="top" nowrap>{JUMPBOX}<br><span class="gensmall">{S_AUTH_LIST}</span></td>
-	</tr>
-	<tr>
-		<td><img src="images/folder_new.gif"></td>
-		<td><span class="gensmall">{L_NEWPOSTS}</td>
-	</tr>
-	<tr>
-		<td><img src="images/folder_new_hot.gif"></td>
-		<td><span class="gensmall">{L_NEWPOSTS} [ > {L_HOT_THRESHOLD} ]</span></td>
-	</tr>
-	<tr>
-		<td><img src="images/folder.gif"></td>
-		<td><span class="gensmall">{L_NONEWPOSTS}</span></td>
-	</tr>
-	<tr>
-		<td><img src="images/folder_hot.gif"></td>
-		<td><span class="gensmall">{L_NONEWPOSTS} [ > {L_HOT_THRESHOLD} ]</span></td>
-	</tr>
-	<tr>
-		<td><img src="images/folder_lock.gif"></td>
-		<td><span class="gensmall">{L_TOPIC_IS_LOCKED}</span></td>
+		<td align="left" valign="top"><table cellspacing="4" border="0">
+			<tr>
+				<td width="20"></td>
+				<td><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
+			</tr>
+			<tr>
+				<td width="20"><img src="images/folder_new.gif"></td>
+				<td><span class="gensmall">{L_NEWPOSTS}</td>
+			</tr>
+			<tr>
+				<td width="20"><img src="images/folder.gif"></td>
+				<td><span class="gensmall">{L_NONEWPOSTS}</span></td>
+			</tr>
+			<tr>
+				<td width="20"><img src="images/folder_lock.gif"></td>
+				<td><span class="gensmall">{L_TOPIC_IS_LOCKED}</span></td>
+			</tr>
+		</table></td>
+		<td align="right" valign="top" nowrap>{JUMPBOX}<br><span class="gensmall">{S_AUTH_LIST}</span></td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/viewonline_body.tpl b/phpBB/templates/PSO/viewonline_body.tpl
index b1888563a8..2064a9a294 100644
--- a/phpBB/templates/PSO/viewonline_body.tpl
+++ b/phpBB/templates/PSO/viewonline_body.tpl
@@ -1,34 +1,34 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="/">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
 	<tr>
-		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="4" cellspacing="1" width="100%">
+		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
-				<td colspan="3" bgcolor="{T_TH_COLOR2}" align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{TOTAL_USERS_ONLINE}</b></font><br /><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">This data is based on users active over the past five minutes.</font></td>
+				<td class="cat" colspan="3" align="center"><span class="gen"><b>{TOTAL_USERS_ONLINE}</b></span><br /><span class="gensmall">This data is based on users active over the past five minutes</span></td>
 			</tr>
 			<tr>
-				<td width="35%" bgcolor="{T_TH_COLOR3}" align="center">&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_USERNAME}</font>&nbsp;</td>
-				<td width="25%" bgcolor="{T_TH_COLOR3}" align="center">&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_LAST_UPDATE}</font>&nbsp;</td>
-				<td width="40%" bgcolor="{T_TH_COLOR3}" align="center">&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_LOCATION}</font>&nbsp;</td>
+				<th width="35%">&nbsp;{L_USERNAME}&nbsp;</th>
+				<th width="25%">&nbsp;{L_LAST_UPDATE}&nbsp;</th>
+				<th width="40%">&nbsp;{L_LOCATION}&nbsp;</th>
 			</tr>
 			<!-- BEGIN userrow -->
-			<tr>
-				<td bgcolor="{userrow.ROW_COLOR}" width="35%">&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><a href="{userrow.U_USER_PROFILE}">{userrow.USERNAME}</a></font>&nbsp;</td>
-				<td bgcolor="{userrow.ROW_COLOR}" width="25%" align="center">&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{userrow.LASTUPDATE}</font>&nbsp;</td>
-				<td bgcolor="{userrow.ROW_COLOR}" width="40%">&nbsp;<font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><a href="{userrow.U_FORUM_LOCATION}">{userrow.LOCATION}</a></font>&nbsp;</td>
+			<tr bgcolor="{userrow.ROW_COLOR}">
+				<td width="35%">&nbsp;<span class="gen"><a href="{userrow.U_USER_PROFILE}">{userrow.USERNAME}</a></span>&nbsp;</td>
+				<td width="25%" align="center">&nbsp;<span class="gen">{userrow.LASTUPDATE}</span>&nbsp;</td>
+				<td width="40%">&nbsp;<span class="gen"><a href="{userrow.U_FORUM_LOCATION}">{userrow.LOCATION}</a></span>&nbsp;</td>
 			</tr>
 			<!-- END userrow -->
 		</table></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table cellspacing="2" border="0" width="98%">
+<table cellspacing="2" border="0" width="98%" align="center">
 	<tr>
-		<td width="40%" valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
+		<td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}</td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
diff --git a/phpBB/templates/PSO/viewtopic_body.tpl b/phpBB/templates/PSO/viewtopic_body.tpl
index cfce368b9a..cc5299fa09 100644
--- a/phpBB/templates/PSO/viewtopic_body.tpl
+++ b/phpBB/templates/PSO/viewtopic_body.tpl
@@ -1,11 +1,11 @@
-<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a> -> {TOPIC_TITLE}</span></td>
 		<td align="right" valign="bottom" nowrap><span class="gen"> <a href="{U_VIEW_OLDER_TOPIC}">{L_VIEW_PREVIOUS_TOPIC}</a> :: <a href="{U_VIEW_NEWER_TOPIC}">{L_VIEW_NEXT_TOPIC}</a> </span></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="98%">
+<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
 	<tr>
 		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
 			<tr>
@@ -43,7 +43,7 @@
 						</table></td>
 					</tr>
 					<tr>
-						<td height="100%" valign="top"><span class="gen">{postrow.MESSAGE}</span></td>
+						<td width="100%" height="100%" valign="top"><span class="gen">{postrow.MESSAGE}</span></td>
 					</tr>
 					<tr>
 						<td><table width="100%" cellspacing="0" cellpadding="0" border="0">
@@ -70,11 +70,11 @@
 			</tr>
 		</table></td>
 	</tr>
-</table></div>
+</table>
 
-<div align="center"><table width="98%" cellspacing="2" border="0">
+<table width="98%" cellspacing="2" border="0" align="center">
 	<tr>
 		<td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span><br><br>{S_TOPIC_ADMIN}</td>
 		<td align="right" valign="top" nowrap>{JUMPBOX}<br><span class="gensmall">{S_AUTH_LIST}</span></td>
 	</tr>
-</table></div>
-\ No newline at end of file
+</table>
author	Paul S. Owen <psotfx@users.sourceforge.net>	2001-07-18 12:25:42 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2001-07-18 12:25:42 +0000
commit	b4d7f7aa0c9ded382a3946caf210d601c4fc468e (patch)
tree	8ea2d306517aa38da2caec3bdd070d308be3861f /phpBB
parent	8bed481f5ddcc04ec28a830ce603cdab14cda500 (diff)
download	forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.tar forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.tar.gz forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.tar.bz2 forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.tar.xz forums-b4d7f7aa0c9ded382a3946caf210d601c4fc468e.zip