6 files changed, 139 insertions, 61 deletions
diff --git a/phpBB/templates/subSilver/agreement.html b/phpBB/templates/subSilver/agreement.html
index 6c1e9ed434..a04063d693 100644
--- a/phpBB/templates/subSilver/agreement.html
+++ b/phpBB/templates/subSilver/agreement.html
@@ -1,3 +1,4 @@
+<!-- INCLUDE overall_header.html -->
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr>
@@ -12,8 +13,20 @@
 	<tr>
 		<td class="row1" align="center"><table width="80%" cellspacing="2" cellpadding="2" border="0" align="center">
 			<tr>
-				<td><span class="genmed"><br />{AGREEMENT}<br /><br /><br /><div align="center"><a href="{U_AGREE_OVER13}" class="genmed">{AGREE_OVER_13}</a><br /><br /><a href="{U_AGREE_UNDER13}" class="genmed">{AGREE_UNDER_13}</a><br /><br /><a href="{U_INDEX}" class="genmed">{DO_NOT_AGREE}</a></div><br /></span></td>
+				<td><span class="genmed"><br />{AGREEMENT}<br /><br />{REGISTRATION_CONDITIONS}<br />
+					<div align="center">
+						<form action="{U_UCP_AGREE}" method="POST">
+							<!-- IF S_COPPA_ENABLED -->
+							<input type="submit" name="coppa_over_13" value="{AGREE_OVER_13}"><br /><br />
+							<input type="submit" name="coppa_under_13" value="{AGREE_UNDER_13}"><br /><br />
+							<!-- ELSE -->
+							<input type="submit" name="agree" value="{AGREE}"><br /><br />
+							<!-- ENDIF -->
+							<input type="submit" name="do_not_agree" value="{DO_NOT_AGREE}"><input type="hidden" name="mode" value="register">
+						</form>
+					</div><br /></span></td>
 			</tr>
 		</table></td>
 	</tr>
 </table>
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/templates/subSilver/profile_add_body.html b/phpBB/templates/subSilver/profile_add_body.html
index 3ce79b087a..dfa5de0182 100644
--- a/phpBB/templates/subSilver/profile_add_body.html
+++ b/phpBB/templates/subSilver/profile_add_body.html
@@ -48,69 +48,15 @@
 		<input type="password" class="post" style="width: 200px" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" />
 	  </td>
 	</tr>
-	<tr> 
-	  <td class="catSides" colspan="2" height="28">&nbsp;</td>
-	</tr>
-	<tr> 
-	  <th class="thSides" colspan="2" height="25" valign="middle">{L_PROFILE_INFO}</th>
-	</tr>
-	<tr> 
-	  <td class="row2" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
-	</tr>
-	<tr> 
-	  <td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td>
-	  <td class="row2"> 
-		<input type="text" name="icq" class="post"style="width: 100px"  size="10" maxlength="15" value="{ICQ}" />
-	  </td>
-	</tr>
-	<tr> 
-	  <td class="row1"><span class="gen">{L_AIM}:</span></td>
-	  <td class="row2"> 
-		<input type="text" class="post"style="width: 150px"  name="aim" size="20" maxlength="255" value="{AIM}" />
-	  </td>
-	</tr>
-	<tr> 
-	  <td class="row1"><span class="gen">{L_MESSENGER}:</span></td>
-	  <td class="row2"> 
-		<input type="text" class="post"style="width: 150px"  name="msn" size="20" maxlength="255" value="{MSN}" />
-	  </td>
-	</tr>
-	<tr> 
-	  <td class="row1"><span class="gen">{L_YAHOO}:</span></td>
-	  <td class="row2"> 
-		<input type="text" class="post"style="width: 150px"  name="yim" size="20" maxlength="255" value="{YIM}" />
-	  </td>
-	</tr>
-	<tr> 
-	  <td class="row1"><span class="gen">{L_WEBSITE}:</span></td>
-	  <td class="row2"> 
-		<input type="text" class="post"style="width: 200px"  name="website" size="25" maxlength="255" value="{WEBSITE}" />
-	  </td>
-	</tr>
-	<tr> 
-	  <td class="row1"><span class="gen">{L_LOCATION}:</span></td>
-	  <td class="row2"> 
-		<input type="text" class="post"style="width: 200px"  name="location" size="25" maxlength="100" value="{LOCATION}" />
-	  </td>
-	</tr>
-	<tr> 
-	  <td class="row1"><span class="gen">{L_OCCUPATION}:</span></td>
-	  <td class="row2"> 
-		<input type="text" class="post"style="width: 200px"  name="occupation" size="25" maxlength="100" value="{OCCUPATION}" />
-	  </td>
-	</tr>
-	<tr> 
-	  <td class="row1"><span class="gen">{L_INTERESTS}:</span></td>
-	  <td class="row2"> 
-		<input type="text" class="post"style="width: 200px"  name="interests" size="35" maxlength="150" value="{INTERESTS}" />
-	  </td>
+	<!-- IF S_CONFIRM_CODE -->
+	<tr>
+		<td class="row1" colspan="2" align="center">{CONFIRM_CODE}</td>
 	</tr>
 	<tr> 
