From bed82bf2bd13ca04cc1572d454eee5ef3a9053a6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Nov 2012 22:23:35 +0100
Subject: [feature/soft-delete] Invert the logic on confirm box

Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
---
 .../prosilver/template/confirm_delete_body.html    | 44 +++++++++++++++++++
 .../template/posting_delete_post_body.html         | 49 ----------------------
 2 files changed, 44 insertions(+), 49 deletions(-)
 create mode 100644 phpBB/styles/prosilver/template/confirm_delete_body.html
 delete mode 100644 phpBB/styles/prosilver/template/posting_delete_post_body.html

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html
new file mode 100644
index 0000000000..1e6e03ca0d
--- /dev/null
+++ b/phpBB/styles/prosilver/template/confirm_delete_body.html
@@ -0,0 +1,44 @@
+<!-- INCLUDE overall_header.html -->
+
+<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
+<div class="panel">
+	<div class="inner">
+
+	<h2>{MESSAGE_TITLE}</h2>
+
+	<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" />
+						<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
+					</label>
+				</dd>
+			</dl>
+		<!-- 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>
+	<!-- ENDIF -->
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input type="submit" name="confirm" value="{L_YES}" class="button1" />&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+	</fieldset>
+
+	</div>
+</div>
+</form>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/template/posting_delete_post_body.html b/phpBB/styles/prosilver/template/posting_delete_post_body.html
deleted file mode 100644
index 9ad9e985be..0000000000
--- a/phpBB/styles/prosilver/template/posting_delete_post_body.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form id="confirm" action="{S_CONFIRM_ACTION}" method="post">
-<div class="panel">
-	<div class="inner">
-
-	<h2>{MESSAGE_TITLE}</h2>
-	<p>{MESSAGE_TEXT}</p>
-
-	<!-- IF S_SOFTDELETED and S_TOPIC_MODE and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-		<p>{L_TOPIC_ALREADY_SOFTDELETED}</p>
-	<!-- ELSEIF S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-		<p>{L_POST_ALREADY_SOFTDELETED}</p>
-	<!-- ENDIF -->
-
-	<!-- IF not S_SOFTDELETED and (S_DELETE_REASON or (S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE)) -->
-	<fieldset class="fields1">
-		<!-- IF S_TOPIC_MODE and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-			<dl>
-				<dt><label for="soft_delete">{L_DELETE_TOPIC_SOFT}:</label></dt>
-				<dd><label for="soft_delete"><input id="soft_delete" name="soft_delete" type="checkbox" checked="checked" value="1" /> {L_DELETE_TOPIC_SOFT_EXP}</label></dd>
-			</dl>
-		<!-- ELSEIF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-			<dl>
-				<dt><label for="soft_delete">{L_DELETE_POST_SOFT}:</label></dt>
-				<dd><label for="soft_delete"><input id="soft_delete" name="soft_delete" type="checkbox" checked="checked" value="1" /> {L_DELETE_POST_SOFT_EXP}</label></dd>
-			</dl>
-		<!-- ENDIF -->
-
-		<!-- IF S_DELETE_REASON -->
-			<dl>
-				<dt><label for="delete_reason">{L_DELETE_POST_REASON}:</label></dt>
-				<dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd>
-			</dl>
-		<!-- ENDIF -->
-	</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="submit" name="confirm" value="{L_YES}" class="button1" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-	</fieldset>
-
-	</div>
-</div>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1