3 files changed, 156 insertions, 100 deletions
diff --git a/phpBB/templates/subSilver/ucp_main.html b/phpBB/templates/subSilver/ucp_main.html
index 2c06042922..2f9b66f579 100644
--- a/phpBB/templates/subSilver/ucp_main.html
+++ b/phpBB/templates/subSilver/ucp_main.html
@@ -1,75 +1,127 @@
 <!-- INCLUDE ucp_header.html -->
 
 	<tr>
-		<th colspan="3">{L_UCP}</th>
-	</tr>
-	<tr>
-		<td width="30%" align="left" valign="top">
-			<table width="100%" cellspacing="1" cellpadding="2" border="0" bgcolor="#FFFFFF">
-				<tr>
-					<td class="cat" colspan="3" height="28"><span class="cattitle">{L_SUBSCRIBED_TOPICS}</span></td>
-				</tr>
-				<!-- BEGIN subscribed_topics -->
-				<tr class="row1"> 
-					<td width="20">{subscribed_topics.TOPIC_FOLDER_IMG}</td>
-					<td>{subscribed_topics.NEWEST_POST_IMG}<a class="topictitle" href="{subscribed_topics.U_TOPIC}">{subscribed_topics.TOPIC_TITLE}</a></td>
-					<td width="18">{subscribed_topics.UNSUBSCRIBE_IMG}</td>
-				</tr>
-				<!-- END subcribed_topics -->
-			</table>
-			<br clear="all" />
-			<table width="100%" cellspacing="1" cellpadding="2" border="0" bgcolor="#FFFFFF">
-				<tr>
-					<td class="cat" colspan="3" height="28"><span class="cattitle">{L_SUBSCRIBED_FORUMS}</span></td>
-				</tr>
-				<!-- BEGIN subscribed_forums -->
-				<tr class="row1">
-					<td width="20">{subscribed_forums.FORUM_FOLDER_IMG}</td>
-					<td>{subscribed_forums.NEWEST_FORUM_POST_IMG}<a class="topictitle" href="{subscribed_forums.U_FORUM}">{subscribed_forums.FORUM_NAME}</a></td>
-					<td width="18">{subscribed_forums.UNSUBSCRIBE_IMG}</td>
-				</tr>
-				<!-- END subscribed_forums -->
-			</table>
-		</td>
-		<td align="left" valign="top">
-			<table width="100%" cellspacing="1" cellpadding="2" border="0" bgcolor="#FFFFFF">
-				<tr> 
-					<td class="cat" height="28" align="center"><span class="cattitle">{L_WELCOME_USERCP}</span></td>
-				</tr>
-				<tr> 
-					<td class="row1"><span class="gen">{UCP_WELCOME_MSG}</span></td>
-				</tr>
-			</table>
-		</td>
-		<td width="25%" align="center" valign="top">
-			<table width="100%" cellspacing="1" cellpadding="2" border="0" bgcolor="#FFFFFF">
-				<tr> 
-					<td class="cat" colspan="4" height="28"><a href="{U_BUDDY_LIST}" class="cattitle">{L_BUDDY_LIST}</a></td>
-				</tr>
-				<!-- BEGIN buddy_list -->
-				<tr class="row1"> 
-					<td width="20">{buddy_list.ONLINE_IMG}</td>
-					<td ><a class="topictitle" href="{buddy_list.U_PROFILE">{buddy_list.BUDDY}</a></td>
-					<td width="20"><a href="{buddy_list.U_PM}" class="topictitle">{L_PM}</a></td>
-					<td width="18">{buddy_list.REMOVE_BUDDY}</td>
-				</tr>
-				<!-- END buddy_list -->
-			</table>
-			<br clear="all" />
-			<table width="100%" cellspacing="1" cellpadding="2" border="0" bgcolor="#FFFFFF">
-				<tr> 
-					<td class="cat" colspan="4" height="28"><span class="cattitle">{L_UNREAD_PM}</span</td>
-				</tr>
-				<!-- BEGIN pm -->
-				<tr class="row1"> 
-					<td width="20">{pm.NEW_PM_IMG}</td>
-					<td width="70%"><a class="topictitle" href="{pm.U_PM}">{pm.PM_TITLE}</a></td>
-					<td width="30%"><a class="topictitle" href="{pm.U_PROFILE}">{pm.PM_SENDER}</a></td>
-					<td width="18">{pm.DELETE_PM_IMG}</td>
-				</tr>
-				<!-- END pm -->
-			</table>
-		</td>
+		<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>
+			</tr>
+			<tr>
+				<td class="cat" height="28">&nbsp;</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>
+
+			<!-- 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.FOLDER_IMG}</td>
+				<td width="100%" class="forumtitle"><a href="{forumrow.U_VIEW_TOPIC}">{forumrow.FORUM_TITLE}</a></span></td>
+				<td class="postdetails" align="center" valign="middle" nowrap="nowrap">{forumrow.LAST_POST_TIME}<br />{forumrow.LAST_POST_AUTHOR} {forumrow.LAST_POST_IMG}</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">&nbsp;</td>
+			</tr>
+			<!-- ENDIF -->
+
+		</table></td>
 	</tr>
 
 <!-- INCLUDE ucp_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/templates/subSilver/ucp_prefs.html b/phpBB/templates/subSilver/ucp_prefs.html
