1 files changed, 93 insertions, 116 deletions
diff --git a/phpBB/templates/subSilver/ucp_main.html b/phpBB/templates/subSilver/ucp_main.html
index 14453e08ac..5e6d9cb636 100644
--- a/phpBB/templates/subSilver/ucp_main.html
+++ b/phpBB/templates/subSilver/ucp_main.html
@@ -1,128 +1,105 @@
 <!-- INCLUDE ucp_header.html -->
 
+<table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="right">
 	<tr>
-		<td width="20%" height="100%"><table width="100%" height="100%" cellspacing="1" cellpadding="4" border="0">
-			<tr>
-				<th>{L_UCP_OPTIONS}</th>
-			</tr>
-			<!-- BEGIN ucp_subsection -->
-			<tr>
-				<!-- IF ucp_subsection.S_SELECTED -->
-				<td class="row1" height="25" nowrap="nowrap"><span class="nav"><b>{ucp_subsection.L_TITLE}</b>
-				<!-- ELSE -->
-				<td class="row2" height="25" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'"><a class="nav" href="{ucp_subsection.U_TITLE}">{ucp_subsection.L_TITLE}</a>
-				<!-- ENDIF -->
-				</td>
-			</tr>
-			<!-- END ucp_subsection -->
-			<tr>
-				<td class="row2" height="100%">&nbsp;</td>
+		<!-- IF S_DISPLAY_WATCHED -->
+		<th colspan="4" height="28">
+		<!-- ELSE -->
+		<th colspan="3" height="28">
+		<!-- ENDIF -->
+		{L_UCP}</th>
+	</tr>
+
+	<tr class="row1">
+		<!-- IF S_DISPLAY_WATCHED --><td class="genmed" colspan="4" align="center"><!-- ELSE --><td class="genmed" colspan="3" align="center"><!-- ENDIF -->{L_UCP_WELCOME}</td>
+	</tr>
+
+
+	<!-- IF S_DISPLAY_FRONT -->
+	<tr>
+		<th colspan="3" height="28">{L_IMPORTANT_NEWS}</th>
+	</tr>
+
+	<!-- BEGIN topicrow -->
+	<!-- IF topicrow.S_ROW_COUNT is even -->
+	<tr class="row1">
+	<!-- ELSE -->
+	<tr class="row2">
+	<!-- ENDIF -->
+
+		<td width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
+		<td width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
+		<td class="postdetails" align="center" valign="middle" nowrap="nowrap">{topicrow.LAST_POST_TIME}<br />{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}</td>
+	</tr>
+	<!-- END topicrow -->
+
+	<tr>
+		<th colspan="3" height="28">{L_YOUR_DETAILS}</th>
+	</tr>
+	<tr class="row1">
+		<td class="genmed" colspan="3"><table width="100%" cellspacing="1" cellpadding="2" border="0">
+			<tr> 
+				<td class="gen" align="right" valign="middle" nowrap="nowrap">{L_JOINED}: </td>
+				<td width="100%"><b class="gen">{JOINED}</b></td>
 			</tr>
-			<tr>
-				<td class="cat" height="28">&nbsp;</td>
+			<tr> 
+				<td class="gen" valign="top" align="right" nowrap="nowrap">{L_TOTAL_POSTS}: </td>
+				<td valign="top"><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>
 			</tr>
 		</table></td>
-		<td class="row3"><img src="images/spacer.gif" width="1" alt="" /></td>
-		<td width="100%" valign="top"><table width="100%" cellspacing="1" cellpadding="4" border="0">
-			<tr>
-				<!-- IF S_DISPLAY_WATCHED -->
-				<th colspan="4">{L_UCP}</th>
-				<!-- ELSE -->
-				<th colspan="3">{L_UCP}</th>
-				<!-- ENDIF -->
-			</tr>
-			<tr class="row1">
-				<!-- IF S_DISPLAY_WATCHED -->
-				<td colspan="4" align="center"><table width="90%" cellspacing="0" cellpadding="4" border="0">
-				<!-- ELSE -->
-				<td colspan="3" align="center"><table width="90%" cellspacing="0" cellpadding="4" border="0">
-				<!-- ENDIF -->
-					<tr>
-						<td class="genmed">{L_UCP_WELCOME}</td>
-					</tr>
-				</table></td>
-			</tr>
+	</tr>
+	<tr>
+		<td class="cat" colspan="3" height="28">&nbsp;</td>
+	</tr>
+	<!-- ENDIF -->
 
-			<!-- IF S_DISPLAY_FRONT -->
-			<tr>
-				<th colspan="3">{L_IMPORTANT_NEWS}</th>
-			</tr>
-			<!-- BEGIN topicrow -->
-			<!-- IF topicrow.S_ROW_COUNT is even -->
-			<tr class="row1">
-			<!-- ELSE -->
-			<tr class="row2">
-			<!-- ENDIF -->
-				<td width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-				<td width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
-				<td class="postdetails" align="center" valign="middle" nowrap="nowrap">{topicrow.LAST_POST_TIME}<br />{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}</td>
-			</tr>
-			<!-- END topicrow -->
-			<tr>
-				<th colspan="3">{L_YOUR_DETAILS}</th>
-			</tr>
-			<tr class="row1">
-				<td class="genmed" colspan="3"><table width="100%" cellspacing="1" cellpadding="2" border="0">
-					<tr> 
-						<td class="gen" align="right" valign="middle" nowrap="nowrap">{L_JOINED}: </td>
-						<td width="100%"><b class="gen">{JOINED}</b></td>
-					</tr>
-					<tr> 
-						<td class="gen" valign="top" align="right" nowrap="nowrap">{L_TOTAL_POSTS}: </td>
-						<td valign="top"><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>
-					</tr>
-				</table></td>
-			</tr>
-			<tr>
-				<td class="cat" colspan="3" height="28">&nbsp;</td>
-			</tr>
-			<!-- ENDIF -->
 
