From 4aaf4d34d0a030c10812c2a3dcbd53d9a4e8dd87 Mon Sep 17 00:00:00 2001
From: Matthew Harris <rtpharry@hotmail.com>
Date: Thu, 17 Sep 2015 21:58:12 +0100
Subject: [PATCH] amends based on PR feedback

---
 .../Views/Admin/EditPlacement.cshtml                   |  2 +-
 src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js       | 10 ++++++----
 src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml    |  1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
index 2cb794126..e9b798834 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
@@ -43,7 +43,7 @@
     
     <fieldset class="action">
         <button class="primaryAction" type="submit" name="submit.Save" value="Save">@T("Save")</button>
-        <button class="primaryAction" type="submit" name="submit.Restore" value="Restore" itemprop="RestorePlacements">@T("Restore")</button>
+        <button class="primaryAction" type="submit" name="submit.Restore" value="Restore" itemprop="RemoveUrl" data-message="@T("Are you sure you want to restore these placements?")">@T("Restore")</button>
     </fieldset>
 
 }
diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
index 80880b7de..12a7ee408 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
+++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
@@ -68,13 +68,15 @@
             return false;
         }
 
+    	// use a custom message if its set in data-message
+        var dataMessage = $(this).data('message');
+        if (dataMessage !== undefined) {
+        	confirmRemoveMessage = dataMessage;
+        }
+
         return confirm(confirmRemoveMessage);
     });
 
-    $("body").on("click", "[itemprop~='RestorePlacements']", function () {
-    	return confirm(confirmRestorePlacementMessage);
-    });    
-
     $(".check-all").change(function () {
         $(this).parents("table.items").find(":checkbox:not(:disabled)").prop('checked', $(this).prop("checked"));
     });
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
index d4b2fb61c..dffd08c00 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
@@ -98,7 +98,6 @@
 <script type="text/javascript">
 //<![CDATA[
 	var confirmRemoveMessage = '@T("Are you sure you want to remove this element?")';
-	var confirmRestorePlacementMessage = '@T("Are you sure you want to restore these placements?")';
 //]]>
 </script>
 }
\ No newline at end of file