MCP templates

git-svn-id: file:///svn/phpbb/trunk@4689 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> 2003-11-27 23:07:31 +0000
committer: Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> 2003-11-27 23:07:31 +0000
commit: fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b (patch)
tree: b3955df8201d605bc7e8250db79ae3044c48663e
parent: f15467f4c58b7696d021bd59c25922fb4cf1aac2 (diff)
download: forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.tar
forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.tar.gz
forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.tar.bz2
forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.tar.xz
forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.zip
8 files changed, 133 insertions, 146 deletions
diff --git a/phpBB/styles/subSilver/template/mcp_footer.html b/phpBB/styles/subSilver/template/mcp_footer.html
index 0b36dc9ed8..1507cebd83 100644
--- a/phpBB/styles/subSilver/template/mcp_footer.html
+++ b/phpBB/styles/subSilver/template/mcp_footer.html
@@ -1,5 +1,5 @@
 <!-- $Id$ -->
-
+			</form>
 		</td>
 	</tr>
 </table>
diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html
index 1942211c5f..678414ef71 100644
--- a/phpBB/styles/subSilver/template/mcp_forum.html
+++ b/phpBB/styles/subSilver/template/mcp_forum.html
@@ -2,13 +2,7 @@
 <!-- INCLUDE mcp_header.html -->
 
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0">
-<form method="post" name="main" action="{S_MCP_ACTION}">
-	<tr>
-		<th colspan="6" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
-	</tr>
-	<tr>
-		<td colspan="6" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
-	</tr>
+<form method="post" name="mcp" action="{S_MCP_ACTION}">
 	<tr>
 		<th width="4%" height="28" nowrap="nowrap">&nbsp;</th>
 		<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
@@ -16,13 +10,31 @@
 		<th width="17%" nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
 		<th width="5%" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
 	</tr>
+	<tr align="center">
+		<td class="cat" colspan="6" height="28">
+			<!--<!-- IF S_CAN_DELETE --><input type="submit" name="mode[delete_topic]" class="btnlite" value="{L_DELETE}" /> &nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_MOVE --><input type="submit" name="mode[move]" class="btnlite" value="{L_MOVE}" /> &nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_FORK --><input type="submit" name="mode[fork]" class="btnlite" value="{L_FORK}" /> &nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_LOCK --><input type="submit" name="mode[lock]" class="btnlite" value="{L_LOCK}" /> &nbsp;<input type="submit" name="mode[unlock]" class="btnlite" value="{L_UNLOCK}" /> &nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_SYNC --><input type="submit" name="mode[resync]" class="btnlite" value="{L_RESYNC}" />&nbsp;<!-- ENDIF -->-->
+
+			<select name="mode">
+				<!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF -->
+				<!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF -->
+				<!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF -->
+				<!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF -->
+				<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
+			</select>
+			<input class="btnmain" type="submit" value="{L_SUBMIT}" />
+		</td>
+	</tr>
 	<!-- BEGIN topicrow -->
 	<tr>
 		<td class="row1" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
 		<td class="row1" width="100%"><table width="100%" border="0" cellspacing="0" cellpadding="0">
 			<tr class="topictitle">
 				<!-- IF topicrow.S_SELECT_TOPIC -->
-				<td>[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]</td>
+				<td nowrap="nowrap">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;</td>
 				<!-- ENDIF -->
 				<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_TOPIC_REPORTED -->
 				<td align="left" valign="middle">
@@ -34,22 +46,16 @@
 			</tr>
 		</table></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>
+		<td class="row1" align="center" valign="middle" nowrap="nowrap"><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}" {topicrow.S_TOPIC_CHECKED}/></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="cat" colspan="6" height="28">
-			<!-- IF S_CAN_DELETE --><input type="submit" name="delete_topics" class="btnlite" value="{L_DELETE}" /> &nbsp;<!-- ENDIF -->
-			<!-- IF S_CAN_MOVE --><input type="submit" name="move" class="btnlite" value="{L_MOVE}" /> &nbsp;<!-- ENDIF -->
-			<!-- IF S_CAN_FORK --><input type="submit" name="fork" class="btnlite" value="{L_FORK}" /> &nbsp;<!-- ENDIF -->
-			<!-- IF S_CAN_LOCK --><input type="submit" name="lock" class="btnlite" value="{L_LOCK}" /> &nbsp;<input type="submit" name="unlock" class="btnlite" value="{L_UNLOCK}" /> &nbsp;<!-- ENDIF -->
-			<!-- IF S_CAN_SYNC --><input type="submit" name="resync" class="btnlite" value="{L_RESYNC}" />&nbsp;<!-- ENDIF -->
-		</td>
+	<tr>
+		<td colspan="6" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
 	</tr>
 </form>
 </table>
