- replaced mcp reports system with a simplified version

- fixed links to mcp_reports git-svn-id: file:///svn/phpbb/trunk@5649 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Nils Adermann <naderman@naderman.de> 2006-03-18 10:54:14 +0000
committer: Nils Adermann <naderman@naderman.de> 2006-03-18 10:54:14 +0000
commit: 9cd89343a297ff594d1a74459d1c9059e24c501f (patch)
tree: 7d2e05f26cb6643e8facb566dc0c21e884237a2d /phpBB/styles
parent: ca1e11dc2a165542098819b6d722afd8eb05ab90 (diff)
download: forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar
forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.gz
forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.bz2
forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.xz
forums-9cd89343a297ff594d1a74459d1c9059e24c501f.zip
4 files changed, 66 insertions, 167 deletions
diff --git a/phpBB/styles/subSilver/template/mcp_post.html b/phpBB/styles/subSilver/template/mcp_post.html
index ff59b7b5c0..1067c634be 100644
--- a/phpBB/styles/subSilver/template/mcp_post.html
+++ b/phpBB/styles/subSilver/template/mcp_post.html
@@ -2,12 +2,46 @@
 
 <!-- $Id$ -->
 
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}">
+<!-- IF S_MCP_REPORT -->
+	<form method="post" name="mcp_report" action="{U_CLOSE_ACTION}"><table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
+	<tr>
+		<th colspan="2" height="28" align="center">{L_REPORT_DETAILS}</th>
+	</tr>
+	<tr>
+		<td class="row1"><b class="gen">{L_REPORT_REASON}: </b></td>
+		<td class="row2"><span class="gen">{REPORT_REASON_TITLE} &raquo; {REPORT_REASON_DESCRIPTION}</span></td>
+	</tr>
+	<tr>
+		<td class="row1" width="20%"><b class="gen">{L_REPORTER}: </b></td>
+		<td class="row2" width="80%"><span class="gen">{REPORTER_NAME} &nbsp; [ <a href="{U_VIEW_REPORTER_PROFILE}">{L_READ_PROFILE}</a><!-- IF S_USER_NOTES --> | <a href="{U_MCP_REPORTER_NOTES}">{L_VIEW_NOTES}</a> | <a href="{U_MCP_WARN_REPORTER}">{L_WARN_USER}</a><!-- ENDIF --> ]</span></td>
+	</tr>
+	<tr>
+		<td class="row1"><b class="gen">{L_REPORTED}: </b></td>
+		<td class="row2"><span class="postdetails">{REPORT_DATE}</span></td>
+	</tr>
+	<!-- IF REPORT_TEXT -->
+	<tr>
+		<th colspan="2" height="28" align="center">{L_MORE_INFO}</th>
+	</tr>
+	<tr>
+		<td class="row1" colspan="2"><div class="gen" style="overflow: auto; width: 100%; height: 80pt; border: 1px;">{REPORT_TEXT}</div></td>
+	</tr>
+	<!-- ENDIF -->
+	<tr>
+		<td class="cat" align="center" colspan="2"><!-- IF S_POST_REPORTED --><input class="btnmain" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /><!-- ELSE -->{L_REPORT_CLOSED}<!-- ENDIF --> &nbsp; <input class="btnlite" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" /></td>
+	</tr>
+	<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
+	</table></form>
+
+	<br clear="all"/>
+<!-- ENDIF -->
+
+<!-- IF S_MCP_QUEUE --><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}"><!-- ELSE --><form method="post" name="mcp_report" action="{U_CLOSE_ACTION}"><!-- ENDIF --><table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
 <tr>
 	<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_MCP_QUEUE -->{RETURN_QUEUE}<!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
+	<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS}<!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
 </tr>
 <tr>
 	<td class="row1"><b class="gen">{L_POST_SUBJECT}: </b></td>
@@ -33,7 +67,7 @@
 <tr>
 	<td class="row1" colspan="2"><div class="gen" style="overflow: auto; width: 100%; height: 80pt; border: 1px;">{POST_PREVIEW}</div><!-- IF U_EDIT --><div class="gen" style="float: right;"><a href="{U_EDIT}">{EDIT_IMG}</a></div><!-- ENDIF --></td>
 </tr>
