From f8053de81e18971de68a9d44a450f897afda039f Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Mon, 18 Oct 2010 01:28:39 -0700 Subject: [PATCH] More template work and getting the Blogs module's display in pretty good shape --HG-- branch : dev --- .../Common/Extensions/HtmlHelperExtensions.cs | 14 ++--------- src/Orchard.Web/Core/Common/Placement.info | 15 +++++++++--- .../Parts/Common.Metadata.Summary.cshtml | 2 ++ .../Common/Views/Parts/Common.Metadata.cshtml | 8 ++----- .../Contents/Views/Items/Content.Edit.cshtml | 2 +- .../Views/Items/Content.Editor.cshtml | 11 --------- .../Views/Items/Content.Summary.cshtml | 3 --- .../Core/Contents/Views/Items/Content.cshtml | 23 +++++++++++++++---- src/Orchard.Web/Core/Orchard.Core.csproj | 4 ++-- .../Core/PublishLater/Placement.info | 18 +++++++-------- .../Core/Routable/Drivers/RoutePartDriver.cs | 2 +- .../Routable/Views/Parts/RoutableTitle.cshtml | 2 +- .../Controllers/BlogController.cs | 3 +-- .../Drivers/BlogArchivesPartDriver.cs | 7 +++--- .../Orchard.Blogs/Drivers/BlogPartDriver.cs | 3 ++- .../Drivers/RecentBlogPostsPartDriver.cs | 7 +++--- .../Orchard.Blogs/Orchard.Blogs.csproj | 7 ++---- .../Modules/Orchard.Blogs/Placement.info | 7 +++++- .../Orchard.Blogs/Views/Blog/Item.cshtml | 3 +-- .../Orchard.Blogs/Views/BlogPost/Item.cshtml | 3 --- .../Views/Items/Content-Blog.Edit.cshtml | 7 ++++++ .../Views/Items/Content-Blog.Editor.cshtml | 6 ----- .../Views/Items/Content-Blog.Summary.cshtml | 10 -------- .../Views/Items/Content-Blog.cshtml | 3 --- .../Items/Content-BlogPost.Editor.cshtml | 2 +- .../Items/Content-BlogPost.Summary.cshtml | 8 ------- .../Views/Items/Content-BlogPost.cshtml | 11 --------- .../Parts/Blogs.Blog.BlogPostCount.cshtml | 1 + .../Views/DumpShapeTable.cshtml | 10 ++------ .../Utility/Extensions/StringExtensions.cs | 2 ++ 30 files changed, 81 insertions(+), 123 deletions(-) create mode 100644 src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.Summary.cshtml delete mode 100644 src/Orchard.Web/Core/Contents/Views/Items/Content.Editor.cshtml delete mode 100644 src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Editor.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Summary.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Summary.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.cshtml create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml diff --git a/src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs b/src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs index 4deaccb9f..3961b92a3 100644 --- a/src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs +++ b/src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs @@ -1,23 +1,13 @@ using System; 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, DateTime? versionPublishedUtc, Localizer T) { + return htmlHelper.DateTime(versionPublishedUtc, T("Draft")); } - - 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.VersionPublishedUtc, T); - } - public static LocalizedString PublishedWhen(this HtmlHelper htmlHelper, DateTime? versionPublishedUtc, Localizer T) { return htmlHelper.DateTimeRelative(versionPublishedUtc, T("as a Draft"), T); } diff --git a/src/Orchard.Web/Core/Common/Placement.info b/src/Orchard.Web/Core/Common/Placement.info index 08f8a7883..fa102159f 100644 --- a/src/Orchard.Web/Core/Common/Placement.info +++ b/src/Orchard.Web/Core/Common/Placement.info @@ -1,8 +1,14 @@  - - - + + + + + @@ -10,6 +16,9 @@ + + + diff --git a/src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.Summary.cshtml b/src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.Summary.cshtml new file mode 100644 index 000000000..e5ca1cad4 --- /dev/null +++ b/src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.Summary.cshtml @@ -0,0 +1,2 @@ +@using Orchard.Core.Common.Extensions; +
@Html.PublishedState((DateTime?)Model.ContentPart.VersionPublishedUtc, T)
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.cshtml b/src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.cshtml index fa8036d7e..e5ca1cad4 100644 --- a/src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.cshtml +++ b/src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.cshtml @@ -1,6 +1,2 @@ -@model Orchard.Core.Common.ViewModels.CommonMetadataViewModel -@using Orchard.Core.Common.Extensions; -@if (Model.Creator != null) { -
-
@T("Published by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T))
-
} \ No newline at end of file +@using Orchard.Core.Common.Extensions; +
@Html.PublishedState((DateTime?)Model.ContentPart.VersionPublishedUtc, T)
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml index 170021de6..b6351b3cc 100644 --- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml @@ -5,7 +5,7 @@
@Display(Model.Secondary)
- +
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.Editor.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.Editor.cshtml deleted file mode 100644 index 170021de6..000000000 --- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Editor.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -
-
- @Display(Model.Primary) -
-
- @Display(Model.Secondary) -
- -
-
-
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml deleted file mode 100644 index 252acbcf1..000000000 --- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -content item -> @Model.ContentItem.ContentType - -@Display(Model.Primary) diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml index 46e4e50b9..d2a451e87 100644 --- a/src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml @@ -1,8 +1,21 @@ -
+@using Orchard.Utility.Extensions; +@{ + Layout.Title = Model.Title; + var contentTypeClassName = ((string)Model.ContentItem.ContentType).HtmlClassify(); +} +
-@Display(Model.Header) + @Display(Model.Header) + @if (Model.Meta != null) { +
+ @Display(Model.Meta) +
+ }
-
-@Display(Model.Content) -
+ @Display(Model.Content) + @if(Model.Footer != null) { +
+ @Display(Model.Footer) +
+ }
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index d4b16b48f..3092e978b 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -377,8 +377,6 @@ - - @@ -389,11 +387,13 @@ + + diff --git a/src/Orchard.Web/Core/PublishLater/Placement.info b/src/Orchard.Web/Core/PublishLater/Placement.info index e7e177112..98d424a6e 100644 --- a/src/Orchard.Web/Core/PublishLater/Placement.info +++ b/src/Orchard.Web/Core/PublishLater/Placement.info @@ -1,14 +1,14 @@  - - - + + + + - - - - - - + diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs index 4827bb8c9..4d7940b50 100644 --- a/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs +++ b/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs @@ -45,7 +45,7 @@ namespace Orchard.Core.Routable.Drivers { } protected override DriverResult Display(RoutePart part, string displayType, dynamic shapeHelper) { - return ContentShape("Parts_RoutableTitle", "Header:5", () => shapeHelper.Parts_RoutableTitle(ContentPart: part, Title: part.Title)); + return ContentShape("Parts_RoutableTitle", "Header:5", () => shapeHelper.Parts_RoutableTitle(ContentPart: part, Title: part.Title, Path: part.Path)); } protected override DriverResult Editor(RoutePart part, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle.cshtml b/src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle.cshtml index 6024082e2..925e62123 100644 --- a/src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle.cshtml +++ b/src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle.cshtml @@ -1 +1 @@ -

@Model.Title

\ No newline at end of file +

@Model.Title

\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs index bddfb7a1f..f97bdab92 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs @@ -76,10 +76,9 @@ namespace Orchard.Blogs.Controllers { var list = Shape.List(); list.AddRange(blogPosts); - blog.ContentItem = blogPart; blog.Content.Add(Shape.Parts_Blogs_BlogPost_List(ContentItems: list), "5"); - return View("Display", blog); + return View(blog); } public ActionResult LiveWriterManifest(string blogSlug) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs index 4bc0982fb..ab6498812 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs @@ -2,7 +2,6 @@ using Orchard.Blogs.Services; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; -using Orchard.Core.ContentsLocation.Models; namespace Orchard.Blogs.Drivers { public class BlogArchivesPartDriver : ContentPartDriver { @@ -24,13 +23,13 @@ namespace Orchard.Blogs.Drivers { if (blog == null) return null; - return shapeHelper.Parts_Blogs_BlogArchives(ContentItem: part, Blog: blog, Archives: _blogPostService.GetArchives(blog)); + return shapeHelper.Parts_Blogs_BlogArchives(ContentItem: part.ContentItem, Blog: blog, Archives: _blogPostService.GetArchives(blog)); }).Location("Content"); } protected override DriverResult Editor(BlogArchivesPart part, dynamic shapeHelper) { - var location = part.GetLocation("Editor", "Primary", "5"); - return ContentPartTemplate(part, "Parts/Blogs.BlogArchives").Location(location); + return ContentShape("Parts_Blogs_BlogArchives_Editor", + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.BlogArchives", Model: part, Prefix: Prefix)); } protected override DriverResult Editor(BlogArchivesPart part, IUpdateModel updater, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs index 2310d02b3..8c7bbe885 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs @@ -6,7 +6,6 @@ using Orchard.Blogs.Services; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; using Orchard.Core.Feeds; -using Orchard.DisplayManagement; using Orchard.Localization; namespace Orchard.Blogs.Drivers { @@ -41,6 +40,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_BlogPostCount", + () => shapeHelper.Parts_Blogs_Blog_BlogPostCount(ContentPart: part, PostCount: part.PostCount)), // todo: (heskew) implement a paging solution that doesn't require blog posts to be tied to the blog within the controller ContentShape("Parts_Blogs_BlogPost_List", () => { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs index ac7ec0313..319ccde9e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs @@ -5,7 +5,6 @@ using Orchard.Blogs.Services; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; using Orchard.Core.Common.Models; -using Orchard.Core.ContentsLocation.Models; namespace Orchard.Blogs.Drivers { public class RecentBlogPostsPartDriver : ContentPartDriver { @@ -44,12 +43,12 @@ namespace Orchard.Blogs.Drivers { var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, ContentItems: list); - return ContentShape(shapeHelper.Parts_Blogs_RecentBlogPosts(ContentItem: part, ContentItems: blogPostList)); + return ContentShape(shapeHelper.Parts_Blogs_RecentBlogPosts(ContentItem: part.ContentItem, ContentItems: blogPostList)); } protected override DriverResult Editor(RecentBlogPostsPart part, dynamic shapeHelper) { - var location = part.GetLocation("Editor", "Primary", "5"); - return ContentPartTemplate(part, "Parts/Blogs.RecentBlogPosts").Location(location); + return ContentShape("Parts_Blogs_RecentBlogPosts_Editor", + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.RecentBlogPosts", Model: part, Prefix: Prefix)); } protected override DriverResult Editor(RecentBlogPostsPart part, IUpdateModel updater, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index b0d46eae4..2d593f17b 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -137,10 +137,6 @@ Code - - - - @@ -165,12 +161,13 @@ - + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info index 107de8e35..53d21e5ac 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info @@ -3,6 +3,7 @@ + + + @@ -25,7 +29,8 @@ Parts_Blogs_Blog_Description="Manage:after"/> - + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml index 6057ccc62..631e9eb0f 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml @@ -1,2 +1 @@ -@Display(Model.Meta) -@Display(Model.Content) \ No newline at end of file +@Display(Model) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/Item.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/Item.cshtml index 86e9c225f..631e9eb0f 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/Item.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/Item.cshtml @@ -1,4 +1 @@ -@{ - Html.AddTitleParts((string)Model.Title); -} @Display(Model) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml new file mode 100644 index 000000000..b18f344b7 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml @@ -0,0 +1,7 @@ +@using Orchard.Mvc.Html; +@{ + Html.AddTitleParts((string)Model.Title); +} +@Display(Model.Primary) +@Display(Model.Secondary) +
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Editor.cshtml deleted file mode 100644 index ca46e8462..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Editor.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@using Orchard.Mvc.Html; -@{ - Html.AddTitleParts((string)Model.Title); -} -@Display(Model.Primary) -
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Summary.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Summary.cshtml deleted file mode 100644 index f0d60c326..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Summary.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -@using Orchard.Blogs.Extensions; -@using Orchard.Blogs.Models; -

@Html.Link((string)Model.Title, Url.Blog((string)Model.Slug))

-
- @T.Plural("1 post", "{0} posts", (int)Model.PostCount) - @if (Model.Meta != null) { - @T(" | ")@Display(Model.Meta) - } -
-@Display(Model.Content) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.cshtml deleted file mode 100644 index f1709ff14..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -

@Html.TitleForPage((string)Model.Title)

-@Display(Model.Meta) -@Display(Model.Content) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml index cd956410b..fe43401f1 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml @@ -10,7 +10,7 @@
@Display(Model.Secondary)
- + @* TODO: (erikpo) In the future, remove the HasPublished check so the user can delete the content item from here if the choose to *@ @if (blogPost.HasDraft && blogPost.HasPublished) { @Html.AntiForgeryTokenValueOrchardLink(T("Discard Draft").ToString(), Url.Action("DiscardDraft", new {Area = "Orchard.Blogs", Controller = "BlogPostAdmin", id = Model.Item.Id}), new {@class = "button"}) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Summary.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Summary.cshtml deleted file mode 100644 index 54e1e52e6..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Summary.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@using Orchard.Blogs.Extensions; -@using Orchard.Blogs.Models; -@using Orchard.Core.Common.Extensions; -@using Orchard.Core.Common.Models; -@using Orchard.Core.Common.ViewModels; -

@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))

-
@Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T) | @Display(Model.Meta)
-
@Display(Model.Content)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.cshtml deleted file mode 100644 index d325507ec..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -
-
- @Display(Model.Header) -

- @Display(Model.Meta) -

-
-
- @Display(Model.Content) -
-
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml new file mode 100644 index 000000000..1141d99b9 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml @@ -0,0 +1 @@ +
@T.Plural("1 post", "{0} posts", (int)Model.PostCount)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml index e3b0999e7..aea6c14ec 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml @@ -6,14 +6,8 @@ var shapeTable = workContext.Resolve().GetShapeTable(workContext.CurrentTheme.ThemeName); diff --git a/src/Orchard/Utility/Extensions/StringExtensions.cs b/src/Orchard/Utility/Extensions/StringExtensions.cs index 062c61f75..c44cecb61 100644 --- a/src/Orchard/Utility/Extensions/StringExtensions.cs +++ b/src/Orchard/Utility/Extensions/StringExtensions.cs @@ -29,6 +29,8 @@ namespace Orchard.Utility.Extensions { } public static string HtmlClassify(this string text) { + if (string.IsNullOrWhiteSpace(text)) + return text; var friendlier = text.CamelFriendly(); return Regex.Replace(friendlier, @"[^a-zA-Z]+", m => m.Index == 0 ? "" : "-").ToLowerInvariant(); }