@@ -57,8 +63,8 @@
 <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(true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist(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><br /><span class="nav">{PAGINATION}</span></td>
 	</tr>
 </table>
 
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
+\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_header.html b/phpBB/styles/subSilver/template/mcp_header.html
index 6995fa55c5..a1cf826fbb 100644
--- a/phpBB/styles/subSilver/template/mcp_header.html
+++ b/phpBB/styles/subSilver/template/mcp_header.html
@@ -13,8 +13,7 @@ function marklist(form_name, status)
 //-->
 </script>
 
-
-<form method="post" name="mcp" action="{S_MCP_ACTION}"{S_FORM_ENCTYPE}><table width="95%" cellspacing="0" cellpadding="2" border="0" align="center">
+<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 -->
@@ -38,14 +37,14 @@ function marklist(form_name, status)
 		</table></td>
 </tr>
 <tr valign="top">
-	<td width="20%"><table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="left">
+	<td width="20%"><form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}"{S_FORM_ENCTYPE}><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>
+	</table></form>
 
 	<br clear="all" /><br clear="all" />
 
@@ -66,10 +65,34 @@ function marklist(form_name, status)
 				<!-- 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>
+			<td class="row2" height="25" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href='{mcp_section.U_TITLE}'" style="cursor: pointer"><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
+	<td width="80%">
+		<!-- IF MESSAGE -->
+		<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center">
+			<tr>
+				<th height="28"><b>{L_MESSAGE}</b></th>
+			</tr>
+			<tr> 
+				<td class="row1" align="center"><br /><span class="gen">{MESSAGE}<br /><br /><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br /><br /><!-- END return_links --></span></td>
+			</tr>
+		</table>
+
+		<br />
+		<!-- ENDIF -->
+		<!-- IF CONFIRM_MESSAGE -->
+		<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"><form method="post" name="jumpbox" action="{S_CONFIRM_ACTION}"{S_FORM_ENCTYPE}>
+			<tr>
+				<th height="28"><b>{L_PLEASE_CONFIRM}</b></th>
+			</tr>
+			<tr> 
+				<td class="row1" align="center"><span class="gen"><br />{CONFIRM_MESSAGE}<br /><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{L_YES}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /><br /><br /></span></td>
+			</tr>
+		</form></table>
+
+		<br />
+		<!-- ENDIF -->
+\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_jumpbox.html b/phpBB/styles/subSilver/template/mcp_jumpbox.html
index d2b37b3989..ac7fa5e685 100644
--- a/phpBB/styles/subSilver/template/mcp_jumpbox.html
+++ b/phpBB/styles/subSilver/template/mcp_jumpbox.html
@@ -1,4 +1,4 @@
-<!-- $Id$ --><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.mcp.current_f.value){ forms['mcp'].submit() }">
+<!-- $Id$ --><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 -->
 <option value="0">{L_ALL_FORUMS}</option>
 <!-- ELSE -->
@@ -7,4 +7,4 @@
 <!-- BEGIN options --><option value="{options.VALUE}"<!-- IF options.VALUE eq -1 --> class="greyed"<!-- ENDIF -->{options.SELECTED}/>{options.TEXT}</option>
 <!-- BEGINELSE -->
 <!-- END options -->
-</select>&nbsp;<input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onClick="if(document.mcp.f.value == -1){return false;}" />
-\ No newline at end of file
+</select>&nbsp;<input type="hidden" name="current_f" value="{S_CURRENT_FORUM}" /><input name="jumpbox" class="btnlite" type="submit" value="{L_GO}" onClick="if(document.jumpbox.f.value == -1){return false;}" />
+\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_post.html b/phpBB/styles/subSilver/template/mcp_post.html
index a86b63afd7..aa6ffe5a35 100644
--- a/phpBB/styles/subSilver/template/mcp_post.html
+++ b/phpBB/styles/subSilver/template/mcp_post.html
@@ -1,87 +1,61 @@
 <!-- INCLUDE mcp_header.html -->
 
