Lots of HTML updates, and more to follow...

git-svn-id: file:///svn/phpbb/trunk@3780 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> 2003-04-02 23:16:05 +0000
committer: Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> 2003-04-02 23:16:05 +0000
commit: af3512e6dfe83363be067c5205b67353200476dc (patch)
tree: 332ee6f2d14c00739b6738f6275f478b9b61b927
parent: f94a5cb87d10247c02faf93ca5c99d2de2a57c36 (diff)
download: forums-af3512e6dfe83363be067c5205b67353200476dc.tar
forums-af3512e6dfe83363be067c5205b67353200476dc.tar.gz
forums-af3512e6dfe83363be067c5205b67353200476dc.tar.bz2
forums-af3512e6dfe83363be067c5205b67353200476dc.tar.xz
forums-af3512e6dfe83363be067c5205b67353200476dc.zip
5 files changed, 134 insertions, 59 deletions
diff --git a/phpBB/templates/subSilver/mcp_forum.html b/phpBB/templates/subSilver/mcp_forum.html
index 48e0396874..2ad5b04f3f 100644
--- a/phpBB/templates/subSilver/mcp_forum.html
+++ b/phpBB/templates/subSilver/mcp_forum.html
@@ -2,7 +2,14 @@
 
 <form name="form" method="post" action="{S_MCP_ACTION}">
 <table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0">
-	<tr> 
+	<tr>
+		<th height="25" colspan="6" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
+	</tr>
+	<tr>
+		<td colspan="2" 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="liteoption" type="submit" name="sort" value="{L_GO}" /></span></td>
+		<td colspan="3" class="cat" height="28" align="right" nowrap="nowrap"><!-- INCLUDE mcp_jumpbox.html --></td>
+	</tr>
+	<tr>
 		<th width="4%" nowrap="nowrap">&nbsp;</th>
 		<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
 		<th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
@@ -10,7 +17,7 @@
 		<th width="5%" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
 	</tr>
 	<!-- BEGIN topicrow -->
-	<tr> 
+	<tr>
 		<td class="row1" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
 		<td class="row1"><span class="topictitle"><!-- IF topicrow.S_SELECT_TOPIC -->[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ] <!-- ENDIF -->{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span></td>
 		<td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
@@ -22,7 +29,7 @@
 		<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"> 
+	<tr align="right">
 		<td class="cat" colspan="5" height="28">{S_HIDDEN_FIELDS}
 			<!-- IF S_CAN_DELETE -->
 			<input type="submit" name="delete_topics" class="liteoption" value="{L_DELETE}" />
@@ -30,13 +37,13 @@
 			<!-- ENDIF -->
 			<!-- IF S_CAN_MOVE -->
 			<input type="submit" name="move" class="liteoption" value="{L_MOVE}" />
-			&nbsp; 
+			&nbsp;
 			<!-- ENDIF -->
 			<!-- IF S_CAN_LOCK -->
 			<input type="submit" name="lock" class="liteoption" value="{L_LOCK}" />
-			&nbsp; 
+			&nbsp;
 			<input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" />
-			&nbsp; 
+			&nbsp;
 			<!-- ENDIF -->
 			<!-- IF S_CAN_RESYNC -->
 			<input type="submit" name="resync" class="liteoption" value="{L_RESYNC}" />
@@ -46,16 +53,16 @@
 </table>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr> 
+	<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>
 	</tr>
-</table></form>
+</table>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td align="right"><!-- INCLUDE jumpbox.html --></td>
 	</tr>
-</table>
+</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
index 33af6e8d4d..8240449ae6 100644
--- a/phpBB/templates/subSilver/mcp_front.html
+++ b/phpBB/templates/subSilver/mcp_front.html
@@ -1,8 +1,9 @@
+<!-- $Id$ -->
 <!-- INCLUDE mcp_header.html -->
 
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
 	<tr>
-		<td class="cat" colspan="5" height="28"><span class="cattitle">Latest 5 posts awaiting approval</span></td>
+		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_UNAPPROVED}</span></td>
 	</tr>
 	<tr>
 		<th>&nbsp;{L_FORUM}&nbsp;</th>
@@ -17,16 +18,83 @@
 		<td class="row2" width="18%"><span class="gen">{unapproved.TOPIC}</span></td>
 		<td class="row1"><span class="gen">{unapproved.SUBJECT}</span></td>
 		<td class="row2" align="center" width="15%" nowrap="nowrap"><span class="gen">{unapproved.AUTHOR}</span></td>
-		<td class="row1" align="center" width="10%" nowrap="nowrap"><span class="gensmall">{unapproved.POST_TIME}</span></td>
+		<td class="row1" align="center" width="15%" nowrap="nowrap"><span class="gensmall">{unapproved.POST_TIME}</span></td>
 	</tr>
 	<!-- BEGINELSE -->
+	<tr>
+		<td class="row1" colspan="5" align="center"><span class="gen">{L_UNAPPROVED_TOTAL}</span></td>
+	</tr>
 	<!-- END unapproved -->
