9 files changed, 135 insertions, 104 deletions
diff --git a/phpBB/styles/subSilver/template/mcp_footer.html b/phpBB/styles/subSilver/template/mcp_footer.html
index f0f1b942d8..afc10d98d3 100644
--- a/phpBB/styles/subSilver/template/mcp_footer.html
+++ b/phpBB/styles/subSilver/template/mcp_footer.html
@@ -4,7 +4,17 @@
 			</td>
 		</tr>
 	</table>
-
+	<!-- IF PAGINATION -->
+	<table width="80%" align="right" cellspacing="1">
+		<tr>
+			<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
+			<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL} ]&nbsp;</td>
+			<td class="gensmall" width="100%" align="right" nowrap="nowrap"><b>{PAGINATION}</b></td>
+		</tr>
+	</table>
+	<br />
+	<!-- ENDIF -->
+	
 	</div>
 
 	<br clear="all" />
@@ -20,6 +30,6 @@
 
 	<br clear="all" />
 
-	<div style="float: right"><!-- INCLUDE mcp_jumpbox.html --></div>
+	<div style="float: right"><!-- INCLUDE jumpbox.html --></div>
 
 <!-- INCLUDE overall_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html
index b43813b60a..cd5e368e79 100644
--- a/phpBB/styles/subSilver/template/mcp_forum.html
+++ b/phpBB/styles/subSilver/template/mcp_forum.html
@@ -21,7 +21,7 @@
 				<!-- ENDIF -->
 				<td class="row1">
 					<!-- IF topicrow.S_SELECT_TOPIC -->
-						[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;
+						<span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;</span>
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED -->
 						<a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;
diff --git a/phpBB/styles/subSilver/template/mcp_foruminfo.html b/phpBB/styles/subSilver/template/mcp_foruminfo.html
index efe9a0d51d..57e6869308 100644
--- a/phpBB/styles/subSilver/template/mcp_foruminfo.html
+++ b/phpBB/styles/subSilver/template/mcp_foruminfo.html
@@ -1,4 +1,7 @@
-<!-- $ Id: $ -->
+<!-- $Id$ -->
+
+<!-- Note: was this used ever? -->
+
 <!-- INCLUDE mcp_header.html -->
 
 <form method="post" name="main" action="{S_MCP_ACTION}">
diff --git a/phpBB/styles/subSilver/template/mcp_front.html b/phpBB/styles/subSilver/template/mcp_front.html
index 83932f80ae..0717fdb470 100644
--- a/phpBB/styles/subSilver/template/mcp_front.html
+++ b/phpBB/styles/subSilver/template/mcp_front.html
@@ -5,7 +5,7 @@
 <!-- IF S_SHOW_UNAPPROVED -->
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="cat" colspan="5"><span class="cattitle">{L_LATEST_UNAPPROVED}</span></td>
+		<td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_UNAPPROVED}</b></td>
 	</tr>
 	<tr>
 		<th>&nbsp;{L_FORUM}&nbsp;</th>
@@ -40,7 +40,7 @@
 <!-- IF S_SHOW_REPORTS -->
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="cat" colspan="5"><span class="cattitle">{L_LATEST_REPORTED}</span></td>
+		<td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_REPORTED}</b></td>
 	</tr>
 	<tr>
 		<th height="28">&nbsp;{L_FORUM}&nbsp;</th>
@@ -75,7 +75,7 @@
 <!-- IF S_SHOW_LOGS -->
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="right">
 	<tr>
-		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_LOGS}</span></td>
+		<td class="row3" colspan="5" align="center"><b class="gen">{L_LATEST_LOGS}</b></td>
 	</tr>
 	<tr>
 		<th width="15%" height="28" nowrap="nowrap">{L_USERNAME}</th>
diff --git a/phpBB/styles/subSilver/template/mcp_header.html b/phpBB/styles/subSilver/template/mcp_header.html
index 85f1629c00..0e1e3ee8d7 100644
--- a/phpBB/styles/subSilver/template/mcp_header.html
+++ b/phpBB/styles/subSilver/template/mcp_header.html
@@ -32,8 +32,6 @@ function marklist(form_name, status)
 	<div id="pagecontent">
 
 
-<!-- {PAGINATION} -->
-
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr>
 		<td width="20%" valign="top">
@@ -49,7 +47,7 @@ function marklist(form_name, status)
 
 						<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
 						<!-- BEGIN mcp_subsection -->