-	  <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /><br />{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td>
-	  <td class="row2"> 
-		<textarea name="signature"style="width: 300px"  rows="6" cols="30" class="post">{SIGNATURE}</textarea>
-	  </td>
+	  <td class="row1"><span class="gen">{L_CONFIRM_CODE}: * </span><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
+	  <td class="row2"><input type="text" class="post" style="width: 200px" name="confirm_code" size="6" maxlength="6" value="" /></td>
 	</tr>
+	<!-- ENDIF -->
 	<tr> 
 	  <td class="catSides" colspan="2" height="28">&nbsp;</td>
 	</tr>
diff --git a/phpBB/templates/subSilver/usercp.html b/phpBB/templates/subSilver/usercp.html
new file mode 100755
index 0000000000..4ebeb64e0f
--- /dev/null
+++ b/phpBB/templates/subSilver/usercp.html
@@ -0,0 +1,5 @@
+<!-- INCLUDE overall_header.html -->
+
+{SECTION}
+
+<!-- INCLUDE overall_footer.html -->
+\ No newline at end of file
diff --git a/phpBB/templates/subSilver/usercp_footer.html b/phpBB/templates/subSilver/usercp_footer.html
new file mode 100755
index 0000000000..0e6c59dc6e
--- /dev/null
+++ b/phpBB/templates/subSilver/usercp_footer.html
@@ -0,0 +1,17 @@
+                </table>
+                <br> </td>
+            </tr>
+            <tr> 
+              <td height="25" colspan="3" align="left" class="catBottom">&nbsp;</td>
+            </tr>
+          </tbody>
+        </table>
+
+<table width="100%" cellspacing="0" border="0" align="center" cellpadding="2">
+  <tbody><tr>
+	<td align="left"><span class="gensmall">&nbsp;</td>
+	<td align="right"><span class="gensmall">{S_TIMEZONE}</span></td>
+  </tr>
+</tbody></table>
+
+<!-- INCLUDE overall_footer.html -->
+\ No newline at end of file
diff --git a/phpBB/templates/subSilver/usercp_header.html b/phpBB/templates/subSilver/usercp_header.html
new file mode 100755
index 0000000000..3527be4f7f
--- /dev/null
+++ b/phpBB/templates/subSilver/usercp_header.html
@@ -0,0 +1,26 @@
+<!-- INCLUDE overall_header.html -->
+<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center">
+  <tbody><tr>
+	<td align="left" valign="bottom"><span class="gensmall">
+	{CURRENT_TIME}<br></span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
+	          <td align="right" valign="bottom" class="gensmall">&nbsp; </td>
+  </tr>
+</tbody></table>
+
+        <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
+          <tbody>
+            <tr> 
+              <th height="25" colspan="3" align="left" class="thHead"><table width="100%">
+                  <tr align="center">
+						<!-- BEGIN ucp_sections -->
+							<!-- IF ucp_sections.S_IS_TAB -->
+							<td width="150" class="bodyline"><a class="cattitle" href="{ucp_sections.U_SECTION}">{ucp_sections.SECTION}</a></td>
+							<!-- ELSE -->
+							<td width="150" class="row2"><a class="cattitle" href="{ucp_sections.U_SECTION}">{ucp_sections.SECTION}</a></td>
+							<!-- ENDIF -->
+						<!-- END ucp_sections -->
+                    <td class="bodyline">&nbsp;</td>
+                  </tr>
+                </table> </th>
+            </tr>
+
diff --git a/phpBB/templates/subSilver/usercp_main.html b/phpBB/templates/subSilver/usercp_main.html
new file mode 100755
index 0000000000..02459f23c3
--- /dev/null
+++ b/phpBB/templates/subSilver/usercp_main.html
@@ -0,0 +1,71 @@
+<!-- INCLUDE usercp_header.html -->
+
+            <tr align="left"> 
+              <td height="25" colspan="3" class="cathead">
+				  	<!-- BEGIN ucp_subsections -->
+					 <a href="{ucp_subsections.U_SUBSECTION}" class="topictitle">{ucp_subsections.SUBSECTION}</a>
+					 <!-- IF ucp_subsections.IS_MULTI_SECTIONS -->&nbsp;&nbsp;-<!-- ENDIF -->
+					<!-- END ucp_subsections -->
+            </tr>
+            <tr> 
+              <td width="30%" align="left" valign="top" class="row1"> <br> <table width="100%" bgcolor="#FFFFFF">
+                  <tr> 
+                    <td height="25" colspan="3" class="row2"><span class="cattitle">{L_SUBSCRIBED_TOPICS}</span></td>
+                  </tr>
+						<!-- BEGIN subscribed_topics -->
+                  <tr> 
+                    <td  width="20"  class="row1">{subscribed_topics.TOPIC_FOLDER_IMG}</td>
+                    <td  class="row1" >{subscribed_topics.NEWEST_POST_IMG}<a class="topictitle" href="{subscribed_topics.U_TOPIC}">{subscribed_topics.TOPIC_TITLE}</a></td>
+                    <td width="18" class="row1" >{subscribed_topics.UNSUBSCRIBE_IMG}</td>
+                  </tr>
+						<!-- END subcribed_topics -->
+                </table>
+                <br> <table width="100%" bgcolor="#FFFFFF">
+                  <tr> 
+                    <td height="25" colspan="3" class="row2"><span class="cattitle">{L_SUBSCRIBED_FORUMS}</span></td>
+                  </tr>
+						<!-- BEGIN subscribed_forums -->
+                  <tr> 
+                    <td width="20"  class="row1">{subscribed_forums.FORUM_FOLDER_IMG}</td>
+                    <td  class="row1" >{subscribed_forums.NEWEST_FORUM_POST_IMG}<a class="topictitle" href="{subscribed_forums.U_FORUM}">{subscribed_forums.FORUM_NAME}</a></td>
+                    <td width="18" class="row1" >{subscribed_forums.UNSUBSCRIBE_IMG}</td>
+                  </tr>
+						<!-- END subscribed_forums -->
+                </table>
+                <br> </td>
+              <td class="row1" align="left" valign="top"><br>
+<table width="100%" bgcolor="#FFFFFF">
+                  <tr> 
+                    <td height="25" class="row2"><span class="gen">{L_WELCOME_USERCP}</span></td>
+                  </tr>
+                  <tr> 
+                    <td class="row1" ><span class="genmed">{UCP_WELCOME_MSG}</span> </td>
+                  </tr>
+                </table></td>
+              <td width="25%" align="center" valign="top" class="row1"> <br> <table width="100%" bgcolor="#FFFFFF">
+                  <tr> 
+                    <td height="25" colspan="4" class="row2"><a href="{U_BUDDY_LIST}" class="cattitle">{L_BUDDY_LIST}</a></td>
+                  </tr>
+						<!-- BEGIN buddy_list -->
+                  <tr> 
+                    <td width="20"  class="row1" >{buddy_list.ONLINE_IMG}</td>
+                    <td  class="row1" ><a class="topictitle" href="{buddy_list.U_PROFILE">{buddy_list.BUDDY}</a></td>
+                    <td width="20"  class="row1" ><a href="{buddy_list.U_PM}" class="topictitle">{L_PM}</a></td>
+                    <td width="18" class="row1" >{buddy_list.REMOVE_BUDDY}</td>
+                  </tr>
+						<!-- END buddy_list -->
+                </table>
+                <br> <table width="100%" bgcolor="#FFFFFF">
+                  <tr> 
+                    <td height="25" colspan="4" class="row2"><span class="cattitle">{L_UNREAD_PM}</span</td>
+                  </tr>
+						<!-- BEGIN pm -->
+                  <tr> 
+                    <td width="20"  class="row1" >{pm.NEW_PM_IMG}</td>
+                    <td width="70%"  class="row1" ><a class="topictitle" href="{pm.U_PM}">{pm.PM_TITLE}</a></td>
+                    <td width="30%" class="row1" ><a class="topictitle" href="{pm.U_PROFILE}">{pm.PM_SENDER}</a></td>
+                    <td width="18" class="row1" >{pm.DELETE_PM_IMG}</td>
+                  </tr>
+						<!-- END pm -->
+
+<!-- INCLUDE usercp_footer.html -->
+\ No newline at end of file