+	<!-- IF unapproved -->
+	<tr>
+		<td class="row3" colspan="5"><span class="gensmall">{L_UNAPPROVED_TOTAL}</span></td>
+	</tr>
+	<!-- ENDIF -->
 </table>
 
-<br /><br />
+<br />
 
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
 	<tr>
-		<td class="cat" colspan="2" height="28"><span class="cattitle">Latest 5 reported posts</span></td>
+		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_REPORTED}</span></td>
+	</tr>
+	<tr>
+		<th>&nbsp;{L_FORUM}&nbsp;</th>
+		<th>&nbsp;{L_TOPIC}&nbsp;</th>
+		<th>&nbsp;{L_SUBJECT}&nbsp;</th>
+		<th>&nbsp;{L_REPORTER}&nbsp;</th>
+		<th>&nbsp;{L_REPORT_TIME}&nbsp;</th>
 	</tr>
-</table>
-\ No newline at end of file
+	<!-- BEGIN reported -->
+	<tr>
+		<td class="row1" width="15%"><span class="gen">{reported.FORUM}</span></td>
+		<td class="row2" width="18%"><span class="gen">{reported.TOPIC}</span></td>
+		<td class="row1"><span class="gen">{reported.SUBJECT}</span></td>
+		<td class="row2" align="center" width="15%" nowrap="nowrap"><span class="gen">{reported.REPORTER}</span></td>
+		<td class="row1" align="center" width="15%" nowrap="nowrap"><span class="gensmall">{reported.REPORT_TIME}</span></td>
+	</tr>
+	<!-- BEGINELSE -->
+	<tr>
+		<td class="row1" colspan="5" align="center"><span class="gen">{L_REPORTED_TOTAL}</span></td>
+	</tr>
+	<!-- END reported -->
+	<!-- IF reported -->
+	<tr>
+		<td class="row3" colspan="5"><span class="gensmall">{L_REPORTED_TOTAL}</span></td>
+	</tr>
+	<!-- ENDIF -->
+</table>
+
+<br />
+
+<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
+	<tr>
+		<td class="cat" colspan="5" height="28"><span class="cattitle">{L_LATEST_LOGS}</span></td>
+	</tr>
+	<tr>
+		<th width="15%" height="25" nowrap="nowrap">{L_USERNAME}</th>
+		<th width="12%" nowrap="nowrap">{L_IP}</th>
+		<th width="45%" nowrap="nowrap">{L_ACTION}</th>
+		<th nowrap="nowrap"></th>
+		<th width="18%" nowrap="nowrap">{L_TIME}</th>
+	</tr>
+	<!-- BEGIN log -->
+	<tr>
+		<td class="row1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td>
+		<td class="row1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td>
+		<td class="row1"><span class="gen">{log.ACTION}</span></td>
+		<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>
+		<td class="row1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td>
+	</tr>
+	<!-- BEGINELSE -->
+	<tr>
+		<td class="row1" colspan="5" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
+	</tr>
+	<!-- END log -->
+</table>
+
+<br />
+
+<form name="main" action="{S_MCP_ACTION}" method="post"><!-- INCLUDE mcp_jumpbox.html --></form>
+
+<!-- INCLUDE overall_footer.html -->
+\ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_header.html b/phpBB/templates/subSilver/mcp_header.html
index 81e92133d5..0e302a63f0 100644
--- a/phpBB/templates/subSilver/mcp_header.html
+++ b/phpBB/templates/subSilver/mcp_header.html
@@ -4,9 +4,10 @@
 <!--
 function marklist(status)
 {
-	for (i = 0; i < document.form.length; i++)
+	for (i = 0; i < document.forms['main'].length; i++)
 	{
-		document.form.elements[i].checked = status;
+		// NOTE: all forms in MCP do not have the same name at present
+		document.forms['main'].elements[i].checked = status;
 	}
 }
 //-->
diff --git a/phpBB/templates/subSilver/mcp_move.html b/phpBB/templates/subSilver/mcp_move.html
index 92b0228db7..0bcbdc2e4d 100644
--- a/phpBB/templates/subSilver/mcp_move.html
+++ b/phpBB/templates/subSilver/mcp_move.html
@@ -1,48 +1,47 @@
 <!-- INCLUDE overall_header.html -->
-
 <form action="{S_MCP_ACTION}" method="post"><input type="hidden" name="mode" value="move">
-  <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+<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>
+		<td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
 	</tr>
-  </table>
-  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
+</table>
+<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
 	<tr> 
-	  <th height="25" class="thHead"><b>{L_MOVE}</b></th>
+		<th height="25" class="thHead"><b>{L_MOVE}</b></th>
 	</tr>