-						<li>&#187; <!-- IF ucp_section.ucp_subsection.S_SELECTED --><b>{mcp_section.mcp_subsection.L_TITLE}</b><!-- ELSE --><a href="{mcp_section.mcp_subsection.U_TITLE}">{mcp_section.mcp_subsection.L_TITLE}</a><!-- ENDIF --></li>
+						<li>&#187; <!-- IF mcp_section.mcp_subsection.S_SELECTED --><b>{mcp_section.mcp_subsection.L_TITLE}</b><!-- ELSE --><a href="{mcp_section.mcp_subsection.U_TITLE}">{mcp_section.mcp_subsection.L_TITLE}</a><!-- ENDIF --></li>
 						<!-- END mcp_subsection -->
 						</ul>
 
diff --git a/phpBB/styles/subSilver/template/mcp_jumpbox.html b/phpBB/styles/subSilver/template/mcp_jumpbox.html
index ed170f5ea3..03e559a625 100644
--- a/phpBB/styles/subSilver/template/mcp_jumpbox.html
+++ b/phpBB/styles/subSilver/template/mcp_jumpbox.html
@@ -1,5 +1,7 @@
 <!-- $Id$ -->
 
+<!-- Note: no longer in use... -->
+
 <form name="jumpbox" method="post" action="{S_JUMPBOX_ACTION}">
 <span class="gensmall">{L_JUMP_TO}:</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ forms['jumpbox'].submit() }">
 <!-- IF S_ENABLE_SELECT_ALL -->
diff --git a/phpBB/styles/subSilver/template/mcp_move.html b/phpBB/styles/subSilver/template/mcp_move.html
index a4cfc1d6c8..5f67a993a4 100644
--- a/phpBB/styles/subSilver/template/mcp_move.html
+++ b/phpBB/styles/subSilver/template/mcp_move.html
@@ -1,29 +1,42 @@
 <!-- $Id$ -->
-<!-- INCLUDE mcp_header.html -->
+<!-- INCLUDE overall_header.html -->
 
-<form action="{S_MCP_ACTION}" name="mcp" method="post">{S_HIDDEN_FIELDS}<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th height="28" valign="middle">{L_MODE_TITLE}</th>
-	</tr>
-	<tr>
-		<td class="row1"><table width="100%" border="0" cellspacing="0" cellpadding="1">
-			<tr> 
-				<td>&nbsp;</td>
+	<div id="pagecontent">
+
+		<form name="confirm" action="{S_CONFIRM_ACTION}" method="post"><table class="tablebg" width="100%" cellspacing="1">
+			<tr>
+				<th>{MESSAGE_TITLE}</th>
 			</tr>
