From 4fb3c51dff852c4926b820d2a8786cc6547687cb Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 15 Jul 2010 16:06:40 -0700 Subject: [PATCH] Getting the comment count on the content list view in the admin and blog posts to use more of the generic content templating - + blog posts get translation functionality --HG-- branch : dev --- .../Common/Extensions/HtmlHelperExtensions.cs | 24 ++++++++ .../Parts/Common.Metadata.ascx | 7 ++- .../Core/Contents/Handlers/ContentsHandler.cs | 9 ++- .../Items/Contents.Item.SummaryAdmin.ascx | 3 +- .../DisplayTemplates/Items/Contents.Item.ascx | 11 +--- src/Orchard.Web/Core/Orchard.Core.csproj | 1 + .../Controllers/BlogAdminController.cs | 2 +- .../Orchard.Blogs/Drivers/BlogPostDriver.cs | 6 -- .../Extensions/HtmlHelperExtensions.cs | 26 --------- .../Orchard.Blogs/Handlers/BlogPostHandler.cs | 4 +- .../Orchard.Blogs/Orchard.Blogs.csproj | 5 -- .../Modules/Orchard.Blogs/Routes.cs | 4 +- .../Items/Blogs.BlogPost.Summary.ascx | 6 +- .../Items/Blogs.BlogPost.SummaryAdmin.ascx | 58 ------------------- .../Blogs.BlogPost.Metadata.Summary.ascx | 6 -- .../Blogs.BlogPost.Metadata.SummaryAdmin.ascx | 2 - .../Parts/Blogs.BlogPost.Metadata.ascx | 8 --- .../Orchard.Setup/Services/SetupService.cs | 2 - .../Items/Blogs.BlogPost.Summary.ascx | 1 + .../Parts/Blogs.BlogPost.Metadata.ascx | 3 +- .../Items/Blogs.BlogPost.Summary.ascx | 1 + .../Parts/Blogs.BlogPost.Metadata.ascx | 3 +- .../Items/Blogs.BlogPost.Summary.ascx | 1 + .../Parts/Blogs.BlogPost.Metadata.ascx | 3 +- .../ContentManagement/ContentItemMetadata.cs | 9 +++ 25 files changed, 72 insertions(+), 133 deletions(-) create mode 100644 src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.Summary.ascx delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.SummaryAdmin.ascx delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx diff --git a/src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs b/src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs new file mode 100644 index 000000000..c1a7f52e6 --- /dev/null +++ b/src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs @@ -0,0 +1,24 @@ +using System.Web.Mvc; +using Orchard.Core.Common.ViewModels; +using Orchard.Localization; +using Orchard.Mvc.Html; + +namespace Orchard.Core.Common.Extensions { + public static class HtmlHelperExtensions { + public static LocalizedString PublishedStateForModel(this HtmlHelper htmlHelper, Localizer T) { + return htmlHelper.PublishedState(htmlHelper.ViewData.Model, T); + } + + public static LocalizedString PublishedState(this HtmlHelper htmlHelper, CommonMetadataViewModel metadata, Localizer T) { + return htmlHelper.DateTime(metadata.VersionPublishedUtc, T("Draft")); + } + + public static LocalizedString PublishedWhenForModel(this HtmlHelper htmlHelper, Localizer T) { + return htmlHelper.PublishedWhen(htmlHelper.ViewData.Model, T); + } + + public static LocalizedString PublishedWhen(this HtmlHelper htmlHelper, CommonMetadataViewModel metadata, Localizer T) { + return htmlHelper.DateTimeRelative(metadata.VersionPublishedUtc, T("as a Draft"), T); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.ascx index fa88ac16c..97e5aecba 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.ascx +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.ascx @@ -1,4 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Core.Common.Extensions" %><% +if (Model.Creator != null) { %>
-
<%: T("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)").ToString())%>
-
\ No newline at end of file +
<%: T("Published by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T))%>
+<% +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Handlers/ContentsHandler.cs b/src/Orchard.Web/Core/Contents/Handlers/ContentsHandler.cs index 00cc4d1e6..d4e05b9ce 100644 --- a/src/Orchard.Web/Core/Contents/Handlers/ContentsHandler.cs +++ b/src/Orchard.Web/Core/Contents/Handlers/ContentsHandler.cs @@ -27,6 +27,13 @@ namespace Orchard.Core.Contents.Handlers { {"Id", context.ContentItem.Id} }; } + if (context.Metadata.RemoveRouteValues == null) { + context.Metadata.RemoveRouteValues = new RouteValueDictionary { + {"Area", "Contents"}, + {"Controller", "Item"}, + {"Action", "Remove"} + }; + } } } -} +} \ No newline at end of file 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 8135c6f6f..fe17c0813 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 @@ -12,7 +12,8 @@ <%:Html.Hidden("id", Model.Item.Id, new { id = "" })%> <% } %> +
<% Html.Zone("meta"); %>
- <% Html.Zone("primary"); %> + <% Html.ZonesAny(); %> \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.ascx b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.ascx index 072cecebe..73dd3bf30 100644 --- a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.ascx +++ b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Items/Contents.Item.ascx @@ -1,11 +1,6 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels" %> -<%@ Import Namespace="Orchard.ContentManagement.Aspects" %> -<%@ Import Namespace="Orchard.ContentManagement" %> -<%var routable = Model.Item.As(); - if (routable != null && !string.IsNullOrEmpty(routable.Title)) {%> -