-<form method="post" name="main" action="{S_MCP_ACTION}">
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
+<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"><form method="post" name="mcp" action="{S_APPROVE_ACTION}"{S_FORM_ENCTYPE}>
 	<tr>
 		<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>
-	</th>
-	<tr>
-		<td class="row1"><b class="gen">{L_POSTER}</b></td>
-		<td class="row2"><span class="gen">{POSTER_NAME}</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>
 	</tr>
-	<!-- ENDIF -->
 	<tr>
-		<td class="row1"><b class="gen">{L_POSTED}</b></td>
-		<td class="row2"><span class="postdetails">{POST_DATE}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_QUICKMOD -->{RETURN_FORUM}<!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
 	</tr>
 	<tr>
 		<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="spacer" colspan="2" height="1"></td>
-	</tr>
-	<tr>
-		<td class="row2" colspan="2"><span class="gen">{MESSAGE}</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_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>
-</table>
-
-<!-- IF S_POST_REPORTED -->
-<br /><a name="reports"></a>
-
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
+	<!-- IF S_CAN_VIEWIP -->
 	<tr>
-		<th colspan="2" height="28" align="center">{L_REPORTS}</th>
+		<td class="row1"><b class="gen">{L_THIS_POST_IP}</b></td>
+		<td class="row2"><span class="gen">{POST_IP}</span></td>
 	</tr>
+	<!-- ENDIF -->
 	<tr>
-		<td class="row1"><b class="gen">{L_REPORTER}</b></td>
-		<td class="row2"><span class="gen">{REPORTER}</span></td>
+		<td class="row1"><b class="gen">{L_POSTED}</b></td>
+		<td class="row2"><span class="postdetails">{POST_DATE}</span></td>
 	</tr>
-	<tr>
-		<td class="row1"><b class="gen">{L_REPORT_TIME}</b></td>
-		<td class="row2"><span class="gensmall">{REPORT_TIME}</span></td>
 	</tr>
 	<tr>
-		<td class="row1"><b class="gen">{L_REASON}</b></td>
-		<td class="row2"><span class="gen">{REASON_TITLE}</span></td>
-	</tr>
+		<th colspan="2" height="28" align="center">{L_PREVIEW}</th>
+	</th>
 	<tr>
-		<td class="row1" valign="top"><b class="gen">{L_DESCRIPTION}</b></td>
-		<td class="row2"><span class="gen">{REASON_DESCRIPTION}</span></td>
+		<td class="row1" colspan="2"><div class="gen" style="overflow: auto; width: 100%; height: 80pt; border: 1px;">{POST_PREVIEW}</div></td>
 	</tr>
+	<!-- IF S_POST_UNAPPROVED -->
 	<tr>
-		<td class="cat" align="center" colspan="2"><input name="delete_report" class="btnlite" type="submit" value="{L_DISCARD_REPORT}" /><!-- IF S_CAN_DELETE --> &nbsp; <input name="delete_post" class="btnmain" type="submit" value="{L_DISCARD_POST}" /><!-- ENDIF --></td>
+		<td class="cat" align="center" colspan="2"><input class="btnmain" type="submit" value="{L_APPROVE}" name="mode[approve]" /> &nbsp; <input class="btnlite" type="submit" value="{L_DISAPPROVE}" name="mode[disapprove]" /></td>
 	</tr>
-</table>
-<!-- ENDIF -->
+	<!-- ENDIF -->
+</form></table>
 
-<!-- IF S_CAN_CHANGE_POSTER or S_CAN_LOCK_POST-->
 <br /><a name="mod"></a>
 
 <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
 	<tr>
 		<th colspan="2" height="28" align="center">{L_MOD_OPTIONS}</th>
 	</tr>
-	<!-- IF S_CAN_CHANGE_POSTER -->
-	<tr>
+	<!-- IF S_CAN_CHGPOSTER -->
+	<tr><form method="post" name="mcp" action="{S_CHGPOSTER_ACTION}"{S_FORM_ENCTYPE}>
 		<td class="row1" valign="top"><b class="gen">{L_CHANGE_POSTER}</b></td>