-			<tr> 
-				<td align="center"><span class="gen"><!-- IF L_MODE_EXPLAIN -->{L_MODE_EXPLAIN}<br /><br /><!-- ENDIF -->{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br />
-					<!-- IF S_CAN_LEAVE_SHADOW --><input type="checkbox" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br /><br /><!-- ENDIF -->
-					<input class="btnmain" type="submit" name="confirm" value="{L_CONFIRM}" />
-					&nbsp;&nbsp; 
-					<input class="btnlite" type="submit" name="cancel" value="{L_CANCEL}" />
+			<tr>
+				<td class="row1" align="center">
+					<!-- IF ADDITIONAL_MSG -->
+						<span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br />
+					<!-- ENDIF -->
+					<span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span>
+						<select name="to_forum_id">{S_FORUM_SELECT}</select><br />
+					<!-- IF S_CAN_LEAVE_SHADOW -->
+						<input type="checkbox" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
+					<!-- ENDIF -->
+					<br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br />
+					<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span>
 				</td>
 			</tr>
-			<tr> 
-				<td>&nbsp;</td>
-			</tr>
-		</table></td>
-	</tr>
-</table>
-</form>
+		</table></form>
+	
+	</div>
+
+	<br clear="all" />
+
+	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
+		<tr>
+			<td class="row1">
+				<p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
+				<p class="datetime">{S_TIMEZONE}</p>
+			</td>
+		</tr>
+	</table>
+
+	<br clear="all" />
 
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
+				
diff --git a/phpBB/styles/subSilver/template/mcp_post.html b/phpBB/styles/subSilver/template/mcp_post.html
index aa6ffe5a35..962edf6892 100644
--- a/phpBB/styles/subSilver/template/mcp_post.html
+++ b/phpBB/styles/subSilver/template/mcp_post.html
@@ -5,24 +5,24 @@
 		<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>
 	</tr>
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_QUICKMOD -->{RETURN_FORUM}<!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall">{RETURN_TOPIC}</span></td>
 	</tr>
 	<tr>
-		<td class="row1"><b class="gen">{L_POST_SUBJECT}</b></td>
+		<td class="row1"><b class="gen">{L_POST_SUBJECT}: </b></td>
 		<td class="row2"><span class="gen">{POST_SUBJECT}</span></td>
 	</tr>
 	<tr>
-		<td class="row1" width="20%"><b class="gen">{L_POSTER}</b></td>
-		<td class="row2" width="80%"><span class="gen">{POSTER_NAME} &nbsp; [ <a href="{U_PROFILE}">{L_READ_PROFILE}</a> ]<!-- IF S_USER_NOTES --> [ <a href="{U_MCP_USERNOTES}">{L_READ_USERNOTES}</a> ]<!-- ENDIF --><!-- IF S_USER_WARNINGS --> [ <a href="{U_MCP_WARNINGS}">{L_READ_WARNINGS}</a> ]<!-- ENDIF --></span></td>
+		<td class="row1" width="20%"><b class="gen">{L_POSTER}: </b></td>
+		<td class="row2" width="80%"><span class="gen">{POSTER_NAME} &nbsp; [ <a href="{U_VIEW_PROFILE}">{L_READ_PROFILE}</a> ]<!-- IF S_USER_NOTES --> [ <a href="{U_MCP_USERNOTES}">{L_READ_USERNOTES}</a> ]<!-- ENDIF --><!-- IF S_USER_WARNINGS --> [ <a href="{U_MCP_WARNINGS}">{L_READ_WARNINGS}</a> ]<!-- ENDIF --></span></td>
 	</tr>
 	<!-- IF S_CAN_VIEWIP -->
 	<tr>
-		<td class="row1"><b class="gen">{L_THIS_POST_IP}</b></td>
-		<td class="row2"><span class="gen">{POST_IP}</span></td>
+		<td class="row1"><b class="gen">{L_THIS_POST_IP}: </b></td>
+		<td class="row2"><span class="gen">{POST_IP} [ {POST_IPADDR} ]</span></td>
 	</tr>
 	<!-- ENDIF -->
 	<tr>
-		<td class="row1"><b class="gen">{L_POSTED}</b></td>
+		<td class="row1"><b class="gen">{L_POSTED}: </b></td>
 		<td class="row2"><span class="postdetails">{POST_DATE}</span></td>
 	</tr>
 	</tr>
@@ -39,6 +39,7 @@
 	<!-- ENDIF -->
 </form></table>
 
+<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER -->
 <br /><a name="mod"></a>
 
 <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
@@ -51,11 +52,14 @@
 		<td class="row2"><!-- IF S_USER_SELECT --><select name="u">{S_USER_SELECT}</select> <input type="submit" class="btnmain" name="action[chgposter]" value="{L_CONFIRM}" /><br /><!-- ENDIF --> <input class="post" type="text" name="username" value="{SEARCH_USERNAME}" /> <input class="btnlite" type="submit" value="{L_SEARCH}" name="action[chgposter_search]" /></td>
 	</form></tr>
 	<!-- ENDIF -->
+	<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST -->
 	<tr><form method="post" name="mcp" action="{S_MCP_ACTION}"{S_FORM_ENCTYPE}>
 		<td class="row1" valign="top"><b class="gen">{L_MOD_OPTIONS}</b></td>
-		<td class="row2"><select name="action"><!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF --><!-- IF S_CAN_LOCK_POST --><option value="unrate">{L_UNRATE_POST} [{L_UNRATE_POST_EXPLAIN}]</option><!-- ENDIF --></select> <input class="btnmain" type="submit" value="{L_SUBMIT}" /></td>
+		<td class="row2"><select name="mode"><!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF --><!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF --></select> <input class="btnmain" type="submit" value="{L_SUBMIT}" /></td>
 	</form></tr>
+	<!-- ENDIF -->
 </table>
+<!-- ENDIF -->
 
 <!-- IF S_CAN_VIEWIP -->
 <br /><a name="ip"></a>
@@ -73,7 +77,7 @@
 	<!-- ELSE -->
 	<tr class="row2">
 	<!-- ENDIF -->
-		<td><span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.POSTS} ]</span></td>
+		<td><span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.NUM_POSTS} {userrow.L_POST_S} ]</span></td>
 		<td align="center"><a href="{userrow.U_SEARCHPOSTS}">{SEARCH_IMG}</a></td>
 	</tr>
 	<!-- BEGINELSE -->