-			<!-- IF S_DISPLAY_WATCHED -->
-			<tr>
-				<th colspan="4">{L_WATCHED_FORUMS}</th>
-			</tr>
-			<!-- BEGIN forumrow -->
-			<!-- IF forumrow.S_ROW_COUNT is even -->
-			<tr class="row1">
-			<!-- ELSE -->
-			<tr class="row2">
-			<!-- ENDIF -->
-				<td width="20" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
-				<td width="100%" class="topictitle"><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></span></td>
-				<td class="gensmall" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POST_AUTHOR --><a href="{forumrow.U_LAST_POST_AUTHOR}">{forumrow.LAST_POST_AUTHOR}</a><!-- ELSE -->{forumrow.LAST_POST_AUTHOR}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td>
-				<td> <input type="checkbox" name="f[{forumrow.FORUM_ID}]" /> </td>
-			</tr>
-			<!-- BEGINELSE -->
-			<tr class="row1">
-				<td colspan="4" height="25" align="center"><b class="genmed">{L_NO_WATCHED_FORUMS}</b></td>
-			</tr>
-			<!-- END forumrow -->
-			<tr>
-				<th colspan="4">{L_WATCHED_TOPICS}</th>
-			</tr>
-			<!-- BEGIN topicrow -->
-			<!-- IF topicrow.S_ROW_COUNT is even -->
-			<tr class="row1">
-			<!-- ELSE -->
-			<tr class="row2">
-			<!-- ENDIF -->
-				<td width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-				<td width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
-				<td class="postdetails" align="center" valign="middle" nowrap="nowrap">{topicrow.LAST_POST_TIME}<br />{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}</td>
-				<td> <input type="checkbox" name="t[{topicrow.TOPIC_ID}]" /> </td>
-			</tr>
-			<!-- BEGINELSE -->
-			<tr class="row1">
-				<td colspan="4" height="25" align="center"><b class="genmed">{L_NO_WATCHED_TOPICS}</b></td>
-			</tr>
-			<!-- END topicrow -->
-			<tr>
-				<td class="cat" colspan="4" height="28" align="right"><input class="liteoption" type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" />&nbsp;</td>
-			</tr>
-			<!-- ENDIF -->
+	<!-- IF S_DISPLAY_WATCHED -->
+	<tr>
+		<th colspan="4" height="28">{L_WATCHED_FORUMS}</th>
+	</tr>
 
-		</table></td>
+	<!-- BEGIN forumrow -->
+	<!-- IF forumrow.S_ROW_COUNT is even -->
+	<tr class="row1">
+	<!-- ELSE -->
+	<tr class="row2">
+	<!-- ENDIF -->
+		<td width="20" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
+		<td width="100%" class="topictitle"><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></span></td>
+		<td class="gensmall" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br /><!-- IF forumrow.U_LAST_POST_AUTHOR --><a href="{forumrow.U_LAST_POST_AUTHOR}">{forumrow.LAST_POST_AUTHOR}</a><!-- ELSE -->{forumrow.LAST_POST_AUTHOR}<!-- ENDIF --> <a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td>
+		<td> <input type="checkbox" name="f[{forumrow.FORUM_ID}]" /> </td>
+	</tr>
+	<!-- BEGINELSE -->
+	<tr class="row1">
+		<td colspan="4" height="25" align="center"><b class="genmed">{L_NO_WATCHED_FORUMS}</b></td>
+	</tr>
+	<!-- END forumrow -->
+	<tr>
+		<th colspan="4" height="28">{L_WATCHED_TOPICS}</th>
+	</tr>
+	<!-- BEGIN topicrow -->
+	<!-- IF topicrow.S_ROW_COUNT is even -->
+	<tr class="row1">
+	<!-- ELSE -->
+	<tr class="row2">
+	<!-- ENDIF -->
+		<td width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
+		<td width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
+		<td class="postdetails" align="center" valign="middle" nowrap="nowrap">{topicrow.LAST_POST_TIME}<br />{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}</td>
+		<td> <input type="checkbox" name="t[{topicrow.TOPIC_ID}]" /> </td>
 	</tr>
+	<!-- BEGINELSE -->
+	<tr class="row1">
+		<td colspan="4" height="25" align="center"><b class="genmed">{L_NO_WATCHED_TOPICS}</b></td>
+	</tr>
+	<!-- END topicrow -->
+	<tr>
+		<td class="cat" colspan="4" height="28" align="right"><input class="btnlite" type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" />&nbsp;</td>
+	</tr>
+	<!-- ENDIF -->
+
+
+</table>
 
 <!-- INCLUDE ucp_footer.html -->
 \ No newline at end of file