From e9fabd26be190a06b612afed4a512b887d57029a Mon Sep 17 00:00:00 2001
From: Diana Corbacho <diana@rabbitmq.com>
Date: Fri, 30 Dec 2016 16:41:03 +0100
Subject: [PATCH 1/2] Separate dropdown panels for queue and purge

---
 deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs
index 23cad6584d..5506636902 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs
@@ -289,7 +289,7 @@
 <% } %>
 
 <div class="section-hidden">
-  <h2>Delete / purge</h2>
+  <h2>Delete</h2>
   <div class="hider">
     <form action="#/queues" method="delete" class="confirm inline-form">
       <input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
@@ -297,8 +297,13 @@
       <input type="hidden" name="mode" value="delete"/>
       <input type="submit" value="Delete" />
     </form>
+  </div>
+</div>
 
-    <form action="#/queues" method="delete" class="inline-form-right">
+<div class="section-hidden">
+  <h2>Purge</h2>
+  <div class="hider">
+    <form action="#/queues" method="delete" class="confirm inline-form">
       <input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
       <input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
       <input type="hidden" name="mode" value="purge"/>

From 4123cf32074e495a8b9bcc98191100c2ab8f46c1 Mon Sep 17 00:00:00 2001
From: Diana Corbacho <diana@rabbitmq.com>
Date: Fri, 30 Dec 2016 16:52:13 +0100
Subject: [PATCH 2/2] Make delete and purge confirmation messages more explicit

---
 deps/rabbitmq_management/priv/www/js/main.js        | 7 +++++++
 deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/deps/rabbitmq_management/priv/www/js/main.js b/deps/rabbitmq_management/priv/www/js/main.js
index d92b430919..517f072182 100644
--- a/deps/rabbitmq_management/priv/www/js/main.js
+++ b/deps/rabbitmq_management/priv/www/js/main.js
@@ -521,6 +521,13 @@ function show_popup(type, text, mode) {
 
 
 function postprocess() {
+    $('form.confirm-queue').submit(function() {
+        return confirm("Are you sure? The queue is going to be deleted. " +
+                       "Messages cannot be recovered after deletion.");
+        });
+    $('form.confirm-purge-queue').submit(function() {
+        return confirm("Are you sure? Messages cannot be recovered after purging.");
+        });
     $('form.confirm').submit(function() {
             return confirm("Are you sure? This object cannot be recovered " +
                            "after deletion.");
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs
index 5506636902..8e38a3deee 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs
@@ -291,7 +291,7 @@
 <div class="section-hidden">
   <h2>Delete</h2>
   <div class="hider">
-    <form action="#/queues" method="delete" class="confirm inline-form">
+    <form action="#/queues" method="delete" class="confirm-queue inline-form">
       <input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
       <input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
       <input type="hidden" name="mode" value="delete"/>
@@ -303,7 +303,7 @@
 <div class="section-hidden">
   <h2>Purge</h2>
   <div class="hider">
-    <form action="#/queues" method="delete" class="confirm inline-form">
+    <form action="#/queues" method="delete" class="confirm-purge-queue inline-form">
       <input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
       <input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
       <input type="hidden" name="mode" value="purge"/>