From 2a5e30db9e13bc5c8895774291137a9dccb3a2c4 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 11 Feb 2012 01:40:01 -0600
Subject: [PATCH] [ticket/10641] Update MCP template with new plurality forms

Updates the MCP template according to PHPBB3-10345

PHPBB3-10641
---
 phpBB/styles/prosilver/template/mcp_front.html | 12 +++---------
 .../styles/subsilver2/template/mcp_front.html  | 18 ------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index 21431b4bc1..e9635e528c 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -10,7 +10,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<h3>{L_LATEST_UNAPPROVED}</h3>
-		<!-- IF S_HAS_UNAPPROVED_POSTS --><p>{L_UNAPPROVED_TOTAL}</p><!-- ENDIF -->
+		<p>{L_UNAPPROVED_TOTAL}</p>
 
 		<!-- IF .unapproved -->
 			<ul class="topiclist">
@@ -40,8 +40,6 @@
 			</li>
 			<!-- END unapproved -->
 			</ul>
-		<!-- ELSE -->
-			<p>{L_UNAPPROVED_POSTS_ZERO_TOTAL}</p>
 		<!-- ENDIF -->
 
 		<span class="corners-bottom"><span></span></span></div>
@@ -64,7 +62,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<h3>{L_LATEST_REPORTED}</h3>
-		<!-- IF S_HAS_REPORTS --><p>{L_REPORTS_TOTAL}</p><!-- ENDIF -->
+		<p>{L_REPORTS_TOTAL}</p>
 
 		<!-- IF .report -->
 			<ul class="topiclist">
@@ -92,8 +90,6 @@
 			</li>
 			<!-- END report -->
 			</ul>
-		<!-- ELSE -->
-			<p>{L_REPORTS_ZERO_TOTAL}</p>
 		<!-- ENDIF -->
 
 		<span class="corners-bottom"><span></span></span></div>
@@ -105,7 +101,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<h3>{L_LATEST_REPORTED_PMS}</h3>
-		<!-- IF S_HAS_PM_REPORTS --><p>{L_PM_REPORTS_TOTAL}</p><!-- ENDIF -->
+		<p>{L_PM_REPORTS_TOTAL}</p>
 
 		<!-- IF .pm_report -->
 			<ul class="topiclist">
@@ -133,8 +129,6 @@
 			</li>
 			<!-- END pm_report -->
 			</ul>
-		<!-- ELSE -->
-			<p>{L_PM_REPORTS_ZERO_TOTAL}</p>
 		<!-- ENDIF -->
 
 		<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html
index f4b146f4c5..7c17e13c52 100644
--- a/phpBB/styles/subsilver2/template/mcp_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_front.html
@@ -24,16 +24,10 @@
 			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gensmall">{unapproved.POST_TIME}</span></td>
 			<td class="row2" align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{unapproved.POST_ID}" /></td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="6" align="center"><span class="gen">{L_UNAPPROVED_POSTS_ZERO_TOTAL}</span></td>
-		</tr>
 	<!-- END unapproved -->
-	<!-- IF S_HAS_UNAPPROVED_POSTS -->
 		<tr>
 			<td class="row3" colspan="6"><span class="gensmall">{L_UNAPPROVED_TOTAL}</span></td>
 		</tr>
-	<!-- ENDIF -->
 	<tr>
 		<td class="cat" colspan="6" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
 	</tr>
@@ -70,16 +64,10 @@
 			<td class="row2" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{report.REPORTER_FULL}</span></td>
 			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gensmall">{report.REPORT_TIME}</span></td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" align="center"><span class="gen">{L_REPORTS_ZERO_TOTAL}</span></td>
-		</tr>
 	<!-- END report -->
-	<!-- IF S_HAS_REPORTS -->
 		<tr>
 			<td class="row3" colspan="5"><span class="gensmall">{L_REPORTS_TOTAL}</span></td>
 		</tr>
-	<!-- ENDIF -->
 	</table>
 
 	<br clear="all" /><br />
@@ -107,16 +95,10 @@
 			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.REPORTER_FULL}</span></td>
 			<td class="row2" align="center" width="10%" nowrap="nowrap" valign="top"><span class="gensmall">{pm_report.REPORT_TIME}</span></td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="6" align="center"><span class="gen">{L_PM_REPORTS_ZERO_TOTAL}</span></td>
-		</tr>
 	<!-- END pm_report -->
-	<!-- IF S_HAS_PM_REPORTS -->
 		<tr>
 			<td class="row3" colspan="6"><span class="gensmall">{L_PM_REPORTS_TOTAL}</span></td>
 		</tr>
-	<!-- ENDIF -->
 	</table>
 
 	<br clear="all" /><br />