6 files changed, 253 insertions, 94 deletions
diff --git a/phpBB/templates/subSilver/mcp_forum.html b/phpBB/templates/subSilver/mcp_forum.html
new file mode 100644
index 0000000000..c740434910
--- /dev/null
+++ b/phpBB/templates/subSilver/mcp_forum.html
@@ -0,0 +1,56 @@
+<!-- INCLUDE mcp_header.html -->
+
+<table width="100%" cellspacing="0" cellpadding="0" border="0" align="center"><form method="post" action="{S_MCP_ACTION}">
+	<tr>
+		<td colspan="2">
+			<table width="100%" class="forumline" cellspacing="1" cellpadding="4" border="0">
+				<tr> 
+				  <th width="4%" class="thLeft" nowrap="nowrap">&nbsp;</th>
+				  <th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
+				  <th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
+				  <th width="17%" nowrap="nowrap">&nbsp;{L_LASTPOST}&nbsp;</th>
+				  <th width="5%" class="thRight" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
+				</tr>
+				<!-- BEGIN topicrow -->
+				<tr> 
+				  <td class="row1" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
+				  <td class="row1">&nbsp;<span class="topictitle"><!-- IF topicrow.S_MERGE_SELECT -->[ {topicrow.S_MERGE_SELECT} ] <!-- ENDIF -->{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td>
+				  <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
+				  <td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST_TIME}</span></td>
+				  <td class="row2" align="center" valign="middle"> 
+					<input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" />
+				  </td>
+				</tr>
+				<!-- BEGINELSE -->
+				<tr>
+					<td class="row1" colspan="8" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td>
+				</tr>
+				<!-- END topicrow -->
+				<tr align="right"> 
+				  <td class="catBottom" colspan="5" height="29"> {S_HIDDEN_FIELDS} 
+					<input type="submit" name="delete" class="liteoption" value="{L_DELETE}" />
+					&nbsp; 
+					<input type="submit" name="move" class="liteoption" value="{L_MOVE}" />
+					&nbsp; 
+					<input type="submit" name="lock" class="liteoption" value="{L_LOCK}" />
+					&nbsp; 
+					<input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" />
+				  </td>
+				</tr>
+			  </table>
+			  <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
+			  <tr> 
+				<td align="left" valign="middle"><span class="nav">{PAGE_NUMBER}</b></span></td>
+				<td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td>
+			  </tr>
+			</table>
+			<table width="100%" border="0" cellspacing="0" cellpadding="0">
+			  <tr> 
+				<td align="right">{JUMPBOX}</td>
+			  </tr>
+			</table>
+		</td>
+	</tr>
+</form></table>
+
+<!-- INCLUDE overall_footer.html -->
+\ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_front.html b/phpBB/templates/subSilver/mcp_front.html
new file mode 100644
index 0000000000..eb606b9c9f
--- /dev/null
+++ b/phpBB/templates/subSilver/mcp_front.html
@@ -0,0 +1,9 @@
+<!-- INCLUDE mcp_header.html -->
+
+<br /><br />
+Moderation queue:<br />
+There are xx posts waiting to be approved<br />
+<br />
+Reported posts:<br />
+There are xx reported posts to review<br />
+<br /><br />
diff --git a/phpBB/templates/subSilver/mcp_header.html b/phpBB/templates/subSilver/mcp_header.html
new file mode 100644
index 0000000000..a9ee1ed9b4
--- /dev/null
+++ b/phpBB/templates/subSilver/mcp_header.html
@@ -0,0 +1,41 @@
+<!-- INCLUDE overall_header.html -->
+<table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
+	<!-- IF FORUM_NAME -->
+	<tr>
+		<td align="left" valign="bottom"><a class="maintitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></td>
+	</tr>
+	<!-- ENDIF -->
+	<!-- IF PAGINATION -->
+	<tr>
+		<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><b>{PAGINATION}</b></span></td>
+	</tr>
+	<!-- ENDIF -->
+	<tr>
+		<td>&nbsp;</td>
+	</tr>
+	<!-- INCLUDE jumpbox.html -->
+	<tr>
+		<td valign="bottom">
+			<table cellspacing="1" cellpadding="4" border="0" bgcolor="#006699" align="left">
+				<tr>
+					<!-- BEGIN tab -->
+					<td class="cat">&nbsp;<span class="nav">
+						<!-- IF tab.S_IS_SELECTED -->
+							<a href="{tab.U_LINK}"><i>{tab.NAME}</i></a>
+						<!-- ELSE -->
+							<a href="{tab.U_LINK}">{tab.NAME}</a>
+						<!-- ENDIF -->
+						</span>&nbsp;</td>
+					<!-- END tab -->
+				</tr>
+			</table>
+		</td>
+		<td align="right" valign="bottom">
+			<table cellspacing="1" cellpadding="4" border="0">
+				<tr>
+					<td><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+\ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_move.html b/phpBB/templates/subSilver/mcp_move.html
index 6d3a2bbb25..e2a2fd7f37 100644
--- a/phpBB/templates/subSilver/mcp_move.html
+++ b/phpBB/templates/subSilver/mcp_move.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<form action="{S_MODCP_ACTION}" method="post">
+<form action="{S_MODCP_ACTION}" method="post"><input type="hidden" name="mode" value="move">
   <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr> 
 	  <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