-	<tr> 
-	  <td class="row1"> 
-		<table width="100%" border="0" cellspacing="0" cellpadding="1">
-		  <tr> 
-			<td>&nbsp;</td>
-		  </tr>
-		  <tr> 
-			<td align="center"><table border="0" cellspacing="0" cellpadding="0">
-				<tr class="gen"><td align="left">
-					{L_SELECTED_TOPICS}<br />
-					<ul><!-- BEGIN topiclist -->
-						<li><a href="{topiclist.U_TOPIC_LINK}" target="_new">{topiclist.TOPIC_TITLE}</a>
-					<!-- END topiclist --></ul>
-				</td></tr>
-			</table></td>
-		  </tr>
-		  <tr> 
-			<td align="center"><span class="gen">{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br />
-			  <input type="checkbox" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
-			  <br />
-			  {S_HIDDEN_FIELDS} 
-			  <input class="mainoption" type="submit" name="confirm" value="{L_CONFIRM}" />
-			  &nbsp;&nbsp; 
-			  <input class="liteoption" type="submit" name="cancel" value="{L_CANCEL}" />
-			</td>
-		  </tr>
-		  <tr> 
-			<td>&nbsp;</td>
-		  </tr>
-		</table>
-	  </td>
+	<tr>
+		<td class="row1"><table width="100%" border="0" cellspacing="0" cellpadding="1">
+			<tr> 
+				<td>&nbsp;</td>
+			</tr>
+			<tr> 
+				<td align="center"><table border="0" cellspacing="0" cellpadding="0">
+					<tr class="gen">
+						<td align="left">
+							{L_SELECTED_TOPICS}<br />
+								<ul><!-- BEGIN topiclist -->
+								<li><a href="{topiclist.U_TOPIC_LINK}" target="_new">{topiclist.TOPIC_TITLE}</a>
+								<!-- END topiclist --></ul>
+						</td>
+					</tr>
+				</table></td>
+			</tr>
+			<tr> 
+				<td align="center"><span class="gen">{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span><select name="to_forum_id">{S_FORUM_SELECT}</select><br /><br />
+					<input type="checkbox" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
+					<br />
+					{S_HIDDEN_FIELDS} 
+					<input class="mainoption" type="submit" name="confirm" value="{L_CONFIRM}" />
+					&nbsp;&nbsp; 
+					<input class="liteoption" type="submit" name="cancel" value="{L_CANCEL}" />
+				</td>
+			</tr>
+			<tr> 
+				<td>&nbsp;</td>
+			</tr>
+		</table></td>
 	</tr>
-  </table>
+</table>
 </form>
 
 <!-- INCLUDE overall_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/templates/subSilver/mcp_queue.html b/phpBB/templates/subSilver/mcp_queue.html
index ad15b8a0ca..047f200ee2 100644
--- a/phpBB/templates/subSilver/mcp_queue.html
+++ b/phpBB/templates/subSilver/mcp_queue.html
@@ -1,12 +1,12 @@
 <!-- INCLUDE mcp_header.html -->
 
-<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"><form name="form" method="post" action="{S_MCP_ACTION}">
+<table width="100%" class="tablebg" cellspacing="1" cellpadding="4" border="0"><form name="main" method="post" action="{S_MCP_ACTION}">
 	<tr>
 		<th height="25" colspan="6" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
 	</tr>
 	<tr>
-		<td class="cat" colspan="6" 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="liteoption" type="submit" name="sort" value="{L_GO}" /></span></td>
-	</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="liteoption" type="submit" name="sort" value="{L_GO}" /></span></td>
 	</tr>
 	<tr> 
 		<th>&nbsp;{L_FORUM}&nbsp;</th>
@@ -48,7 +48,7 @@
 	<!-- END unapproved_posts -->
 	<!-- IF S_HAS_UNAPPROVED_TOPICS or S_HAS_UNAPPROVED_POSTS -->
 	<tr>
-		<td class="cat" colspan="6" height="28" align="center"><input class="liteoption" type="submit" name="approve" value="{L_APPROVE_POSTS}" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="delete_posts" value="{L_DELETE_POSTS}" /></td>
+		<td class="cat" colspan="6" height="28" align="center"><input class="liteoption" type="submit" name="approve" value="{L_APPROVE_POSTS}" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="disapprove" value="{L_DISAPPROVE_POSTS}" /></td>
 	</tr>
 	<!-- ELSE -->
 	<tr>
@@ -59,7 +59,7 @@
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr> 
-		<td class="nav" align="left" valign="middle"><!-- INCLUDE jumpbox.html --></td>
+		<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>
 	</tr>
 </table>
author	Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net>	2003-04-02 23:16:05 +0000
committer	Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net>	2003-04-02 23:16:05 +0000
commit	af3512e6dfe83363be067c5205b67353200476dc (patch)
tree	332ee6f2d14c00739b6738f6275f478b9b61b927
parent	f94a5cb87d10247c02faf93ca5c99d2de2a57c36 (diff)
download	forums-af3512e6dfe83363be067c5205b67353200476dc.tar forums-af3512e6dfe83363be067c5205b67353200476dc.tar.gz forums-af3512e6dfe83363be067c5205b67353200476dc.tar.bz2 forums-af3512e6dfe83363be067c5205b67353200476dc.tar.xz forums-af3512e6dfe83363be067c5205b67353200476dc.zip