From 614ca64971ef7955507db5882b1a839e5ec5588b Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 22 Jul 2010 10:08:07 -0700
Subject: [PATCH] Fixed the "Remove" link on the content item summary admin
 template when it's being used outside of the contents module

--HG--
branch : dev
---
 .../DisplayTemplates/Items/Contents.Item.SummaryAdmin.ascx     | 3 ++-
 src/Orchard.Web/Themes/TheAdmin/Styles/site.css                | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.SummaryAdmin.ascx b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.SummaryAdmin.ascx
index 4a3c13b91..a58efc754 100644
--- a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.SummaryAdmin.ascx
+++ b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.SummaryAdmin.ascx
@@ -1,5 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels" %>
+<%@ Import Namespace="Orchard.Utility.Extensions" %>
     <div class="summary" itemscope="itemscope" itemid="<%:Model.Item.Id %>" itemtype="http://orchardproject.net/data/ContentItem">
         <div class="properties">
             <input type="checkbox" value="<%:Model.Item.Id %>" name="itemIds"/>
@@ -9,7 +10,7 @@
         <div class="related"><%
             Html.Zone("secondary"); %>
             <%:Html.ItemEditLink(T("Edit").Text, Model.Item) %><%:T(" | ") %>
-            <%:Html.Link(T("Remove").Text, Url.Action("Remove", new { area = "Contents", id = Model.Item.Id }), new { itemprop = "RemoveUrl UnsafeUrl" }) %>
+            <%:Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = Model.Item.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString() }), new { itemprop = "RemoveUrl UnsafeUrl" }) %>
             <br /><% Html.Zone("meta"); %>
         </div>
         <div class="primary"><% Html.ZonesAny(); %></div>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 8b3fe7d8b..f922cc12c 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -350,6 +350,9 @@ form.link button:hover {
 	margin:10px 0 4px 0;
     padding:4px;
 }
+div.message {
+    clear:both;
+}
 span.message {
     display:block;
 	margin:4px 0 4px 4px;