@@ -17,15 +17,28 @@
 			<td>&nbsp;</td>
 		  </tr>
 		  <tr> 
-			<td align="center"><span class="gen">{L_MOVE_TO_FORUM} &nbsp; {S_FORUM_SELECT}<br /><br />
+			<td align="center"><table border="0" cellspacing="0" cellpadding="0">
+				<tr><td align="left">
+					{L_SELECTED_TOPICS}<br /><br />
+					<ul><!-- BEGIN topiclist -->
+						<li>{topiclist.TOPIC_TITLE}
+					<!-- END topiclist --></ul>
+				</td></tr>
+			</table></td>
+		  </tr>
+		  <tr> 
+			<td>&nbsp;</td>
+		  </tr>
+		  <tr> 
+			<td align="center"><span class="gen">{L_MOVE_TO_FORUM} &nbsp; <select name="new_forum_id">{S_FORUM_SELECT}</select><br /><br />
 			  <input type="checkbox" name="move_leave_shadow" checked="checked" />{L_LEAVE_SHADOW}<br />
 			  <br />
 			  {MESSAGE_TEXT}</span><br />
 			  <br />
 			  {S_HIDDEN_FIELDS} 
-			  <input class="mainoption" type="submit" name="confirm" value="{L_YES}" />
+			  <input class="mainoption" type="submit" name="confirm" value="{L_CONFIRM}" />
 			  &nbsp;&nbsp; 
-			  <input class="liteoption" type="submit" name="cancel" value="{L_NO}" />
+			  <input class="liteoption" type="submit" name="cancel" value="{L_CANCEL}" />
 			</td>
 		  </tr>
 		  <tr> 