@@ -91,7 +95,7 @@
 	<!-- ELSE -->
 	<tr class="row2">
 	<!-- ENDIF -->
-		<td><span class="gen"><!-- IF iprow.HOSTNAME --><a href="{iprow.U_WHOIS}">{iprow.HOSTNAME}</a> ({iprow.IP})<!-- ELSE --><a href="{iprow.U_WHOIS}">{iprow.IP}</a><!-- ENDIF --> [ {iprow.POSTS} ]</span></td>
+		<td><span class="gen"><!-- IF iprow.HOSTNAME --><a href="{iprow.U_WHOIS}">{iprow.HOSTNAME}</a> ({iprow.IP})<!-- ELSE --><a href="{iprow.U_WHOIS}">{iprow.IP}</a><!-- ENDIF --> [ {iprow.NUM_POSTS} {iprow.L_POST_S} ]</span></td>
 		<td align="center"><!-- IF iprow.U_LOOKUP_IP --><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a> ]</span><!-- ENDIF --></td>
 	</tr>
 	<!-- BEGINELSE -->
diff --git a/phpBB/styles/subSilver/template/mcp_topic.html b/phpBB/styles/subSilver/template/mcp_topic.html
index 1a8e04da66..ef772ae36b 100644
--- a/phpBB/styles/subSilver/template/mcp_topic.html
+++ b/phpBB/styles/subSilver/template/mcp_topic.html
@@ -21,7 +21,7 @@
 		<td class="row1"><span class="gen">{L_TOPIC_ICON}</span></td>
 		<td class="row2" colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
-				<td><input type="radio" name="icon" value="0" <!-- IF not S_TOPIC_ICON -->checked="checked" <!-- ENDIF -->/><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}" <!-- IF topic_icon.S_CHECKED -->checked="checked" <!-- ENDIF -->/><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
+				<td><input type="radio" name="icon" value="0"<!-- IF not S_TOPIC_ICON --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"<!-- IF topic_icon.S_CHECKED --> checked="checked"<!-- ENDIF --> /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
 			</tr>
 		</table></td>
 	</tr>
@@ -36,7 +36,7 @@
 	</tr>
 	<tr>
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_MERGE_TOPIC_ID}</span></td>
-		<td class="row2" colspan="2"><input class="post" type="text" size="6" name="to_topic_id" value="{TO_TOPIC_ID}" /> <input class="btnlite" type="submit" name="mode[merge_select]" value="{L_SELECT_TOPIC}" /></td>
+		<td class="row2" colspan="2"><input class="post" type="text" size="6" name="to_topic_id" value="{TO_TOPIC_ID}" /> <input class="btnlite" type="submit" name="action[merge_select]" value="{L_SELECT_TOPIC}" /></td>
 	</tr>
 	<!-- IF TO_TOPIC_INFO -->
 	<tr>
@@ -60,76 +60,77 @@
 		<th nowrap="nowrap">{L_SELECT}</th>
 	</tr>
 	<!-- BEGIN postrow -->
-	<!-- IF postrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
-		<td align="center"><b class="postauthor">{postrow.POSTER_NAME}</b></td>
-		<td width="100%" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr valign="top">
-				<td class="gensmall" nowrap="nowrap">&nbsp;<b>{L_POST_SUBJECT}:</b>&nbsp;</td>
-				<td class="gensmall" width="100%">{postrow.POST_SUBJECT}</td>
-			</tr>
-		</table></td>
-		<td rowspan="2" width="5%" align="center">{postrow.S_CHECKBOX}</td>
-	</tr>
-	<!-- IF postrow.S_ROW_COUNT is even -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
-		<td valign="bottom">
-			<table width="100%" cellspacing="0" cellpadding="0" border="0">
-				<tr valign="middle">
-					<td height="28" align="center"><span class="gensmall">[ <a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> ]</span></td>
+		<!-- IF postrow.S_ROW_COUNT is even -->
+			<tr class="row1">
+		<!-- ELSE -->
+			<tr class="row2">
+		<!-- ENDIF -->
+
+			<td align="center"><b class="postauthor">{postrow.POSTER_NAME}</b></td>
+			<td width="100%" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<tr valign="top">
+					<td class="gensmall" nowrap="nowrap">&nbsp;<b>{L_POST_SUBJECT}:</b>&nbsp;</td>
+					<td class="gensmall" width="100%">{postrow.POST_SUBJECT}</td>
 				</tr>