-<!-- IF S_POST_UNAPPROVED -->
+<!-- IF S_POST_UNAPPROVED and S_MCP_QUEUE -->
 	<tr>
 		<td class="cat" align="center" colspan="2"><input class="btnmain" type="submit" value="{L_APPROVE}" name="action[approve]" /> &nbsp; <input class="btnlite" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /></td>
 	</tr>
@@ -46,37 +80,11 @@
 	<br clear="all" />
 
 	<!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
-<!-- ELSE -->
-
-	<!-- IF S_SHOW_REPORTS -->
-		<br /><a name="reports"></a>
-
-		<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-		<tr>
-			<th colspan="2" height="28" align="center">{L_REPORTS}</th>
-		</tr>
-		<!-- BEGIN reports -->
-			<tr>
-				<td class="row1"><b class="genmed">{reports.REPORT_TIME}</b></td>
-				<td class="row2"><span class="gen">{reports.REASON_TITLE} &#187; {reports.REASON_DESC}</span></td>
-			</tr>
-			<tr>
-				<td class="row1"><b class="genmed">{L_REPORTER}: </b></td>
-				<td class="row2"><span class="gen"><!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --></span></td>
-			</tr>
-			<!-- IF reports.REPORT_TEXT -->
-				<tr>
-					<td class="row1" valign="top"><b class="genmed">{L_MORE_INFO}: </b></td>
-					<td class="row2"><span class="gen">{reports.REPORT_TEXT}</span></td>
-				</tr>
-			<!-- ENDIF -->
-			<tr>
-				<td colspan="2" class="spacer"></td>
-			</tr>
-		<!-- END reports -->
-		</table>
-	<!-- ENDIF -->
+<!-- ELSEIF S_MCP_REPORT -->
+	<br clear="all" />
 
+	<!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
+<!-- ELSE -->
 	<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER -->
 		<br /><a name="mod"></a>
 
diff --git a/phpBB/styles/subSilver/template/mcp_reports.html b/phpBB/styles/subSilver/template/mcp_reports.html
index b3a2f076cf..9fa329ba2d 100644
--- a/phpBB/styles/subSilver/template/mcp_reports.html
+++ b/phpBB/styles/subSilver/template/mcp_reports.html
@@ -1,42 +1,44 @@
 <!-- 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>
+		<th colspan="5" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
 	</tr>
 	<tr>
-		<td colspan="2" class="cat" height="28" align="left" nowrap="nowrap"><!-- INCLUDE 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;<span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
 	</tr>
-	<tr>
-		<th height="28">&nbsp;{L_TOPIC}&nbsp;</th>
-		<th>&nbsp;{L_SUBJECT}&nbsp;</th>
-		<th>&nbsp;{L_REASON}&nbsp;</th>
+	<tr> 
+		<th height="28">&nbsp;{L_POST}&nbsp;</th>
+		<th>&nbsp;{L_AUTHOR}&nbsp;</th>
 		<th>&nbsp;{L_REPORTER}&nbsp;</th>
-		<th width="15%">&nbsp;{L_REPORT_TIME}&nbsp;</th>
+		<th>&nbsp;{L_REPORT_TIME}&nbsp;</th>
 		<th width="5%">&nbsp;{L_SELECT}&nbsp;</th>
 	</tr>