index a3b77b11e2..66e2516528 100644
--- a/phpBB/templates/subSilver/ucp_prefs.html
+++ b/phpBB/templates/subSilver/ucp_prefs.html
@@ -5,7 +5,7 @@
 	<tr> 
 		<td width="20%" height="100%"><table width="100%" height="100%" cellspacing="1" cellpadding="4" border="0">
 			<tr>
-				<th>Options</th>
+				<th>{L_UCP_OPTIONS}</th>
 			</tr>
 			<!-- BEGIN ucp_subsection -->
 			<tr>
@@ -24,7 +24,8 @@
 				<td class="cat" height="28">&nbsp;</td>
 			</tr>
 		</table></td>
-		<td class="row3"><img src="images/spacer.gif" width="1" alt="" /></td>		<td width="80%" valign="top"><table width="100%" cellspacing="1" cellpadding="4" border="0">
+		<td class="row3"><img src="images/spacer.gif" width="1" alt="" /></td>
+		<td width="80%" valign="top"><table width="100%" cellspacing="1" cellpadding="4" border="0">
 			<tr>
 				<th colspan="2" height="25" valign="middle">{L_TITLE}</th>
 			</tr>
@@ -37,7 +38,7 @@
 
 			<!-- IF S_DISPLAY_PERSONAL -->
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_PUBLIC_VIEW_EMAIL}:</b></td>
+			  <td class="row1"><b class="genmed">{L_SHOW_EMAIL}:</b></td>
 			  <td class="row2"> 
 				<input type="radio" name="viewemail" value="1"{VIEW_EMAIL_YES} />
 				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
@@ -45,7 +46,7 @@
 				<span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_HIDE_USER}:</b></td>
+			  <td class="row1"><b class="genmed">{L_HIDE_ONLINE}:</b></td>
 			  <td class="row2"> 
 				<input type="radio" name="hideonline" value="1"{HIDE_USER_YES} />
 				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
@@ -53,16 +54,7 @@
 				<span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_NOTIFY_ON_REPLY}:</b><br />
-				<span class="gensmall">{L_NOTIFY_ON_REPLY_EXPLAIN}</span></td>
-			  <td class="row2"> 
-				<input type="radio" name="notifyreply" value="1"{NOTIFY_REPLY_YES} />
-				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
-				<input type="radio" name="notifyreply" value="0"{NOTIFY_REPLY_NO} />
-				<span class="gen">{L_NO}</span></td>
-			</tr>
-			<tr> 
-			  <td class="row1"><b class="genmed">{L_NOTIFY_ON_PRIVMSG}:</b></td>
+			  <td class="row1"><b class="genmed">{L_NOTIFY_ON_PM}:</b></td>
 			  <td class="row2"> 
 				<input type="radio" name="notifypm" value="1"{NOTIFY_PM_YES} />
 				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
@@ -70,7 +62,7 @@
 				<span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_POPUP_ON_PRIVMSG}:</b><br /><span class="gensmall">{L_POPUP_ON_PRIVMSG_EXPLAIN}</span></td>
+			  <td class="row1"><b class="genmed">{L_POPUP_ON_PM}:</b></td>
 			  <td class="row2"> 
 				<input type="radio" name="popup_pm" value="1"{POPUP_PM_YES} />
 				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
@@ -86,12 +78,16 @@
 			  <td class="row2"><select name="style">{S_STYLE_OPTIONS}</select></td>
 			</tr>
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_TIMEZONE}:</b></td>
+			  <td class="row1"><b class="genmed">{L_BOARD_TIMEZONE}:</b></td>
 			  <td class="row2"><select name="tz">{S_TZ_OPTIONS}</select></td>
 			</tr>
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_DATE_FORMAT}:</b><br />
-				<span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
+				<td class="row1"><b class="genmed">{L_BOARD_DST}:</b></td>
+				<td class="row2"><input type="radio" name="dst" value="1"{DST_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="dst" value="0"{DST_NO} /> <span class="gen">{L_NO}</span></td>
+			</tr>
+			<tr> 
+			  <td class="row1"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br />
+				<span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>
 			  <td class="row2"> 
 				<input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="14" class="post" />
 			  </td>
@@ -101,7 +97,7 @@
 
 			<!-- IF S_DISPLAY_POST -->
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_ALWAYS_ADD_SIGNATURE}:</b></td>
+			  <td class="row1"><b class="genmed">{L_DEFAULT_ADD_SIG}:</b></td>
 			  <td class="row2"> 
 				<input type="radio" name="attachsig" value="1"{ALWAYS_ADD_SIGNATURE_YES} />
 				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
@@ -109,7 +105,7 @@
 				<span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_ALWAYS_ALLOW_BBCODE}:</b></td>
+			  <td class="row1"><b class="genmed">{L_DEFAULT_BBCODE}:</b></td>
 			  <td class="row2"> 
 				<input type="radio" name="allowbbcode" value="1"{ALWAYS_ALLOW_BBCODE_YES} />
 				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
