From 692e0f1e33e72062d9bddd0a47df18d230575600 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Mar 2013 16:17:04 +0100
Subject: [PATCH] [ticket/9657] Adapt confirm box templates to new layout

PHPBB3-9657
---
 .../template/confirm_delete_body.html         | 37 +++++++++----------
 .../prosilver/template/mcp_approve.html       |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html
index 9b5b9906d0..9f36d2d824 100644
--- a/phpBB/styles/prosilver/template/confirm_delete_body.html
+++ b/phpBB/styles/prosilver/template/confirm_delete_body.html
@@ -2,28 +2,27 @@
 	<p>{MESSAGE_TEXT}</p>
 
 	<!-- IF not S_SOFTDELETED and (S_DELETE_REASON or (S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE)) -->
-		<fieldset class="fields1">
-			<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-				<dl>
-					<dt><label for="delete_permanent">{L_DELETE_PERMANENTLY}:</label></dt>
-					<dd>
-						<label for="delete_permanent">
-							<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
-							<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
-						</label>
-					</dd>
-				</dl>
-			<!-- ENDIF -->
+		<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
+			<label>
+				<strong>{L_DELETE_PERMANENTLY}:</strong>
+				<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
+				<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
+			</label>
+		<!-- ENDIF -->
 
-			<!-- IF S_DELETE_REASON -->
-				<dl>
-					<dt><label for="delete_reason">{L_DELETE_REASON}:</label><br /><span>{L_DELETE_REASON_EXPLAIN}</span></dt>
-					<dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd>
-				</dl>
-			<!-- ENDIF -->
-		</fieldset>
+		<!-- IF S_DELETE_REASON -->
+			<label>
+				<strong>{L_DELETE_REASON}:</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br />
+				<input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />
+			</label>
+		<!-- ENDIF -->
 	<!-- ENDIF -->
 
+	<fieldset class="submit-buttons">
+		<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+	</fieldset>
+
 <!-- ELSE -->
 
 <!-- INCLUDE overall_header.html -->
diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html
index baa660f8f7..f0978df518 100644
--- a/phpBB/styles/prosilver/template/mcp_approve.html
+++ b/phpBB/styles/prosilver/template/mcp_approve.html
@@ -7,7 +7,7 @@
 		<label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label>
 	<!-- ENDIF -->
 
-	<!-- IF not S_APPROVE -->
+	<!-- IF not S_APPROVE and not S_RESTORE -->
 		<label><strong>{L_DISAPPROVE_REASON}{L_COLON}</strong>
 		<select name="reason_id">
 			<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->