diff --git a/phpBB/templates/subSilver/mcp_split.html b/phpBB/templates/subSilver/mcp_split.html
deleted file mode 100644
index 254bdc4fbc..0000000000
--- a/phpBB/templates/subSilver/mcp_split.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form method="post" action="{S_SPLIT_ACTION}">
-  <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr> 
-	  <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a><span class="nav"> 
-		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
-	</tr>
-  </table>
-  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
-	<tr> 
-	  <th height="25" class="thHead" colspan="3" nowrap="nowrap">{L_SPLIT_TOPIC}</th>
-	</tr>
-	<tr> 
-	  <td class="row2" colspan="3" align="center"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td>
-	</tr>
-	<tr> 
-	  <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_SUBJECT}</span></td>
-	  <td class="row2" colspan="2"><span class="courier"> 
-		<input type="text" size="35" style="width: 350px" maxlength="100" name="subject" class="post" />
-		</span></td>
-	</tr>
-	<tr> 
-	  <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
-	  <td class="row2" colspan="2"><span class="courier">{S_FORUM_SELECT}</span></td>
-	</tr>
-	<tr> 
-	  <td class="catHead" colspan="3" height="28"> 
-		<table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
-		  <tr> 
-			<td width="50%" align="center"> 
-			  <input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" />
-			</td>
-			<td width="50%" align="center"> 
-			  <input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" />
-			</td>
-		  </tr>
-		</table>
-	  </td>
-	</tr>
-	<tr> 
-	  <th class="thLeft" nowrap="nowrap">{L_AUTHOR}</th>
-	  <th nowrap="nowrap">{L_MESSAGE}</th>
-	  <th class="thRight" nowrap="nowrap">{L_SELECT}</th>
-	</tr>
-	<!-- BEGIN postrow -->
-	<tr> 
-	  <td align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a>{postrow.POSTER_NAME}</span></td>
-	  <td width="100%" valign="top" class="{postrow.ROW_CLASS}"> 
-		<table width="100%" cellspacing="0" cellpadding="3" border="0">
-		  <tr> 
-			<td valign="middle"><img src="templates/subSilver/images/icon_minipost.gif" alt="{L_POST}"><span class="postdetails">{L_POSTED}: 
-			  {postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
-		  </tr>
-		  <tr> 
-			<td valign="top"> 
-			  <hr size="1" />
-			  <span class="postbody">{postrow.MESSAGE}</span></td> 
-		  </tr>
-		</table>
-	  </td>
-	  <td width="5%" align="center" class="{postrow.ROW_CLASS}">{postrow.S_SPLIT_CHECKBOX}</td>
-	</tr>
-	<tr> 
-	  <td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td>
-	</tr>
-	<!-- END postrow -->
-	<tr> 
-	  <td class="catBottom" colspan="3" height="28"> 
-		<table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
-		  <tr> 
-			<td width="50%" align="center"> 
-			  <input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" />
-			</td>
-			<td width="50%" align="center"> 
-			  <input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" />
-			  {S_HIDDEN_FIELDS} </td>
-		  </tr>
-		</table>
-	  </td>
-	</tr>
-  </table>
-  <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
-	<tr> 
-	  <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
-	</tr>
-  </table>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_topic.html b/phpBB/templates/subSilver/mcp_topic.html
new file mode 100644
index 0000000000..eda0ddd1b8
--- /dev/null
+++ b/phpBB/templates/subSilver/mcp_topic.html
@@ -0,0 +1,130 @@
+<!-- INCLUDE mcp_header.html -->
+
+<form method="post" action="{S_FORM_ACTION}">
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+	<tr> 
+		<td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a><span class="nav"> 
+		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
+	</tr>
+</table>
+<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
+<!-- IF S_ENABLE_SPLIT -->
+	<tr> 
+		<th height="25" class="thHead" colspan="3" nowrap="nowrap">{L_SPLIT_TOPIC}</th>
+	</tr>
+	<tr> 
+		<td class="row2" colspan="3" align="center"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td>
+	</tr>
+	<tr> 
+		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_SUBJECT}</span></td>
+		<td class="row2" colspan="2"><span class="courier"> 
+		<input type="text" size="35" style="width: 350px" maxlength="100" name="subject" class="post" />
+		</span></td>
+	</tr>
+	<tr> 
+		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
+		<td class="row2" colspan="2"><span class="courier">{S_FORUM_SELECT}</span></td>
+	</tr>
+<!-- ENDIF -->
+<!-- IF S_ENABLE_MERGE -->
+	<tr> 
+		<th height="25" class="thHead" colspan="3" nowrap="nowrap">{L_MERGE_TOPIC_ID}</th>
+	</tr>
+	<tr> 
+		<td class="row2" colspan="3" align="center"><span class="gensmall">{L_MERGE_TOPIC_EXPLAIN}</span></td>
+	</tr>
+	<tr> 
+		<td class="row1" nowrap="nowrap"><span class="gen">{L_MERGE_TOPIC}</span></td>
+		<td class="row2" colspan="2"><span class="courier"><input type="text" size="6" name="to_topic_id" value="{TO_TOPIC_ID}"> <input type="submit" name="select_topic" value="{L_SELECT_TOPIC}"><!-- IF TO_TOPIC_EXPLAIN -->
+			<span class="gensmall"><br />{TO_TOPIC_EXPLAIN}</span><!-- ENDIF -->
+		</span></td>
+	</tr>
+<!-- ENDIF -->
+	<tr> 
+		<td class="catHead" colspan="3" height="28"> 
+		<table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
+			<tr>
+			<!-- IF S_ENABLE_MERGE -->
+			<td align="center"> 
+				&nbsp;<input class="liteoption" type="submit" name="merge_posts" value="{L_MERGE_POSTS}" />&nbsp;
+			</td>
+			<!-- ENDIF -->
+			<!-- IF S_ENABLE_DELETE -->
+			<td align="center"> 
+				&nbsp;<input class="liteoption" type="submit" name="delete_posts" value="{L_DELETE_POSTS}" />&nbsp;
+			</td>
+			<!-- ENDIF -->
+			<!-- IF S_ENABLE_SPLIT -->
+			<td align="center"> 
+				&nbsp;<input class="liteoption" type="submit" name="split_all" value="{L_SPLIT_POSTS}" />&nbsp;
+			</td>
+			<td align="center"> 
+				&nbsp;<input class="liteoption" type="submit" name="split_beyond" value="{L_SPLIT_AFTER}" />&nbsp;
+			</td>
+			<!-- ENDIF -->
+			</tr>
+		</table>
+		</td>
+	</tr>
+	<tr> 
+		<th class="thLeft" nowrap="nowrap">{L_AUTHOR}</th>
+		<th nowrap="nowrap">{L_MESSAGE}</th>
+		<th class="thRight" nowrap="nowrap">{L_SELECT}</th>
+	</tr>
+	<!-- BEGIN postrow -->
+	<tr> 
+		<td align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a>{postrow.POSTER_NAME}</span></td>
+		<td width="100%" valign="top" class="{postrow.ROW_CLASS}"> 
+		<table width="100%" cellspacing="0" cellpadding="3" border="0">
+			<tr> 
+			<td valign="middle"><img src="imagesets/subSilver/icon_minipost.gif" alt="{L_POST}"><span class="postdetails">{L_POSTED}: 
+				{postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
+			</tr>
+			<tr> 
+			<td valign="top"> 
+				<hr size="1" />
+				<span class="postbody">{postrow.MESSAGE}</span></td> 
+			</tr>
+		</table>
+		</td>
+		<td width="5%" align="center" class="{postrow.ROW_CLASS}">{postrow.S_CHECKBOX}</td>
+	</tr>
+	<tr> 
+		<td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td>
+	</tr>
+	<!-- END postrow -->
+	<tr> 
+		<td class="catBottom" colspan="3" height="28"> 
+		<table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
+			<tr> 
+			<!-- IF S_ENABLE_MERGE -->
+			<td align="center"> 
+				&nbsp;<input class="liteoption" type="submit" name="merge_posts" value="{L_MERGE_POSTS}" />&nbsp;
+			</td>
+			<!-- ENDIF -->
+			<!-- IF S_ENABLE_DELETE -->
+			<td align="center"> 
+				&nbsp;<input class="liteoption" type="submit" name="delete_posts" value="{L_DELETE_POSTS}" />&nbsp;
+			</td>
+			<!-- ENDIF -->
+			<!-- IF S_ENABLE_SPLIT -->
+			<td align="center"> 
+				&nbsp;<input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" />&nbsp;
+			</td>
+			<td align="center"> 
+				&nbsp;<input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" />&nbsp;
+			</td>
+			<!-- ENDIF -->
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
+	<tr> 
+		<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
+	</tr>
+</table>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
+\ No newline at end of file