@@ -117,7 +113,7 @@
 				<span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_ALWAYS_ALLOW_HTML}:</b></td>
+			  <td class="row1"><b class="genmed">{L_DEFAULT_HTML}:</b></td>
 			  <td class="row2"> 
 				<input type="radio" name="allowhtml" value="1"{ALWAYS_ALLOW_HTML_YES} />
 				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
@@ -125,13 +121,21 @@
 				<span class="gen">{L_NO}</span></td>
 			</tr>
 			<tr> 
-			  <td class="row1"><b class="genmed">{L_ALWAYS_ALLOW_SMILIES}:</b></td>
+			  <td class="row1"><b class="genmed">{L_DEFAULT_SMILE}:</b></td>
 			  <td class="row2"> 
 				<input type="radio" name="allowsmilies" value="1"{ALWAYS_ALLOW_SMILIES_YES} />
 				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
 				<input type="radio" name="allowsmilies" value="0"{ALWAYS_ALLOW_SMILIES_NO} />
 				<span class="gen">{L_NO}</span></td>
 			</tr>
+			<tr> 
+			  <td class="row1"><b class="genmed">{L_DEFAULT_NOTIFY}:</b></td>
+			  <td class="row2"> 
+				<input type="radio" name="notifyreply" value="1"{NOTIFY_REPLY_YES} />
+				<span class="gen">{L_YES}</span>&nbsp;&nbsp; 
+				<input type="radio" name="notifyreply" value="0"{NOTIFY_REPLY_NO} />
+				<span class="gen">{L_NO}</span></td>
+			</tr>
 			<!-- ENDIF -->
 
 			<tr>
diff --git a/phpBB/templates/subSilver/ucp_profile.html b/phpBB/templates/subSilver/ucp_profile.html
index ade2418f38..93bed921e4 100644
--- a/phpBB/templates/subSilver/ucp_profile.html
+++ b/phpBB/templates/subSilver/ucp_profile.html
@@ -42,25 +42,25 @@
 			</tr>
 			<tr> 
 				<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
-				<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" style="width:200px" name="email" size="25" maxlength="255" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>
+				<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="255" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>
 			</tr>
 			<!-- IF S_CHANGE_PASSWORD -->
 			<tr> 
 				<td class="row1"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_NEW_PASSWORD_EXPLAIN}</span></td>
-				<td class="row2"><input type="password" class="post" style="width: 200px" name="new_password" size="25" maxlength="100" value="{PASSWORD}" /></td>
+				<td class="row2"><input type="password" class="post" name="new_password" size="30" maxlength="100" value="{PASSWORD}" /></td>
 			</tr>
 			<tr> 
 				<td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}: </b><br /><span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td>
-				<td class="row2"><input type="password" class="post" style="width: 200px" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
+				<td class="row2"><input type="password" class="post" name="password_confirm" size="30" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
 			</tr>
 			<tr> 
 				<td class="row1"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall">{L_CURRENT_PASSWORD_EXPLAIN}</span></td>
-				<td class="row2"><input type="password" class="post" style="width: 200px" name="cur_password" size="25" maxlength="100" value="{PASSWORD}" /></td>
+				<td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="100" value="{PASSWORD}" /></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- ENDIF -->
 
-			<!-- IF S_DISPLAY_PROFILE -->
+			<!-- IF S_DISPLAY_PROFILE_INFO -->
 			<tr> 
 				<td class="row3" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
 			</tr>
@@ -166,24 +166,24 @@
 				<td class="row2" valign="top"><table cellspacing="0" cellpadding="1" border="0">
 					<!-- IF S_HTML_ALLOWED -->
 					<tr>
-						<td><input type="checkbox" name="disable_html" {S_HTML_CHECKED} /></td>
+						<td><input type="checkbox" name="disable_html"{S_HTML_CHECKED} /></td>
 						<td class="gen">{L_DISABLE_HTML}</td>
 					</tr>
 					<!-- ENDIF -->
 					<!-- IF S_BBCODE_ALLOWED -->
 					<tr>
-						<td><input type="checkbox" name="disable_bbcode" {S_BBCODE_CHECKED} /></td>
+						<td><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
 						<td class="gen">{L_DISABLE_BBCODE}</td>
 					</tr>
 					<!-- ENDIF -->
 					<!-- IF S_SMILIES_ALLOWED -->
 					<tr>
-						<td><input type="checkbox" name="disable_smilies" {S_SMILIES_CHECKED} /></td>
+						<td><input type="checkbox" name="disable_smilies"{S_SMILIES_CHECKED} /></td>
 						<td class="gen">{L_DISABLE_SMILIES}</td>
 					</tr>
 					<!-- ENDIF -->
 					<tr>
-						<td><input type="checkbox" name="disable_magic_url" {S_MAGIC_URL_CHECKED} /></td>
+						<td><input type="checkbox" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /></td>
 						<td class="gen">{L_DISABLE_MAGIC_URL}</td>
 					</tr>
 				</table></td>