-			</table>
-		</td>
-		<td width="100%" valign="top"><table width="100%" cellspacing="0" cellpadding="2" border="0">
-			<tr>
-				<td class="postbody" valign="top">{postrow.MESSAGE}<br /><br /></td>
-			</tr>
-			<tr>
-				<td valign="bottom">
-					<table width="100%" cellspacing="0" cellpadding="0" border="0">
-						<tr valign="middle">
-							<!-- IF postrow.S_POST_UNAPPROVED -->
-							<td width="5">{UNAPPROVED_IMG}</td>
-							<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:green"  href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></b>&nbsp;&nbsp;</td>
-							<!-- ENDIF -->
-							<!-- IF postrow.S_POST_REPORTED -->
-							<td width="5">{REPORTED_IMG}</td>
-							<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:red" href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></b>&nbsp;</td>
-							<!-- ENDIF -->
-							<td width="100%">&nbsp;</td>
-							<td width="10" nowrap="nowrap">{postrow.POST_ICON_IMG}</td>
-							<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table></td>
-	</tr>
-	<tr>
-		<td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt="" /></td>
-	</tr>
+			</table></td>
+			<td rowspan="2" width="5%" align="center">{postrow.S_CHECKBOX}</td>
+		</tr>
+		<!-- IF postrow.S_ROW_COUNT is even -->
+			<tr class="row1">
+		<!-- ELSE -->
+			<tr class="row2">
+		<!-- ENDIF -->
+			<td valign="bottom">
+				<table width="100%" cellspacing="0" cellpadding="0" border="0">
+					<tr valign="middle">
+						<td height="28" align="center"><span class="gensmall">[ <a href="{postrow.U_POST_DETAILS}">{L_POST_DETAILS}</a> ]</span></td>
+					</tr>
+				</table>
+			</td>
+			<td width="100%" valign="top"><table width="100%" cellspacing="0" cellpadding="2" border="0">
+				<tr>
+					<td class="postbody" valign="top">{postrow.MESSAGE}<br /><br /></td>
+				</tr>
+				<tr>
+					<td valign="bottom">
+						<table width="100%" cellspacing="0" cellpadding="0" border="0">
+							<tr valign="middle">
+								<!-- IF postrow.S_POST_UNAPPROVED -->
+								<td width="5">{UNAPPROVED_IMG}</td>
+								<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:green"  href="{postrow.U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></b>&nbsp;&nbsp;</td>
+								<!-- ENDIF -->
+								<!-- IF postrow.S_POST_REPORTED -->
+								<td width="5">{REPORTED_IMG}</td>
+								<td class="gensmall" nowrap="nowrap">&nbsp;<b><a style="color:red" href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></b>&nbsp;</td>
+								<!-- ENDIF -->
+								<td width="100%">&nbsp;</td>
+								<td width="10" nowrap="nowrap">{postrow.POST_ICON_IMG}</td>
+								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table></td>
+		</tr>
+		<tr>
+			<td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt="" /></td>
+		</tr>
 	<!-- END postrow -->
 	<tr>
-		<td class="cat" colspan="3" height="28" align="center"><select name="mode">
+		<td class="cat" colspan="3" height="28" align="center"><select name="mode2"><option value="" selected="selected">{L_SELECT_ACTION}</option>			
 			<!-- IF S_CAN_APPROVE --><option value="approve">{L_APPROVE_POSTS}</option><!-- ENDIF -->
-			<!-- IF S_CAN_DELETE --><option value="delete_posts">{L_DELETE_POSTS}</option><!-- ENDIF -->
+			<!-- IF S_CAN_LOCK --><option value="lock_post">{L_LOCK_POST_POSTS} [ {L_LOCK_POST_EXPLAIN} ]</option><option value="unlock_post">{L_UNLOCK_POST_POSTS}</option><!-- ENDIF -->
+			<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF -->
 			<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF MODE == 'merge' --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
 			<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF MODE == 'split' --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
-		</select>&nbsp;<input class="btnmain" type="submit" value="{L_SUBMIT}"></td>
+		</select>&nbsp;<input class="btnmain" type="submit" name="quick" value="{L_SUBMIT}"></form></td>
 	</tr>
-</form>
 </table>
+</form>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr>
-		<td class="nav" align="left" valign="middle">{PAGE_NUMBER}</td>
-		<td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', false);">{L_UNMARK_ALL}</a></b><br /><span class="nav">{PAGINATION}</span></td>
+		<td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', false);">{L_UNMARK_ALL}</a></b></td>
 	</tr>
 </table>