- <%:routable.Title%>

-<%} %> -<% Html.Zone("primary", ":manage :metadata"); +

<%:Html.ItemDisplayText(Model.Item)%>

+<% Html.Zone("metadata"); + Html.Zone("primary", ":manage :metadata"); Html.ZonesAny(); %> diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 7ec66f19b..0835aaf2c 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -65,6 +65,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs index d35aa02c0..922f4584a 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs @@ -111,7 +111,7 @@ namespace Orchard.Blogs.Controllers { } [HttpPost] - public ActionResult Delete(string blogSlug) { + public ActionResult Remove(string blogSlug) { if (!Services.Authorizer.Authorize(Permissions.ManageBlogs, T("Couldn't delete blog"))) return new HttpUnauthorizedResult(); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs index b2f8a5284..258217d7d 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs @@ -77,12 +77,6 @@ namespace Orchard.Blogs.Drivers { }; } - protected override DriverResult Display(BlogPost post, string displayType) { - return Combined( - ContentItemTemplate("Items/Blogs.BlogPost").LongestMatch(displayType, "Summary", "SummaryAdmin"), - ContentPartTemplate(post, "Parts/Blogs.BlogPost.Metadata").LongestMatch(displayType, "Summary", "SummaryAdmin").Location("meta", "1")); - } - protected override DriverResult Editor(BlogPost post) { return ContentItemTemplate("Items/Blogs.BlogPost"); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs deleted file mode 100644 index 7560d079f..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Web.Mvc; -using Orchard.Blogs.Models; -using Orchard.ContentManagement; -using Orchard.ContentManagement.Aspects; -using Orchard.Localization; -using Orchard.Mvc.Html; - -namespace Orchard.Blogs.Extensions { - public static class HtmlHelperExtensions { - public static LocalizedString PublishedState(this HtmlHelper htmlHelper, Localizer T) { - return htmlHelper.PublishedState(htmlHelper.ViewData.Model, T); - } - - public static LocalizedString PublishedState(this HtmlHelper htmlHelper, BlogPost blogPost, Localizer T) { - return htmlHelper.DateTime(blogPost.As().VersionPublishedUtc, T("Draft")); - } - - public static LocalizedString PublishedWhen(this HtmlHelper htmlHelper, Localizer T) { - return htmlHelper.PublishedWhen(htmlHelper.ViewData.Model, T); - } - - public static LocalizedString PublishedWhen(this HtmlHelper htmlHelper, BlogPost blogPost, Localizer T) { - return htmlHelper.DateTimeRelative(blogPost.As().VersionPublishedUtc, T("as a Draft"), T); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostHandler.cs index aba843b4f..967d6f2f5 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostHandler.cs @@ -46,7 +46,9 @@ namespace Orchard.Blogs.Handlers { return; } - var containerId = requestContext.HttpContext.Request.Form["containerId"]; + //todo: don't get at the container form data directly. right now the container is set in the common driver editor (updater) + //todo: which is too late for what's needed (currently) in this handler + var containerId = requestContext.HttpContext.Request.Form["CommonAspect.containerId"]; if (!string.IsNullOrEmpty(containerId)) { int cId; if (int.TryParse(containerId, out cId)) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index 20d23e89c..53571cbfc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -74,7 +74,6 @@ - @@ -136,16 +135,12 @@ - - - - diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Routes.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Routes.cs index ba3298310..8f6a00370 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Routes.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Routes.cs @@ -51,11 +51,11 @@ namespace Orchard.Blogs { }, new RouteDescriptor { Route = new Route( - "Admin/Blogs/{blogSlug}/Delete", + "Admin/Blogs/{blogSlug}/Remove", new RouteValueDictionary { {"area", "Orchard.Blogs"}, {"controller", "BlogAdmin"}, - {"action", "Delete"} + {"action", "Remove"} }, new RouteValueDictionary { {"blogSlug", _blogSlugConstraint} diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx index 7b2b4fd46..633becc04 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -2,6 +2,10 @@ <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Core.Common.Extensions" %> +<%@ Import Namespace="Orchard.Core.Common.Models" %> +<%@ Import Namespace="Orchard.ContentManagement" %> +<%@ Import Namespace="Orchard.Core.Common.ViewModels" %>

<%: Html.Link(Model.Item.Title, Url.BlogPost(Model.Item)) %>

-
<%: Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%>
+
<%: Html.PublishedState(new CommonMetadataViewModel(Model.Item.As()), T) %> | <%Html.Zone("meta");%>
<% Html.Zone("primary", ":manage :metadata");%>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx deleted file mode 100644 index 8646de578..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx +++ /dev/null @@ -1,58 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<%@ Import Namespace="Orchard.ContentManagement.Aspects"%> -<%@ Import Namespace="Orchard.ContentManagement"%> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> -
-
-

<%: Html.Link(Model.Item.Title, Url.BlogPostEdit(Model.Item))%>

-
    -
  • <% - if (Model.Item.HasPublished) { %> - " alt="<%: T("Online") %>" title="<%: T("The page is currently online") %>" /> <%: T("Published")%><% - } - else { %> - " alt="<%: T("Offline") %>" title="<%: T("The page is currently offline") %>" /> <%: T("Not Published")%><% - } %> |  -
    • -
  • <% - if (Model.Item.HasDraft) { %> - " alt="<%: T("Draft") %>" title="<%: T("The post has a draft") %>" /><%: Html.PublishedState(Model.Item, T) %><% - } - else { %> - <%: T("No draft")%><% - } %> |  -
    • -
  • <% - if (Model.Item.ScheduledPublishUtc.HasValue && Model.Item.ScheduledPublishUtc.Value > DateTime.UtcNow) { %> - " alt="<%: T("Scheduled") %>" title="<%: T("The post is scheduled for publishing") %>" /><%: T("Scheduled")%> - <%: Html.DateTime(Model.Item.ScheduledPublishUtc.Value, T("M/d/yyyy h:mm tt"))%><% - } - else if (Model.Item.IsPublished) { %> - <%: T("Published: {0}", Html.DateTimeRelative(Model.Item.As().VersionPublishedUtc.Value, T)) %><% - } - else { %> - <%: T("Last modified: {0}", Html.DateTimeRelative(Model.Item.As().ModifiedUtc.Value, T)) %><% - } %> |  -
    • -
  • <%: T("By {0}", Model.Item.Creator.UserName)%>
    • -
-
-
<% - if (Model.Item.HasPublished){ %> - "><%: T("View")%><%: T(" | ")%><% - if (Model.Item.HasDraft) { %> - "><%: T("Publish Draft")%><%: T(" | ")%><% - } %> - "><%: T("Unpublish")%><%: T(" | ")%><% - } - else { %> - "><%: T("Publish")%><%: T(" | ")%><% - } %> - "><%: T("Edit")%><%: T(" | ")%> - "><%: T("Remove")%> -
<%Html.Zone("meta");%> -
-
-
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.Summary.ascx deleted file mode 100644 index 402274d10..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.Summary.ascx +++ /dev/null @@ -1,6 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%><% -if (Model.Creator != null) { - %><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %> | <% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.SummaryAdmin.ascx deleted file mode 100644 index 8d8566ea2..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.SummaryAdmin.ascx +++ /dev/null @@ -1,2 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Blogs.Models"%> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx deleted file mode 100644 index a54802281..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ /dev/null @@ -1,8 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%> -
<% - if (Model.Creator != null) { - %>
<%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %>
<% - } %> -
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 3e21961c1..439212369 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -24,7 +24,6 @@ using Orchard.Reports.Services; using Orchard.Security; using Orchard.Settings; using Orchard.Themes; -using Orchard.UI.Notify; using Orchard.Environment.State; using Orchard.Data.Migration; @@ -39,7 +38,6 @@ namespace Orchard.Setup.Services { public SetupService( ShellSettings shellSettings, - INotifier notifier, IOrchardHost orchardHost, IShellSettingsManager shellSettingsManager, IShellContainerFactory shellContainerFactory, diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx index dc79bf381..a832b5cfa 100644 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -2,6 +2,7 @@ <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Core.Common.Extensions" %> <%Model.Zones.AddRenderPartial("zonetest", "ZoneTest", Model); %>

<%: Html.Link(Model.Item.Title, Url.BlogPost(Model.Item)) %>

<%: Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%>
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx index e91472533..318e59b08 100644 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx @@ -1,6 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%><% +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Core.Common.Extensions" %><% if (Model.Creator != null) { %><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %><% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx index dc79bf381..a832b5cfa 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -2,6 +2,7 @@ <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Core.Common.Extensions" %> <%Model.Zones.AddRenderPartial("zonetest", "ZoneTest", Model); %>

<%: Html.Link(Model.Item.Title, Url.BlogPost(Model.Item)) %>

<%: Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%>
diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx index e91472533..318e59b08 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx @@ -1,6 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%><% +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Core.Common.Extensions" %><% if (Model.Creator != null) { %><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %><% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx index 8639c255b..eb633a89c 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -2,6 +2,7 @@ <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Core.Common.Extensions" %>

<%: Html.Link(Model.Item.Title, Url.BlogPost(Model.Item)) %>

<%: Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%>
diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx index e91472533..318e59b08 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx @@ -1,6 +1,7 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.Models"%><% +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Core.Common.Extensions" %><% if (Model.Creator != null) { %><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %><% } %> \ No newline at end of file diff --git a/src/Orchard/ContentManagement/ContentItemMetadata.cs b/src/Orchard/ContentManagement/ContentItemMetadata.cs index a3ce46e26..f4c6dbf78 100644 --- a/src/Orchard/ContentManagement/ContentItemMetadata.cs +++ b/src/Orchard/ContentManagement/ContentItemMetadata.cs @@ -13,6 +13,7 @@ namespace Orchard.ContentManagement { public RouteValueDictionary DisplayRouteValues { get; set; } public RouteValueDictionary EditorRouteValues { get; set; } public RouteValueDictionary CreateRouteValues { get; set; } + public RouteValueDictionary RemoveRouteValues { get; set; } public IEnumerable DisplayGroups { get; set; } public IEnumerable EditorGroups { get; set; } @@ -43,5 +44,13 @@ namespace Orchard.ContentManagement { {"id", item.ContentItem.ContentType} }; } + + private static RouteValueDictionary GetRemoveRouteValues(IContent item) { + return new RouteValueDictionary { + {"Area", "Contents"}, + {"Controller", "Admin"}, + {"Action", "Remove"} + }; + } } } \ No newline at end of file