From c158caba4919994df37b257a3e063758ea7f96e6 Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Fri, 4 Mar 2011 14:37:44 -0800
Subject: [PATCH] - Added 'AdminLink' concept to content item metadata, allows
 content types to determine where clicking their items from admin should go.
 Defaults to Edit. - Changed Blogs to use AdminLink, no longer needs to
 overwrite the entire SummaryAdmin view. - This will also aid the potential
 future AdminMenuPart for blogs and lists as it can link to the list details
 instead of their edit properties.

--HG--
branch : dev
---
 .../Views/Content.SummaryAdmin.cshtml         |  2 +-
 .../Orchard.Blogs/Drivers/BlogPartDriver.cs   |  2 ++
 .../Orchard.Blogs/Handlers/BlogPartHandler.cs |  6 ++++
 .../Orchard.Blogs/Orchard.Blogs.csproj        |  4 ++-
 .../Modules/Orchard.Blogs/Placement.info      |  3 +-
 .../Views/Content-Blog.SummaryAdmin.cshtml    | 32 -------------------
 .../Parts.Blogs.Blog.SummaryAdmin.cshtml      | 10 ++++++
 .../ContentManagement/ContentItemMetadata.cs  |  6 ++++
 src/Orchard/Mvc/Html/ContentItemExtensions.cs | 19 +++++++++++
 9 files changed, 49 insertions(+), 35 deletions(-)
 delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml
 create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.SummaryAdmin.cshtml

diff --git a/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml
index ed4c16944..9e9e42930 100644
--- a/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml
@@ -7,7 +7,7 @@
 <div class="summary" itemscope="itemscope" itemid="@contentItem.Id" itemtype="http://orchardproject.net/data/ContentItem">
     <div class="properties">
         <input type="checkbox" value="@contentItem.Id" name="itemIds"/>
-        <h3>@Html.ItemEditLink(contentItem)</h3>
+        <h3>@Html.ItemAdminLink(contentItem)</h3>
         @if (Model.Header != null) {
         <div class="header">@Display(Model.Header)</div>
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
index dfff9e6b3..46fa7e3f9 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
@@ -12,6 +12,8 @@ namespace Orchard.Blogs.Drivers {
                              () => shapeHelper.Parts_Blogs_Blog_Manage(ContentPart: part)),
                 ContentShape("Parts_Blogs_Blog_Description",
                              () => shapeHelper.Parts_Blogs_Blog_Description(ContentPart: part, Description: part.Description)),
+                ContentShape("Parts_Blogs_Blog_SummaryAdmin",
+                             () => shapeHelper.Parts_Blogs_Blog_SummaryAdmin(ContentPart: part, ContentItem: part.ContentItem)),
                 ContentShape("Parts_Blogs_Blog_BlogPostCount",
                              () => shapeHelper.Parts_Blogs_Blog_BlogPostCount(ContentPart: part, PostCount: part.PostCount))
                 );
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs
index c42d1eae6..133f46880 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs
@@ -77,6 +77,12 @@ namespace Orchard.Blogs.Handlers {
                 {"Action", "Remove"},
                 {"blogId", context.ContentItem.Id}
             };
+            context.Metadata.AdminRouteValues = new RouteValueDictionary {
+                {"Area", "Orchard.Blogs"},
+                {"Controller", "BlogAdmin"},
+                {"Action", "Item"},
+                {"blogId", context.ContentItem.Id}
+            };
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index da7db577b..f0bba2831 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -125,7 +125,6 @@
     <Content Include="Views\Parts.Blogs.BlogPost.ListAdmin.cshtml">
       <SubType>Code</SubType>
     </Content>
-    <Content Include="Views\Content-Blog.SummaryAdmin.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
@@ -164,6 +163,9 @@
   <ItemGroup>
     <Content Include="web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Parts.Blogs.Blog.SummaryAdmin.cshtml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info
index 7d9b458d6..03f23a55c 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info
@@ -35,7 +35,8 @@
                    Parts_Blogs_Blog_BlogPostCount="Meta:3"/>
         </Match>
         <Match DisplayType="SummaryAdmin">
-            <Place Parts_Blogs_Blog_Description="Content:before"/>
+          <Place Parts_Blogs_Blog_SummaryAdmin="Actions:10"/>
+          <Place Parts_Blogs_Blog_Description="Content:before"/>
         </Match>
     </Match>
 </Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml
deleted file mode 100644
index 0a2d6e849..000000000
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml
+++ /dev/null
@@ -1,32 +0,0 @@
-@using Orchard.Blogs.Extensions;
-@using Orchard.Blogs.Models;
-@using Orchard.ContentManagement;
-@using Orchard.Utility.Extensions;
-@{
-    Script.Require("ShapesBase");
-    ContentItem contentItem = Model.ContentItem;
-    BlogPart blog = (BlogPart)contentItem.Get(typeof(BlogPart));
-    var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
-}
-<div class="summary" itemscope="itemscope" itemid="@contentItem.Id" itemtype="http://orchardproject.net/data/ContentItem">
-    <div class="properties">
-        <input type="checkbox" value="@contentItem.Id" name="itemIds"/>
-        <h3>@Html.Link((string)Model.Title, Url.BlogForAdmin((BlogPart)blog))</h3>
-        @if (Model.Header != null) {
-        <div class="header">@Display(Model.Header)</div>
-        }
-        @if (Model.Meta != null) {
-        <div class="metadata">@Display(Model.Meta)</div>
-        }
-    </div>
-    <div class="related">
-        @Display(Model.Actions)
-        <a href="@Url.BlogForAdmin(blog)" title="@T("List Posts")">@T("List Posts")</a>@T(" | ")
-        <a href="@Url.BlogPostCreate(blog)" title="@T("New Post")">@T("New Post")</a>@T(" | ")
-        <a href="@Url.BlogEdit(blog)" title="@T("Edit")">@T("Edit")</a>@T(" | ")
-        <a href="@Url.BlogRemove(blog)" title="@T("Remove")" itemprop="RemoveUrl UnsafeUrl">@T("Remove")</a>
-    </div>
-    @if (Model.Content != null) {
-    <div class="primary">@Display(Model.Content)</div>
-    }
-</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.SummaryAdmin.cshtml
new file mode 100644
index 000000000..67fd30c00
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.SummaryAdmin.cshtml
@@ -0,0 +1,10 @@
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
+@using Orchard.ContentManagement;
+@using Orchard.Utility.Extensions;
+@{
+    ContentItem contentItem = Model.ContentItem;
+    BlogPart blog = (BlogPart)contentItem.Get(typeof(BlogPart));
+}
+<a href="@Url.BlogForAdmin(blog)" title="@T("List Posts")">@T("List Posts")</a>@T(" | ")
+<a href="@Url.BlogPostCreate(blog)" title="@T("New Post")">@T("New Post")</a>@T(" | ")
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/ContentItemMetadata.cs b/src/Orchard/ContentManagement/ContentItemMetadata.cs
index 4f76d8c66..72484ab49 100644
--- a/src/Orchard/ContentManagement/ContentItemMetadata.cs
+++ b/src/Orchard/ContentManagement/ContentItemMetadata.cs
@@ -3,11 +3,17 @@ using System.Web.Routing;
 
 namespace Orchard.ContentManagement {
     public class ContentItemMetadata {
+        private RouteValueDictionary _adminRouteValues;
+
         public string DisplayText { get; set; }
         public RouteValueDictionary DisplayRouteValues { get; set; }
         public RouteValueDictionary EditorRouteValues { get; set; }
         public RouteValueDictionary CreateRouteValues { get; set; }
         public RouteValueDictionary RemoveRouteValues { get; set; }
+        public RouteValueDictionary AdminRouteValues {
+            get { return _adminRouteValues ?? EditorRouteValues; }
+            set { _adminRouteValues = value; }
+        }
         public readonly IList<GroupInfo> DisplayGroupInfo = new List<GroupInfo>();
         public readonly IList<GroupInfo> EditorGroupInfo = new List<GroupInfo>();
     }
diff --git a/src/Orchard/Mvc/Html/ContentItemExtensions.cs b/src/Orchard/Mvc/Html/ContentItemExtensions.cs
index 772d26682..124aebbf6 100644
--- a/src/Orchard/Mvc/Html/ContentItemExtensions.cs
+++ b/src/Orchard/Mvc/Html/ContentItemExtensions.cs
@@ -48,6 +48,25 @@ namespace Orchard.Mvc.Html {
                 metadata.EditorRouteValues.Merge(additionalRouteValues));
         }
 
+        public static MvcHtmlString ItemAdminLink(this HtmlHelper html, IContent content) {
+            return ItemEditLink(html, null, content);
+        }
+
+        public static MvcHtmlString ItemAdminLink(this HtmlHelper html, string linkText, IContent content) {
+            return html.ItemAdminLink(linkText, content, null);
+        }
+
+        public static MvcHtmlString ItemAdminLink(this HtmlHelper html, string linkText, IContent content, object additionalRouteValues) {
+            var metadata = content.ContentItem.ContentManager.GetItemMetadata(content);
+            if (metadata.AdminRouteValues == null)
+                return null;
+
+            return html.ActionLink(
+                NonNullOrEmpty(linkText, metadata.DisplayText, content.ContentItem.TypeDefinition.DisplayName),
+                Convert.ToString(metadata.AdminRouteValues["action"]),
+                metadata.AdminRouteValues.Merge(additionalRouteValues));
+        }
+
         public static string ItemDisplayUrl(this UrlHelper urlHelper, IContent content) {
             var metadata = content.ContentItem.ContentManager.GetItemMetadata(content);
             if (metadata.DisplayRouteValues == null)