-		<td class="row2"><!-- IF S_NO_USERS_FOUND --><b class="gen">{L_NO_USERS_FOUND}<br /></b><!-- ENDIF --><!-- IF S_USER_SELECT --><select name="user_id">{S_USER_SELECT}</select> <input type="submit" class="post" name="change_poster" value="{L_CONFIRM}" /><br /><!-- ENDIF --> <input class="post" type="text" name="username" /> <input class="post" type="submit" name="change_poster_search" value="{L_SEARCH}" /></td>
-	</tr>
+		<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 -->
-	<tr>
-		<td class="row1" valign="top"><b class="gen">{L_POST_OPTIONS}</b></td>
-		<td class="row2"><!-- IF S_CAN_LOCK_POST --><input type="checkbox" name="lock_post" {S_LOCK_POST_CHECKED}/><span class="genmed">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]<br /></span><!-- ENDIF --></td>
-	</tr>
-	<tr>
-		<td class="cat" align="center" colspan="2"><input class="btnmain" type="submit" value="{L_UPDATE}" /></td>
-	</tr>
+	<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>
+	</form></tr>
 </table>
-<!-- ENDIF -->
 
 <!-- IF S_CAN_VIEWIP -->
 <br /><a name="ip"></a>
@@ -102,6 +76,10 @@
 		<td><span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.POSTS} ]</span></td>
 		<td align="center"><a href="{userrow.U_SEARCHPOSTS}">{SEARCH_IMG}</a></td>
 	</tr>
+	<!-- BEGINELSE -->
+	<tr class="row1">
+		<td colspan="2" align="center"><span class="gen">{L_NO_MATCHES_FOUND}</span></td>
+	</tr>
 	<!-- END userrow -->
 	<tr>
 		<td height="28" class="cat"><b class="gen">{L_OTHER_IPS}</b></td>
@@ -113,12 +91,15 @@
 	<!-- ELSE -->
 	<tr class="row2">
 	<!-- ENDIF -->
-		<td><span class="gen">{iprow.IP} [ {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.POSTS} ]</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 -->
+	<tr class="row1">
+		<td colspan="2" align="center"><span class="gen">{L_NO_MATCHES_FOUND}</span></td>
+	</tr>
 	<!-- END iprow -->
 </table>
 <!-- ENDIF -->
 
-</form>
 <!-- INCLUDE mcp_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_queue.html b/phpBB/styles/subSilver/template/mcp_queue.html
index 570e97fc75..467fb2a246 100644
--- a/phpBB/styles/subSilver/template/mcp_queue.html
+++ b/phpBB/styles/subSilver/template/mcp_queue.html
@@ -1,67 +1,43 @@
 <!-- INCLUDE mcp_header.html -->
 
-<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"><form name="main" method="post" action="{S_MCP_ACTION}">
+<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"><form name="mcp" method="post" action="{S_MCP_ACTION}">
 	<tr>
 		<th colspan="6" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
 	</tr>
 	<tr>
-		<td colspan="2" class="cat" height="28" align="left" nowrap="nowrap"><!-- INCLUDE mcp_jumpbox.html --></td>
-		<td colspan="4" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
+		<td colspan="5" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_ITEMS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
 	</tr>
 	<tr> 
 		<th height="28">&nbsp;{L_FORUM}&nbsp;</th>
 		<th>&nbsp;{L_TOPIC}&nbsp;</th>
-		<th>&nbsp;{L_SUBJECT}&nbsp;</th>
 		<th>&nbsp;{L_AUTHOR}&nbsp;</th>
 		<th>&nbsp;{L_POST_TIME}&nbsp;</th>
 		<th width="5%">&nbsp;{L_SELECT}&nbsp;</th>
 	</tr>
-	<!-- IF S_HAS_UNAPPROVED_TOPICS -->
-	<tr>
-		<td class="row3" colspan="6"><b class="gensmall">{L_TOPICS}</b></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN unapproved_topics -->
-	<tr>
-		<td class="row1" width="15%"><span class="gen">{unapproved_topics.FORUM}</span></td>
-		<td class="row2" width="18%"><span class="gen">{unapproved_topics.TOPIC}</span></td>
-		<td class="row1"><span class="gen">{unapproved_topics.SUBJECT}</span></td>
-		<td class="row2" align="center" width="15%"><span class="gen">{unapproved_topics.AUTHOR}</span></td>
-		<td class="row1" align="center" width="15%"><span class="gensmall">{unapproved_topics.POST_TIME}</span></td>
-		<td class="row2" align="center" width="5%">{unapproved_topics.S_CHECKBOX}</td>
-	</tr>
-	<!-- END unapproved_topics -->
-	<!-- IF S_HAS_UNAPPROVED_POSTS -->
-	<tr>
-		<td class="row3" colspan="6"><b class="gensmall">{L_POSTS}</b></td>
-	</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN unapproved_posts -->
+
+	<!-- BEGIN postrow -->
 	<tr>
