1 files changed, 63 insertions, 31 deletions
diff --git a/phpBB/styles/subSilver/template/mcp_header.html b/phpBB/styles/subSilver/template/mcp_header.html
index 86958767a7..6995fa55c5 100644
--- a/phpBB/styles/subSilver/template/mcp_header.html
+++ b/phpBB/styles/subSilver/template/mcp_header.html
@@ -1,43 +1,75 @@
+<!-- $Id$ -->
 <!-- INCLUDE overall_header.html -->
 
-<script language="Javascript" type="text/javascript" defer="defer">
+<script language="javascript" type="text/javascript" defer="defer">
 <!--
-function marklist(status)
+function marklist(form_name, status)
 {
-	for (i = 0; i < document.forms['main'].length; i++)
+	for (i = 0; i < document.forms[form_name].length; i++)
 	{
-		document.forms['main'].elements[i].checked = status;
+		document.forms[form_name].elements[i].checked = status;
 	}
 }
 //-->
 </script>
 
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<!-- IF TOPIC_TITLE -->
-	<tr>
-		<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></td>
-	</tr>
-	<!-- ELSEIF FORUM_NAME -->
-	<tr>
-		<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- IF PAGINATION -->
-	<tr>
-		<td valign="bottom" class="gensmall">{MODERATORS}</td>
-		<td align="right" valign="bottom" nowrap="nowrap"><b class="gensmall">{PAGINATION}</b></td>
-	</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td class="nav" colspan="2" align="left" valign="middle"><!-- IF S_FORUM_NAV --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --><!-- ENDIF --></td>
-	</tr>
-</table>
 
-<table class="tablebg" cellspacing="1" cellpadding="4" border="0" align="left">
-	<tr>
-		<!-- BEGIN tab --><!-- IF tab.S_IS_SELECTED --><td class="row1" nowrap="nowrap">&nbsp;<span class="gen"><b>{tab.NAME}</b><!-- ELSE --><td class="row2" nowrap="nowrap">&nbsp;<a class="nav" href="{tab.U_LINK}">{tab.NAME}</a><!-- ENDIF -->&nbsp;</td>
-		<!-- END tab -->
-	</tr>
-</table>
+<form method="post" name="mcp" action="{S_MCP_ACTION}"{S_FORM_ENCTYPE}><table width="95%" cellspacing="0" cellpadding="2" border="0" align="center">
+	<tr valign="top">
+		<td colspan="2"><table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+			<!-- IF TOPIC_TITLE -->
+			<tr>
+				<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></td>
+			</tr>
+			<!-- ELSEIF FORUM_NAME -->
+			<tr>
+				<td class="titles" colspan="2" align="left" valign="bottom"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></td>
+			</tr>
+			<!-- ENDIF -->
+			<!-- IF PAGINATION -->
+			<tr>
+				<td valign="bottom" class="gensmall">{MODERATORS}</td>
+				<td align="right" valign="bottom" nowrap="nowrap"><b class="gensmall">{PAGINATION}</b></td>
+			</tr>
+			<!-- ENDIF -->
+			<tr>
+				<td class="nav" colspan="2" align="left" valign="middle"><!-- IF S_FORUM_NAV --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --><!-- ENDIF --></td>
+			</tr>
+		</table></td>
+</tr>
+<tr valign="top">
+	<td width="20%"><table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="left">
+		<tr>
+			<th height="28">{L_JUMPBOX}</th>
+		</tr>
+		<tr>
+			<td class="row1"><!-- INCLUDE mcp_jumpbox.html --></td>
+		</tr>
+	</table>
 
-<br clear="all" />
-\ No newline at end of file
+	<br clear="all" /><br clear="all" />
+
+	<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="left">
+		<tr>
+			<th height="28">{L_OPTIONS}</th>
+		</tr>
+		<!-- BEGIN mcp_section -->
+		<tr>
+			<!-- IF mcp_section.S_SELECTED -->
+			<td class="row1" height="28"><b class="nav">{mcp_section.L_TITLE}</b>
+				<table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<!-- BEGIN mcp_subsection -->
+					<tr>
+						<td class="nav">&#187;</td>
+						<td class="nav" height="20"><!-- 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 --></td>
+					</tr>
+				<!-- END mcp_subsection -->
+				</table>
+			<!-- ELSE -->
+			<td class="row2" height="25" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'"><a class="nav" href="{mcp_section.U_TITLE}">{mcp_section.L_TITLE}</a>
+			<!-- ENDIF -->
+			</td>
+		</tr>
+		<!-- END mcp_section -->
+	</table></td>
+	<td width="80%">
+\ No newline at end of file