-	<!-- IF S_TOPIC_ID -->
+	<!-- BEGIN postrow -->
+	<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td style="padding: 4px;"><p class="topictitle"><a href="{postrow.U_VIEWTOPIC}">{postrow.POST_SUBJECT}</a></p>
+			<span class="gensmall">{L_TOPIC}: <a href="{postrow.U_VIEWTOPIC}">{postrow.TOPIC_TITLE}</a></span><br />
+			<span class="gensmall">{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a></span></td>
+		<td style="padding: 4px;" align="left" valign="top" nowrap="nowrap"><span class="gen"><!-- IF postrow.U_VIEW_POSTER_PROFILE --><a href="{postrow.U_VIEW_POSTER_PROFILE}">{postrow.POSTER}</a><!-- ELSE -->{postrow.POSTER}<!-- ENDIF --></span><br />
+			<span class="gensmall">{postrow.POST_TIME}</span></td>
+		<td style="padding: 4px;" align="left" valign="top" nowrap="nowrap"><span class="gen"><!-- IF postrow.U_VIEW_REPORTER_PROFILE --><a href="{postrow.U_VIEW_REPOTER_PROFILE}">{postrow.REPORTER}</a><!-- ELSE -->{postrow.REPORTER}<!-- ENDIF --></span></td>
+		<td style="padding: 4px;" align="left" valign="top" nowrap="nowrap"><span class="gen">{postrow.REPORT_TIME}</span><br />
+			<span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
+		<td align="center">{postrow.S_CHECKBOX}</td>
+	</tr>
+	<!-- BEGINELSE -->
 	<tr>
-		<td class="row3" colspan="6"><span class="gensmall">{L_REPORTS_CURRENT_TOPIC} <b>{TOPIC_NAME}</b></b></td>
+		<td class="row1" colspan="5" height="30" align="center" valign="middle"><span class="gen">{L_NO_POSTS}</span></td>
 	</tr>
-	<!-- ENDIF -->
-	<!-- BEGIN reportrow -->
+	<!-- END postrow -->
 	<tr>
-		<td class="row2" width="18%"><span class="gen">{reportrow.TOPIC}</span></td>
-		<td class="row1"><span class="gen">{reportrow.SUBJECT}</span></td>
-		<td class="row2" align="center" width="15%"><span class="gen">{reportrow.REASON}</span></td>
-		<td class="row1" align="center" width="15%"><span class="gen">{reportrow.REPORTER}</span></td>
-		<td class="row2" align="center" width="15%"><span class="gensmall">{reportrow.REPORT_TIME}</span></td>
-		<td class="row1" align="center" width="15%"><a class="gensmall" href="{reportrow.U_VIEW_REPORT}">{L_POST_REPORTED}</a></td>
+		<td class="cat" colspan="5" height="28" align="center"><!-- IF not S_CLOSED --><input class="btnmain" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /> &nbsp; <!-- ENDIF --><input class="btnlite" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /></td>
 	</tr>
-	<!-- END reportrow -->
-</table>
+</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"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></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>
 
diff --git a/phpBB/styles/subSilver/template/mcp_reports_front.html b/phpBB/styles/subSilver/template/mcp_reports_front.html
deleted file mode 100755
index 838e187d08..0000000000
--- a/phpBB/styles/subSilver/template/mcp_reports_front.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-	<!-- $Id$ -->
-	<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row3" colspan="6" align="center"><b class="gen">{L_OPEN_REPORTS}</b></td>
-	</tr>
-	<tr>
-		<th>&nbsp;{L_NR}&nbsp;</th>
-		<th>&nbsp;{L_FORUM}&nbsp;</th>
-		<th>&nbsp;{L_TOPIC}&nbsp;</th>
-		<th>&nbsp;{L_USER}&nbsp;</th>
-		<th>&nbsp;{L_COUNT}&nbsp;</th>
-		<th>&nbsp;</th>
-	</tr>
-	<!-- BEGIN report -->
-		<tr>
-			<td class="row1" width="15%" valign="top"><span class="gen"><a href="{report.U_USER}"><a href="{report.U_REPORT_TOPIC}">{report.REPORT_COUNT}</a></span></td>
-			<td class="row1" width="15%" valign="top"><span class="gen"><a href="{report.U_USER}"><a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span></td>
-			<td class="row2" width="15%" valign="top"><a class="gen" href="{report.U_TOPIC}">{report.TOPIC_TITLE}</a></td>
-			<td class="row1" width="15%" valign="top"><a class="gen" href="{report.U_VIEWPROFILE}">{report.POSTER}</a></span></td>
-			<td class="row2" width="15%" valign="top"><span class="gen">{report.REPORT_COUNT}</span></td>
-			<td class="row1" width="15%" valign="top"><span class="gen"> <input type="checkbox" /> </td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="5" align="center"><span class="gen">{L_REPORTS_ZERO_TOTAL}</span></td>
-		</tr>
-	<!-- END report -->
-	</table>
-
-	<br clear="all" /><br />
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_reports_topic.html b/phpBB/styles/subSilver/template/mcp_reports_topic.html
deleted file mode 100755
index d21a552d23..0000000000
--- a/phpBB/styles/subSilver/template/mcp_reports_topic.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-<form method="POST" action="{U_FEEDBACK_ACTION}">
-<!-- BEGIN postrow -->
-<a name="{postrow.POST_ID}"></a>
-<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
-<tr>
-	<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>
-</tr>
-<tr>
-	<td class="row1"><b class="gen">{L_POST_SUBJECT}: </b></td>
-	<td class="row2"><span class="gen"><a href="{postrow.U_VIEW}">{postrow.POST_SUBJECT}</a></span></td>
-</tr>
-<tr>
-	<td class="row1" width="20%" valign="top">
-		<b class="gen">{L_POSTER}:</b> <span class="gen"><a href="{U_POSTER_PROFILE}">{postrow.POSTER_NAME}</a></span><br />
-		<b class="gen">{L_POSTED}: </b> <span class="postdetails">{postrow.POST_DATE}</span>
-	</td>
-	<td class="row2" width="80%"><span class="gen">{postrow.POST_PREVIEW}</span></td>
-</tr>
-</table>
-
-<table style="margin-left: 5%" width="100%">
-	<!-- BEGIN reportrow -->
-	<tr>
-		<th colspan="3">Report {postrow.reportrow.REPORT_ID}</th>
-	</tr>
-	<tr class="row1">
-		<!-- IF postrow.reportrow.REPORT_STATUS neq 1 -->
-			<td width="5%"><input type="checkbox" name="sendfeedback[]" value="{postrow.reportrow.REPORT_ID}" /></td>
-		<!-- ENDIF -->
-		<!-- Nesting IF/ELSE didn't work as expected -->
-		<!-- IF postrow.reportrow.REPORT_STATUS eq 1 -->
-			<td width="5%"><span style="color: red">RESOLVED</style></td>
-		<!-- ENDIF -->
-		<td width="15%" valign="top">
-			<b>Time:</b> <span class="postdetails">{postrow.reportrow.REPORT_TIME}</span><br />
-			<b>Reporter:</b> <span class="gen"><!-- IF postrow.reportrow.U_REPORTERPROFILE --><a href="{postrow.reportrow.U_REPORTERPROFILE}">{postrow.reportrow.REPORTER_USERNAME}</a><!-- ELSE -->{postrow.reportrow.REPORTER_USERNAME}<!-- ENDIF --></span>
-		</td>
-		<td valign="top"><span class="gen">{postrow.reportrow.REPORT_TEXT}</span></td>
-	</tr>
-	<!-- This needs some VERY serious cleaning up :) -->
-	<tr><td colspan="3">
-		<table style="margin-left: 10%" width="100%">
-	<!-- BEGIN replyrow -->
-			<tr>
-				<th colspan="2">Reply {postrow.reportrow.replyrow.REPLY_ID}</th>
-			</tr>
-			<tr class="row1">
-				<td width="15%" valign="top">
-					<b>Time:</b> <span class="postdetails">{postrow.reportrow.REPORT_TIME}</span><br />
-					<b>From:</b> <span class="gen">{postrow.reportrow.replyrow.REPLY_FROMUSERNAME}</span>
-					<b>To:</b> <span class="gen">{postrow.reportrow.replyrow.REPLY_TOUSERNAME}</span>
-				</td>
-				<td valign="top"><span class="gen">{postrow.reportrow.replyrow.REPLY_TEXT}</span></td>
-			</tr>
-	<!-- END replyrow -->
-		</table>
-	</td></tr>
-	<!-- BEGINELSE -->
-	<tr class="row1">
-		<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_REPORTS}</span></td>
-	</tr>
-	<!-- END reportrow -->
-</table>
-<br />
-<!-- END postrow -->
-
-Send this comment to the selected reporters:<br />
-<textarea name="feedback_text" style="width: 100%" cols="80" rows="5"></textarea>
-{L_CLOSE_REPORT}<input type="checkbox" name="feedback_close">
-<input type="submit" name="feedback_submit" value="{L_SUBMIT}"/></p>
-
-</form>
-
-
-
-<!-- INCLUDE mcp_footer.html -->
-\ No newline at end of file
author	Nils Adermann <naderman@naderman.de>	2006-03-18 10:54:14 +0000
committer	Nils Adermann <naderman@naderman.de>	2006-03-18 10:54:14 +0000
commit	9cd89343a297ff594d1a74459d1c9059e24c501f (patch)
tree	7d2e05f26cb6643e8facb566dc0c21e884237a2d /phpBB/styles
parent	ca1e11dc2a165542098819b6d722afd8eb05ab90 (diff)
download	forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.gz forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.bz2 forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.xz forums-9cd89343a297ff594d1a74459d1c9059e24c501f.zip