-		<td class="row1" width="15%"><span class="gen">{unapproved_posts.FORUM}</span></td>
-		<td class="row2" width="18%"><span class="gen">{unapproved_posts.TOPIC}</span></td>
-		<td class="row1"><span class="gen">{unapproved_posts.SUBJECT}</span></td>
-		<td class="row2" align="center" width="15%"><span class="gen">{unapproved_posts.AUTHOR}</span></td>
-		<td class="row1" align="center" width="15%"><span class="gensmall">{unapproved_posts.POST_TIME}</span></td>
-		<td class="row2" align="center">{unapproved_posts.S_CHECKBOX}</td>
+		<td class="row1" width="15%"><a class="gen" href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a></td>
+		<td class="row2" width="18%"><a class="gen" href="{postrow.U_VIEWTOPIC}">{postrow.TOPIC_TITLE}</a></td>
+		<td class="row1" align="center" width="15%"><span class="gen">{postrow.POSTER}</span></td>
+		<td class="row2" align="center" width="15%"><span class="gensmall">{postrow.POST_TIME}</span></td>
+		<td class="row1" align="center">{postrow.S_CHECKBOX}</td>
 	</tr>
-	<!-- END unapproved_posts -->
-	<!-- IF S_HAS_UNAPPROVED_TOPICS or S_HAS_UNAPPROVED_POSTS -->
+	<!-- BEGINELSE -->
 	<tr>
-		<td class="cat" colspan="6" height="28" align="center"><input class="btnlite" type="submit" name="approve" value="{L_APPROVE_POSTS}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="disapprove" value="{L_DISAPPROVE_POSTS}" /></td>
+		<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_POSTS}</span></td>
 	</tr>
-	<!-- ELSE -->
+	<!-- END postrow -->
 	<tr>
-		<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_POSTS}</span></td>
+		<td class="cat" colspan="6" height="28" align="center"><input class="btnmain" type="submit" name="mode[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="mode[disapprove]" value="{L_DISAPPROVE}" /></td>
 	</tr>
-	<!-- ENDIF -->
 </form></table>
 
 <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(true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist(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><br /><span class="nav">{PAGINATION}</span></td>
 	</tr>
 </table>
 
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
+\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_topic.html b/phpBB/styles/subSilver/template/mcp_topic.html
index 83b08e5277..5fa5f7b782 100644
--- a/phpBB/styles/subSilver/template/mcp_topic.html
+++ b/phpBB/styles/subSilver/template/mcp_topic.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE mcp_header.html -->
 
 <table class="tablebg" width="100%" cellspacing="1"  cellpadding="2" border="0">
-<form name="main" method="post" action="{S_FORM_ACTION}">
+<form name="mcp" method="post" action="{S_MCP_ACTION}">
 <!-- IF S_CAN_SPLIT -->
 	<tr>
 		<th colspan="3" height="28" nowrap="nowrap">{L_SPLIT_TOPIC}</th>
@@ -22,7 +22,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="1" checked="checked" /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}" /><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>
@@ -33,7 +33,7 @@
 		<th colspan="3" height="28" nowrap="nowrap">{L_MERGE_TOPIC}</th>
 	</tr>
 	<tr>
-		<td class="row3" colspan="3"><span class="gensmall">{L_MERGE_TOPIC_EXPLAIN}</span></td>
+		<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_ID}</span></td>
@@ -41,7 +41,7 @@
 	</tr>
 	<!-- IF TO_TOPIC_INFO -->
 	<tr>
-		<td class="row2" colspan="3" align="center"><b class="gen">&nbsp;&nbsp;{TO_TOPIC_INFO}</b></td>
+		<td class="row3" colspan="3" align="center"><b class="gen">{TO_TOPIC_INFO}</b></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- ENDIF -->
@@ -53,21 +53,14 @@
 		<td class="row2" colspan="2"><input class="post" type="text" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}"></td>
 	</tr>
 	<tr>
