From 0be22140b2338b4b77f257fd3c2928d5038287fd Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 8 Apr 2007 15:40:19 +0000
Subject: [PATCH] let approve/disapprove work in post details changed
 mcp_approve.html for confirm box to use the standard layout for all confirm
 boxes...

git-svn-id: file:///svn/phpbb/trunk@7303 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../prosilver/template/mcp_approve.html       | 72 ++++++++++---------
 phpBB/styles/prosilver/template/mcp_post.html | 10 +--
 .../styles/subsilver2/template/mcp_post.html  |  2 +-
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html
index 94f861c865..053c74d68f 100644
--- a/phpBB/styles/prosilver/template/mcp_approve.html
+++ b/phpBB/styles/prosilver/template/mcp_approve.html
@@ -1,47 +1,53 @@
-<!-- INCLUDE mcp_header.html -->
+<!-- INCLUDE overall_header.html -->
 
 <form name="confirm" action="{S_CONFIRM_ACTION}" method="post">
 
-<div class="content">
+<div class="panel">
+	<div class="inner"><span class="corners-top"><span></span></span>
 
-	<h2>{MESSAGE_TITLE}</h2>
-	<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
+	<div class="content">
 
-	<fieldset>
-	<!-- IF S_NOTIFY_POSTER -->
-		<dl class="panel">
+		<h2>{MESSAGE_TITLE}</h2>
+		<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
+
+		<fieldset>
+		<!-- IF S_NOTIFY_POSTER -->
+			<dl class="panel">
+				<dt>&nbsp;</dt>
+				<dd><label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd>
+			</dl>
+		<!-- ENDIF -->
+
+		<!-- IF not S_APPROVE -->
+			<dl class="fields2 nobg">
+				<dt><label>{L_DISAPPROVE_REASON}:</label></dt>
+				<dd><select name="reason_id">
+					<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
+					</select>
+				</dd>
+			</dl>
+			<dl class="fields2 nobg">
+				<dt><label for="reason">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
+				<dd><textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea></dd>
+			</dl>
+		<!-- ENDIF -->
+
+		<dl class="fields2 nobg">
 			<dt>&nbsp;</dt>
-			<dd><label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd>
+			<dd><strong>{MESSAGE_TEXT}</strong></dd>
 		</dl>
-	<!-- ENDIF -->
+		</fieldset>
 
-	<!-- IF not S_APPROVE -->
-		<dl class="fields2 nobg">
-			<dt><label>{L_DISAPPROVE_REASON}:</label></dt>
-			<dd><select name="reason_id">
-				<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
-				</select>
-			</dd>
-		</dl>
-		<dl class="fields2 nobg">
-			<dt><label for="reason">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
-			<dd><textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea></dd>
-		</dl>
-	<!-- ENDIF -->
+		<fieldset class="submit-buttons">
+			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp; 
+			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+		</fieldset>
 
-	<dl class="fields2 nobg">
-		<dt>&nbsp;</dt>
-		<dd><strong>{MESSAGE_TEXT}</strong></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-	</fieldset>
+	</div>
 
+	<span class="corners-bottom"><span></span></span></div>
 </div>
 
 </form>
 
-<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index fd23bb3b74..6d82b5782e 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -46,19 +46,19 @@
 	<div class="postbody">
 		<!-- IF U_EDIT -->
 		<ul class="profile-icons">
-			<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT}</span></a></li>
+			<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li>
 		</ul>
 		<!-- ENDIF -->
 
 		<h3>{POST_SUBJECT}</h3>
 		<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} {L_POSTED_ON_DATE}  {POST_DATE}</p>
-		
+
 		<!-- IF S_POST_UNAPPROVED -->
-			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
+			<form method="post" id="mcp_approve" action="{S_APPROVE_ACTION}">
 
 			<p class="rules">
-				<input class="button1" type="submit" value="{L_APPROVE}" name="mode[approve]" /> &nbsp; 
-				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="mode[disapprove]" />
+				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> &nbsp; 
+				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
 				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
 			</p>
 
diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html
index 86669957fe..34a93054a0 100644
--- a/phpBB/styles/subsilver2/template/mcp_post.html
+++ b/phpBB/styles/subsilver2/template/mcp_post.html
@@ -38,7 +38,7 @@
 	<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_details" action="{U_CLOSE_ACTION}"><!-- ENDIF -->
+<!-- IF S_MCP_QUEUE --><form method="post" name="mcp_approve" action="{S_APPROVE_ACTION}"><!-- ELSE --><form method="post" name="mcp_report_details" action="{U_CLOSE_ACTION}"><!-- ENDIF -->
 
 <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
 <tr>