- fixed permissions for mcp (global permission settings are false if user is only able to moderate one to x forums)

- determine permission settings for submodules
- further approve/disapprove work (approve_details added)


git-svn-id: file:///svn/phpbb/trunk@4925 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/styles/subSilver/template/mcp_approve.html

@@ -0,0 +1,46 @@
+<!-- INCLUDE mcp_header.html -->
+
+<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"><form method="post" name="mcp" action="{S_APPROVE_ACTION}">
+	<tr>
+		<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>
+	</tr>
+	<tr>
+		<td class="row3" colspan="2" align="center"><span class="gensmall">{RETURN_QUEUE}</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="row1" width="20%"><b class="gen">{L_POSTER}: </b></td>
+		<td class="row2" width="80%"><span class="gen">{POSTER_NAME} &nbsp; [ <a href="{U_VIEW_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>
+	<!-- 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} [ {POST_IPADDR} ]</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>
+	</tr>
+	</tr>
+	<tr>
+		<th colspan="2" height="28" align="center">{L_PREVIEW}</th>
+	</th>
+	<tr>
+		<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 class="btnmain" type="submit" value="{L_APPROVE}" name="mode[approve]" /> &nbsp; <input class="btnlite" type="submit" value="{L_DISAPPROVE}" name="mode[disapprove]" /></td>
+	</tr>
+	<!-- ENDIF -->
+</form></table>
+
+<br clear="all" />
+
+<!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
+
+<!-- INCLUDE mcp_footer.html -->

phpBB/styles/subSilver/template/mcp_queue.html

@@ -5,23 +5,22 @@
 		<th colspan="6" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
 	</tr>
 	<tr>
-		<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>
+		<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_FORUM}&nbsp;</th>
-		<th>&nbsp;{L_TOPIC}&nbsp;</th>
+		<th height="28">&nbsp;{L_TOPIC}&nbsp;</th>
 		<th>&nbsp;{L_AUTHOR}&nbsp;</th>
 		<th>&nbsp;{L_POST_TIME}&nbsp;</th>
 		<th width="5%">&nbsp;{L_SELECT}&nbsp;</th>
 	</tr>
-
 	<!-- BEGIN postrow -->
-	<tr>
-		<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>
+	<!-- 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.TOPIC_TITLE}</a></p><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_VIEWPROFILE --><a href="{postrow.U_VIEWPROFILE}">{postrow.POSTER}</a><!-- ELSE -->{postrow.POSTER}<!-- ENDIF --></span><br />
+			<span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
+		<td class="postdetails" style="padding: 4px;" align="left" valign="top" nowrap="nowrap">{postrow.POST_TIME}</td>
+		<td align="center">{postrow.S_CHECKBOX}</td>
 	</tr>
 	<!-- BEGINELSE -->
 	<tr>
@@ -34,9 +33,8 @@
 </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('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>
+		<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>
 

phpBB/styles/subSilver/template/posting_topic_review.html

@@ -52,7 +52,7 @@
 						<tr>
 							<td><table width="100%" cellspacing="0">
 								<tr valign="middle">
-									<td width="100%">&nbsp;</td>
+									<td width="100%" align="left"><span class="gensmall"><!-- IF topic_review_row.U_MCP_DETAILS -->[ <a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></span></td>
 									<td width="10" nowrap="nowrap"><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a></td>
 									<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {topic_review_row.POST_DATE}</td>
 								</tr>