+		<td class="cat" colspan="3" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
+	</tr>
+	<tr>
 		<th height="28" nowrap="nowrap">{L_AUTHOR}</th>
 		<th nowrap="nowrap">{L_MESSAGE}</th>
 		<th nowrap="nowrap">{L_SELECT}</th>
 	</tr>
 	<!-- BEGIN postrow -->
-	<!-- IF postrow.S_DISPLAY_MODES -->
-	<tr>
-		<td class="cat" colspan="3" height="28" align="center"><select name="mode">
-			<!-- 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_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>
-	</tr>
-	<!-- ENDIF -->
 	<!-- IF postrow.S_ROW_COUNT is even -->
 	<tr class="row1">
 	<!-- ELSE -->
@@ -104,7 +97,7 @@
 						<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_NOT_APPROVED}</a></b>&nbsp;&nbsp;</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>
@@ -124,7 +117,12 @@
 	</tr>
 	<!-- END postrow -->
 	<tr>
-		<td class="cat" colspan="3" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
+		<td class="cat" colspan="3" height="28" align="center"><select name="mode">
+			<!-- 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_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>
 	</tr>
 </form>
 </table>
@@ -132,7 +130,7 @@
 <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(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><br /><span class="nav">{PAGINATION}</span></td>
 	</tr>
 </table>
 
diff --git a/phpBB/styles/subSilver/template/mcp_viewlogs.html b/phpBB/styles/subSilver/template/mcp_viewlogs.html
index 4a9325f877..affe485431 100644
--- a/phpBB/styles/subSilver/template/mcp_viewlogs.html
+++ b/phpBB/styles/subSilver/template/mcp_viewlogs.html
@@ -1,25 +1,26 @@
 <!-- $Id$ -->
 <!-- INCLUDE mcp_header.html -->
 
-<form method="post" name="main" action="{S_MCP_ACTION}">
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
+<form method="post" name="mcp" action="{S_MCP_ACTION}">
 	<tr>
-		<th colspan="5" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
+		<th colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
 	</tr>
 	<tr>
-		<td colspan="2" class="cat" height="28" align="left" nowrap="nowrap"><!-- INCLUDE mcp_jumpbox.html --></td>
-		<td colspan="3" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
+		<td colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
 	</tr>
 	<tr>
 		<th width="15%" height="28" nowrap="nowrap">{L_USERNAME}</th>
 		<th width="12%" nowrap="nowrap">{L_IP}</th>
 		<th width="18%" nowrap="nowrap">{L_TIME}</th>
 		<th width="45%" nowrap="nowrap">{L_ACTION}</th>
+		<!-- IF not S_TOPIC_ID -->
 		<th width="8%" nowrap="nowrap"></th>
+		<!-- ENDIF -->
 	</tr>
 	<!-- IF S_TOPIC_ID -->
 	<tr>
-		<td class="row3" colspan="5"><span class="gensmall">{L_LOGS_CURRENT_TOPIC} <b>{TOPIC_NAME}</b></b></td>
+		<td class="row3" colspan="5"><span class="gensmall">{L_LOGS_CURRENT_TOPIC} <a href="{U_VIEWTOPIC}"><b>{TOPIC_NAME}</b></a></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- BEGIN log -->
@@ -28,13 +29,16 @@
 		<td class="row1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td>
 		<td class="row1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td>
 		<td class="row1"><span class="gen">{log.ACTION}</span></td>
+		<!-- IF not S_TOPIC_ID -->
 		<td class="row1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEWTOPIC --><a href="{log.U_VIEWTOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td>
+		<!-- ENDIF -->
 	</tr>
 	<!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="5" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
+		<td class="row1" colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
 	</tr>
 	<!-- END log -->
+</form>
 </table>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
@@ -43,6 +47,5 @@
 		<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span></td>
 	</tr>
 </table>
-</form>
 
-<!-- INCLUDE overall_footer.html -->
-\ No newline at end of file
+<!-- INCLUDE mcp_footer.html -->
+\ No newline at end of file
author	Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net>	2003-11-27 23:07:31 +0000
committer	Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net>	2003-11-27 23:07:31 +0000
commit	fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b (patch)
tree	b3955df8201d605bc7e8250db79ae3044c48663e
parent	f15467f4c58b7696d021bd59c25922fb4cf1aac2 (diff)
download	forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.tar forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.tar.gz forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.tar.bz2 forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.tar.xz forums-fdfc37ef12efbf5f7e7c64cf99341e3c3f16778b.zip