From dc5cc339a7a35f9c43970e49d97ac0a99c42e04e Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 14 Oct 2010 11:15:22 -0700 Subject: [PATCH 1/9] Getting Blogs onto the new UI composotion model --HG-- branch : dev --- .../BasicShapeTemplateHarvesterTests.cs | 5 +- src/Orchard.Web/Core/Common/Placement.info | 2 +- .../Views/Parts/Common.Body.Summary.cshtml | 2 +- .../Core/Contents/Drivers/ContentsDriver.cs | 2 +- src/Orchard.Web/Core/Contents/Placement.info | 4 +- src/Orchard.Web/Core/Contents/Shapes.cs | 6 ++ .../Drivers/LocalizationPartDriver.cs | 9 +-- .../Core/Localization/Placement.info | 7 +-- ...ization.ContentTranslations.Summary.cshtml | 18 +++++- ...on.ContentTranslations.SummaryAdmin.cshtml | 12 ---- src/Orchard.Web/Core/Orchard.Core.csproj | 1 - .../Views/Parts/PublishLater.Metadata.cshtml | 11 +++- .../Controllers/BlogAdminController.cs | 16 +++-- .../Controllers/BlogController.cs | 4 +- .../Controllers/BlogPostController.cs | 4 +- .../Orchard.Blogs/Drivers/BlogPartDriver.cs | 58 ++++++++----------- .../Orchard.Blogs/Orchard.Blogs.csproj | 49 ++++------------ .../Modules/Orchard.Blogs/Placement.info | 23 ++++++++ .../Orchard.Blogs/Views/BlogAdmin/List.cshtml | 17 +++++- ...g.Admin.cshtml => Blog.DetailAdmin.cshtml} | 5 +- .../Views/Items/Blog.Editor.cshtml | 6 ++ .../Views/Items/Blog.Summary.cshtml | 10 ++++ ...n.Blog.cshtml => Blog.SummaryAdmin.cshtml} | 31 ++++++---- .../{Content.Blog.cshtml => Blog.cshtml} | 0 .../BlogPost.Editor.cshtml} | 0 ...logPost.cshtml => BlogPost.Summary.cshtml} | 2 +- .../BlogPost.SummaryAdmin.cshtml} | 11 ++-- .../Orchard.Blogs/Views/Items/BlogPost.cshtml | 9 +++ .../Items/Content.Detail.BlogPost.cshtml | 3 - .../Views/Items/Content.Edit.Blog.cshtml | 4 -- .../Views/Items/Content.Summary.Blog.cshtml | 7 --- .../Views/Parts/Blogs.Blog.Description.cshtml | 6 +- .../Parts/Blogs.BlogPost.List.Admin.cshtml | 32 +++++----- .../Views/Parts/Blogs.BlogPost.List.cshtml | 6 +- .../Parts/Common.Body.Detail.BlogPost.cshtml | 1 - .../Parts/Common.Body.Summary.BlogPost.cshtml | 9 --- .../Parts/Common.Metadata.Admin.Blog.cshtml | 1 - .../Views/Parts/Common.Metadata.Blog.cshtml | 1 - .../Common.Metadata.Detail.BlogPost.cshtml | 5 -- ...ContentTranslations.Detail.BlogPost.cshtml | 13 ----- ...ontentTranslations.Summary.BlogPost.cshtml | 1 - ...blishLater.Metadata.Detail.BlogPost.cshtml | 1 - .../Tags.ShowTags.Detail.BlogPost.cshtml | 16 ----- .../Tags.ShowTags.Summary.BlogPost.cshtml | 16 ----- .../Drivers/CommentsPartDriver.cs | 2 +- .../Views/Parts/Comments.CountAdmin.cshtml | 8 +-- .../Orchard.Setup/Services/SetupService.cs | 1 + .../Modules/Orchard.Widgets/Shapes.cs | 2 +- 48 files changed, 216 insertions(+), 243 deletions(-) delete mode 100644 src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Placement.info rename src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/{Content.Blog.Admin.cshtml => Blog.DetailAdmin.cshtml} (80%) create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.Editor.cshtml create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.Summary.cshtml rename src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/{Content.SummaryAdmin.Blog.cshtml => Blog.SummaryAdmin.cshtml} (50%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/{Content.Blog.cshtml => Blog.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Items_Content_Editor-BlogPost.cshtml => Items/BlogPost.Editor.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/{Content.Summary.BlogPost.cshtml => BlogPost.Summary.cshtml} (88%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Items_Content_SummaryAdmin_BlogPost.cshtml => Items/BlogPost.SummaryAdmin.cshtml} (75%) create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Detail.BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Summary.BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Admin.Blog.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Blog.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Detail.BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Detail.BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Summary.BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/PublishLater.Metadata.Detail.BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Detail.BlogPost.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Summary.BlogPost.cshtml diff --git a/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs b/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs index fc8b6770b..1ee81ae98 100644 --- a/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs +++ b/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; using NUnit.Framework; using Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy; diff --git a/src/Orchard.Web/Core/Common/Placement.info b/src/Orchard.Web/Core/Common/Placement.info index 21436e027..dc0adb995 100644 --- a/src/Orchard.Web/Core/Common/Placement.info +++ b/src/Orchard.Web/Core/Common/Placement.info @@ -12,6 +12,6 @@ + Parts_Common_Metadata_SummaryAdmin="Meta:5"/> diff --git a/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml b/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml index 374c67cfc..aaa5edd12 100644 --- a/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml +++ b/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml @@ -6,4 +6,4 @@ string bodyHtml = Model.Html.ToString(); var body = new HtmlString(Html.Excerpt(bodyHtml, 200).ToString().Replace(Environment.NewLine, "

" + Environment.NewLine + "

")); } -

@body @Html.ItemDisplayLink(T("[more]").ToString(), contentItem)

+

@body @Html.ItemDisplayLink(T("[more]").ToString(), contentItem)

\ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs b/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs index e3a23508a..5c25bcc7b 100644 --- a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs +++ b/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs @@ -10,7 +10,7 @@ namespace Orchard.Core.Contents.Drivers { ContentShape("Parts_Contents_Publish_Summary", () => shapeHelper.Parts_Contents_Publish_Summary(ContentPart: part)), ContentShape("Parts_Contents_Publish_SummaryAdmin", - () => shapeHelper.Parts_Contents_Publish_SummaryAdmin(ContentPart: part)) + () => shapeHelper.Parts_Contents_Publish_SummaryAdmin(ContentPart: part)) ); } } diff --git a/src/Orchard.Web/Core/Contents/Placement.info b/src/Orchard.Web/Core/Contents/Placement.info index fb9e58af9..fa7c159b2 100644 --- a/src/Orchard.Web/Core/Contents/Placement.info +++ b/src/Orchard.Web/Core/Contents/Placement.info @@ -3,9 +3,9 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Shapes.cs b/src/Orchard.Web/Core/Contents/Shapes.cs index 211ac3234..648ea96ee 100644 --- a/src/Orchard.Web/Core/Contents/Shapes.cs +++ b/src/Orchard.Web/Core/Contents/Shapes.cs @@ -8,9 +8,14 @@ namespace Orchard.Core.Contents { .OnDisplaying(displaying => { ContentItem contentItem = displaying.Shape.ContentItem; if (contentItem != null) { + //Content-BlogPost displaying.ShapeMetadata.Alternates.Add("Items_Content__" + contentItem.ContentType); + //Content-42 displaying.ShapeMetadata.Alternates.Add("Items_Content__" + contentItem.Id); + //Content.Summary displaying.ShapeMetadata.Alternates.Add("Items_Content_" + displaying.ShapeMetadata.DisplayType); + //Content.Summary-Page + displaying.ShapeMetadata.Alternates.Add("Items_Content_" + displaying.ShapeMetadata.DisplayType + "__" + contentItem.ContentType); } }); @@ -18,6 +23,7 @@ namespace Orchard.Core.Contents { .OnDisplaying(displaying => { ContentItem contentItem = displaying.Shape.ContentItem; if (contentItem != null) { + //Content.Editor-Page displaying.ShapeMetadata.Alternates.Add("Items_Content_Editor__" + contentItem.ContentType); } }); diff --git a/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs b/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs index 3173f8e1a..474db6700 100644 --- a/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs +++ b/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs @@ -22,13 +22,14 @@ namespace Orchard.Core.Localization.Drivers { } protected override DriverResult Display(LocalizationPart part, string displayType, dynamic shapeHelper) { + var masterId = part.MasterContentItem != null + ? part.MasterContentItem.Id + : part.Id; return Combined( ContentShape("Parts_Localization_ContentTranslations", - () => shapeHelper.Parts_Localization_ContentTranslations(ContentPart: part, Localizations: GetDisplayLocalizations(part))), + () => shapeHelper.Parts_Localization_ContentTranslations(ContentPart: part, MasterId: masterId, Localizations: GetDisplayLocalizations(part))), ContentShape("Parts_Localization_ContentTranslations_Summary", - () => shapeHelper.Parts_Localization_ContentTranslations_Summary(ContentPart: part, Localizations: GetDisplayLocalizations(part))), - ContentShape("Parts_Localization_ContentTranslations_SummaryAdmin", - () => shapeHelper.Parts_Localization_ContentTranslations_SummaryAdmin(ContentPart: part, Localizations: GetDisplayLocalizations(part))) + () => shapeHelper.Parts_Localization_ContentTranslations_Summary(ContentPart: part, MasterId: masterId, Localizations: GetDisplayLocalizations(part))) ); } diff --git a/src/Orchard.Web/Core/Localization/Placement.info b/src/Orchard.Web/Core/Localization/Placement.info index a440bbd01..94d16bb1b 100644 --- a/src/Orchard.Web/Core/Localization/Placement.info +++ b/src/Orchard.Web/Core/Localization/Placement.info @@ -1,14 +1,13 @@  - - + - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml b/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml index b5d12a066..a7c4a7c45 100644 --- a/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml +++ b/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.Summary.cshtml @@ -1 +1,17 @@ -@model Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel +@using Orchard.Core.Contents; +@using Orchard.Core.Localization.Models; +@{ + Style.Require("LocalizationAdmin"); + IEnumerable localizations = Model.Localizations; + var localizationLinks = Html.UnorderedList(localizations, (c, i) => Html.ItemEditLink(c.Culture.Culture, c), "localizations"); +} +@if (localizations.Count() > 0 || AuthorizedFor(Permissions.PublishContent)) { +
+ @if (localizations.Count() > 0) { +

@T("Translations:")

@localizationLinks
+ } + @if (AuthorizedFor(Permissions.PublishContent)) { +
@Html.ActionLink(T("+ New translation").Text, "Translate", "Admin", new { area = "Localization", id = Model.MasterId }, null)
+ } +
+} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml deleted file mode 100644 index e70a77955..000000000 --- a/src/Orchard.Web/Core/Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml +++ /dev/null @@ -1,12 +0,0 @@ -@using Orchard.Core.Localization.Models; -@{ - Style.Require("LocalizationAdmin"); - IEnumerable localizations = Model.Localizations; - var localizationLinks = Html.UnorderedList(localizations, (c, i) => Html.ItemEditLink(c.Culture.Culture, c), "localizations"); -} -
- @if (localizations.Count() > 0) { -

@T("Translations:")

@localizationLinks
- } -
@Html.ActionLink(T("+ New translation").Text, "translate", "admin", new { area = "Localization", id = Model.MasterId }, null)
-
\ 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 d447398a5..d09542211 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -297,7 +297,6 @@ - diff --git a/src/Orchard.Web/Core/PublishLater/Views/Parts/PublishLater.Metadata.cshtml b/src/Orchard.Web/Core/PublishLater/Views/Parts/PublishLater.Metadata.cshtml index 8b6405dd7..be7e5bebd 100644 --- a/src/Orchard.Web/Core/PublishLater/Views/Parts/PublishLater.Metadata.cshtml +++ b/src/Orchard.Web/Core/PublishLater/Views/Parts/PublishLater.Metadata.cshtml @@ -1 +1,10 @@ -@model Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel \ No newline at end of file +@using Orchard.ContentManagement; +@using Orchard.Core.Common.Models; +@using Orchard.Core.PublishLater.Models; +@{ + PublishLaterPart publishLaterPart = Model.ContentPart; + DateTime? versionPublishedUtc = publishLaterPart.As() == null ? null : publishLaterPart.As().VersionPublishedUtc; +} +@if (publishLaterPart.IsPublished() && versionPublishedUtc.HasValue) { + @T("Published: {0}", Html.DateTimeRelative(versionPublishedUtc.Value, T)) +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs index 5d588442a..483af4134 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs @@ -58,11 +58,12 @@ namespace Orchard.Blogs.Controllers { [HttpPost, ActionName("Create")] public ActionResult CreatePOST() { - var blog = Services.ContentManager.New("Blog"); - + //TODO: (erikpo) Might think about moving this to an ActionFilter/Attribute if (!Services.Authorizer.Authorize(Permissions.ManageBlogs, T("Couldn't create blog"))) return new HttpUnauthorizedResult(); + var blog = Services.ContentManager.New("Blog"); + _contentManager.Create(blog, VersionOptions.Draft); var model = _contentManager.UpdateEditor(blog, this); @@ -83,7 +84,6 @@ namespace Orchard.Blogs.Controllers { if (!Services.Authorizer.Authorize(Permissions.ManageBlogs, T("Not allowed to edit blog"))) return new HttpUnauthorizedResult(); - //TODO: (erikpo) Move looking up the current blog up into a modelbinder var blog = _blogService.Get(blogSlug); if (blog == null) return new NotFoundResult(); @@ -94,10 +94,10 @@ namespace Orchard.Blogs.Controllers { [HttpPost, ActionName("Edit")] public ActionResult EditPOST(string blogSlug) { + //TODO: (erikpo) Might think about moving this to an ActionFilter/Attribute if (!Services.Authorizer.Authorize(Permissions.ManageBlogs, T("Couldn't edit blog"))) return new HttpUnauthorizedResult(); - //TODO: (erikpo) Move looking up the current blog up into a modelbinder var blog = _blogService.Get(blogSlug); if (blog == null) return new NotFoundResult(); @@ -113,10 +113,10 @@ namespace Orchard.Blogs.Controllers { [HttpPost] public ActionResult Remove(string blogSlug) { + //TODO: (erikpo) Might think about moving this to an ActionFilter/Attribute if (!Services.Authorizer.Authorize(Permissions.ManageBlogs, T("Couldn't delete blog"))) return new HttpUnauthorizedResult(); - //TODO: (erikpo) Move looking up the current blog up into a modelbinder BlogPart blogPart = _blogService.Get(blogSlug); if (blogPart == null) @@ -132,7 +132,7 @@ namespace Orchard.Blogs.Controllers { var list = Shape.List(); list.AddRange(_blogService.Get() .Select(b => { - var blog = Services.ContentManager.BuildDisplay(b, "SummaryAdmin.Blog"); + var blog = Services.ContentManager.BuildDisplay(b, "SummaryAdmin"); blog.TotalPostCount = _blogPostService.Get(b, VersionOptions.Latest).Count(); return blog; })); @@ -143,15 +143,13 @@ namespace Orchard.Blogs.Controllers { return View(viewModel); } - //TODO: (erikpo) Should move the slug parameter and get call and null check up into a model binder public ActionResult Item(string blogSlug) { BlogPart blogPart = _blogService.Get(blogSlug); if (blogPart == null) return new NotFoundResult(); - //TODO: (erikpo) Need to make templatePath be more convention based so if my controller name has "Admin" in it then "Admin/{type}" is assumed - var model = Services.ContentManager.BuildDisplay(blogPart, "Blog_Admin"); + var model = Services.ContentManager.BuildDisplay(blogPart, "DetailAdmin"); return View(model); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs index 61c82efa8..a226a5178 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs @@ -36,7 +36,7 @@ namespace Orchard.Blogs.Controllers { protected ILogger Logger { get; set; } public ActionResult List() { - var blogs = _blogService.Get().Select(b => _services.ContentManager.BuildDisplay(b, "Summary.Blog")); + var blogs = _blogService.Get().Select(b => _services.ContentManager.BuildDisplay(b, "Summary")); var list = Shape.List(); list.AddRange(blogs); @@ -59,7 +59,7 @@ namespace Orchard.Blogs.Controllers { if (blog == null) return new NotFoundResult(); - var blogPosts = _blogPostService.Get(blog, (page - 1)*pageSize, pageSize).Select(b => _services.ContentManager.BuildDisplay(b, "Summary.BlogPost")); + var blogPosts = _blogPostService.Get(blog, (page - 1)*pageSize, pageSize).Select(b => _services.ContentManager.BuildDisplay(b, "Summary")); var list = Shape.List(); list.AddRange(blogPosts); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs index 25dadf3e5..2b2b8a3d1 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs @@ -51,7 +51,7 @@ namespace Orchard.Blogs.Controllers { if (postPart == null) return new NotFoundResult(); - var model = _services.ContentManager.BuildDisplay(postPart, "Detail.BlogPost"); + var model = _services.ContentManager.BuildDisplay(postPart); return View(model); } @@ -66,7 +66,7 @@ namespace Orchard.Blogs.Controllers { var archive = new ArchiveData(archiveData); var list = Shape.List(); - list.AddRange(_blogPostService.Get(blogPart, archive).Select(b => _services.ContentManager.BuildDisplay(b, "Summary.BlogPost"))); + list.AddRange(_blogPostService.Get(blogPart, archive).Select(b => _services.ContentManager.BuildDisplay(b, "Summary"))); _feedManager.Register(blogPart); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs index 140c45da4..f3cb14478 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs @@ -1,12 +1,10 @@ -using System.Collections.Generic; -using System.Linq; +using System.Linq; using JetBrains.Annotations; using Orchard.Blogs.Extensions; using Orchard.Blogs.Models; using Orchard.Blogs.Services; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; -using Orchard.Core.ContentsLocation.Models; using Orchard.Core.Feeds; using Orchard.DisplayManagement; using Orchard.Localization; @@ -35,40 +33,32 @@ namespace Orchard.Blogs.Drivers { protected override string Prefix { get { return ""; } } protected override DriverResult Display(BlogPart part, string displayType, dynamic shapeHelper) { - var driverResults = new List(); - - var metadata = shapeHelper.Parts_Blogs_Blog_Manage(ContentPart: part); - driverResults.Add(ContentShape(metadata).Location("manage")); - - var description = shapeHelper.Parts_Blogs_Blog_Description(ContentPart: part); - driverResults.Add(ContentShape(description).Location("manage", "after")); - - if (displayType.StartsWith("Admin")) { - var list = shapeHelper.List(); - list.AddRange(_blogPostService.Get(part, VersionOptions.Latest) - .Select(bp => _contentManager.BuildDisplay(bp, "BlogPost_SummaryAdmin"))); - var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List_Admin(ContentPart: part, BlogPosts: list); - var contentShape = ContentShape(blogPostList).Location("Primary"); - driverResults.Add(contentShape); - } - else if (!displayType.Contains("Summary")) { - var list = shapeHelper.List(); - list.AddRange(_blogPostService.Get(part) - .Select(bp => _contentManager.BuildDisplay(bp, "BlogPost_Summary"))); - var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list); - var contentShape = ContentShape(blogPostList).Location("Primary"); - driverResults.Add(contentShape); - - _feedManager.Register(part); - } - - return Combined(driverResults.ToArray()); + return Combined( + ContentShape("Parts_Blogs_Blog_Manage", + () => 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_BlogPost_List", + () => { + _feedManager.Register(part); + var list = shapeHelper.List(); + list.AddRange(_blogPostService.Get(part) + .Select(bp => _contentManager.BuildDisplay(bp, "Summary"))); + return shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, ContentItems: list); + }), + ContentShape("Parts_Blogs_BlogPost_List_Admin", + () => { + var list = shapeHelper.List(); + list.AddRange(_blogPostService.Get(part, VersionOptions.Latest) + .Select(bp => _contentManager.BuildDisplay(bp, "SummaryAdmin"))); + return shapeHelper.Parts_Blogs_BlogPost_List_Admin(ContentPart: part, ContentItems: list); + }) + ); } protected override DriverResult Editor(BlogPart blogPart, dynamic shapeHelper) { - var location = blogPart.GetLocation("Editor"); - return Combined( - ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Fields").Location(location)); + return ContentShape("Parts_Blogs_Blog_Fields", + () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.Blog.Fields", Model: blogPart, Prefix: Prefix)); } protected override DriverResult Editor(BlogPart blogPart, 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 3a5307772..98eaf1aa8 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -132,20 +132,15 @@ - Code - - - - - Code - - - - + + + + + @@ -159,38 +154,18 @@ Orchard.Core - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Designer + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info new file mode 100644 index 000000000..022d20e01 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml index f67493b8d..5ce61d2d0 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml @@ -1,8 +1,23 @@ @using Orchard.Blogs.Extensions; +@using Orchard.Core.Contents.ViewModels; +@using Orchard.Utility.Extensions;

@Html.TitleForPage(T("Manage Blogs").ToString())

@if (Model.ContentItems.Items.Count > 0) {
@T("New Blog")
-@Display(Model.ContentItems) + using(Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) { +
+ + + @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString()) + +
+
+ @Display(Model.ContentItems) +
+ } } else {
@T("There are no blogs for you to see. Want to add one?", Url.BlogCreate())
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.Admin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.DetailAdmin.cshtml similarity index 80% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.Admin.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.DetailAdmin.cshtml index 05a41787d..90868b616 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.Admin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.DetailAdmin.cshtml @@ -1,7 +1,6 @@ @using Orchard.Blogs.Extensions; @using Orchard.Blogs.Models;

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

-@Display(Model.manage) +@Display(Model.Manage)
@T("New Post")
-@Display(Model.metadata) -@Display(Model.Primary) \ No newline at end of file +@Display(Model.Content) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.Editor.cshtml new file mode 100644 index 000000000..ca46e8462 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.Editor.cshtml @@ -0,0 +1,6 @@ +@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/Blog.Summary.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.Summary.cshtml new file mode 100644 index 000000000..f0d60c326 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.Summary.cshtml @@ -0,0 +1,10 @@ +@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.SummaryAdmin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.SummaryAdmin.cshtml similarity index 50% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.SummaryAdmin.cshtml index d1a0549f8..035cd10fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.SummaryAdmin.cshtml @@ -1,21 +1,28 @@ @using Orchard.Blogs.Extensions; @using Orchard.Blogs.Models; -
+@using Orchard.ContentManagement; +@using Orchard.Utility.Extensions; +@{ + ContentItem contentItem = Model.ContentItem; + var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); +} +
+
+ +

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

+ @if (Model.Meta != null) { +
@Display(Model.Meta)
+ } + @*

[list of authors] [modify blog access]

*@ +
@T("View")@T(" | ") @T("List Posts")@T(" | ") @T("New Post")@T(" | ") @T("Edit")@T(" | ") - @* todo: (heskew) this is a bit too verbose. need template helpers for all ibuttons *@ - @using (Html.BeginFormAntiForgeryPost(Url.BlogRemove((string)Model.Slug), FormMethod.Post, new { @class = "inline link" })) { - - } + @T("Remove")
-
-

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

-

@Display(Model.meta)

- @*

[list of authors] [modify blog access]

*@ -

@Model.Description

-
-
+ @if (Model.Content != null) { +
@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/Blog.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Blog.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_Editor-BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.Editor.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_Editor-BlogPost.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.Editor.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.Summary.cshtml similarity index 88% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.Summary.cshtml index e217cb228..92f0079ae 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.Summary.cshtml @@ -5,4 +5,4 @@ @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.Primary)
+
@Display(Model.Content)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_SummaryAdmin_BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.SummaryAdmin.cshtml similarity index 75% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_SummaryAdmin_BlogPost.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.SummaryAdmin.cshtml index 4aaf65abc..7c191c172 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_SummaryAdmin_BlogPost.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.SummaryAdmin.cshtml @@ -6,17 +6,16 @@ ContentItem contentItem = Model.ContentItem; var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); } -

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

-
@Display(Model.metadata)
+
@Display(Model.Meta)
-
@Display(Model.secondary) +
@Display(Model.Related) @Html.Link(T("Edit").Text, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart)))) @T(" | ") @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" }) -
@Display(Model.meta) +
@Display(Model.Secondary)
-
@Display(Model.Primary)
-
+
@Display(Model.Content)
+
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.cshtml new file mode 100644 index 000000000..b1f6519a6 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.cshtml @@ -0,0 +1,9 @@ +

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

+@if (Model.Meta != null) { +
+ @Display(Model.Meta) +
+} +
+ @Display(Model.Content) +
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml deleted file mode 100644 index 7968e4f99..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -

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

-@Display(Model.metadata) -@Display(Model.Primary) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml deleted file mode 100644 index 74e0ddef1..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml +++ /dev/null @@ -1,4 +0,0 @@ -@Html.AddTitleParts(Model.Title) -@Display(Model.Primary) -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111 Content.Edit.Blog !!!!!!!!!!!!!!!!!!!!!!!!11 -
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml deleted file mode 100644 index abb445ea0..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@using Orchard.Blogs.Extensions; -@using Orchard.Blogs.Models; -

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

-@if (!string.IsNullOrEmpty((string)Model.Description)) { -

@Model.Description

-} -
@T.Plural("1 post", "{0} posts", (int)Model.PostCount) | @Display(Model.meta)
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml index 22b88120d..1610e4211 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml @@ -1,3 +1,5 @@ -
+@if (HasText(Model.Description)) { +

@Model.Description

-
\ No newline at end of file +
+} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.Admin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.Admin.cshtml index 46fc0c33b..80ff6fefa 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.Admin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.Admin.cshtml @@ -1,22 +1,22 @@ @using Orchard.Core.Contents.ViewModels; @using Orchard.Utility.Extensions; -@if (Model.Items.Count > 0) { +@if (Model.ContentItems.Items.Count > 0) { using (Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) { -
- - - @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString()) - -
-
-@Display(Model.BlogPosts) -
+
+ + + @Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString()) + +
+
+ @Display(Model.ContentItems) +
} } else { -
@T("There are no posts for this blog.")
+
@T("There are no posts for this blog.")
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml index 115c06bc6..86506523a 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml @@ -1,7 +1,9 @@ @{ IEnumerable blogPosts = Model.BlogPosts; } -@Display(blogPosts) +@Display(ContentItems) @if (blogPosts == null || blogPosts.Count() < 1) {

@T("There are no posts for this blog.")

-} \ No newline at end of file +} + +hi \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Detail.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Detail.BlogPost.cshtml deleted file mode 100644 index 9ed89c7cc..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Detail.BlogPost.cshtml +++ /dev/null @@ -1 +0,0 @@ -@Model.Html \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Summary.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Summary.BlogPost.cshtml deleted file mode 100644 index 9bf64b8b6..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Summary.BlogPost.cshtml +++ /dev/null @@ -1,9 +0,0 @@ -@using Orchard.ContentManagement; -@using Orchard.Core.Common.ViewModels; -@*doing excerpt generation on the way out for now so we don't stick ourselves with needing to regen excerpts for existing data - also, doing this here, inline, until we have a pluggable processing model (both in and out) - also, ...this is ugly *@ -@{ - var body = new HtmlString(Html.Excerpt((string)Model.Html.ToString(), 200).ToString().Replace(Environment.NewLine, "

" + Environment.NewLine + "

")); -} -

@body @Html.ItemDisplayLink(T("[more]").ToString(), (IContent)Model.ContentPart.ContentItem)

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Admin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Admin.Blog.cshtml deleted file mode 100644 index 5f282702b..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Admin.Blog.cshtml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Blog.cshtml deleted file mode 100644 index 5f282702b..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Blog.cshtml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Detail.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Detail.BlogPost.cshtml deleted file mode 100644 index 2f9b5fb4a..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Detail.BlogPost.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -@using Orchard.Core.Common.Extensions; -@if (Model.Creator != null) { -
-
@T("Published by {0} {1}", (string)Model.ContentPart.Creator.UserName, Html.PublishedWhen((DateTime?)Model.ContentPart.VersionPublishedUtc, T))
-
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Detail.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Detail.BlogPost.cshtml deleted file mode 100644 index be4264423..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Detail.BlogPost.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@using Orchard.Core.Localization.Models; -@{ - Style.Require("Localization"); - IEnumerable localizations = Model.Localizations; -} -@if (localizations != null && localizations.Count() > 0) { -
-
-

@T("Translations:")

- @Html.UnorderedList(localizations, (c, i) => Html.ItemDisplayLink(c.Culture.Culture, c), "localizations") -
-
-} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Summary.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Summary.BlogPost.cshtml deleted file mode 100644 index 5f282702b..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Summary.BlogPost.cshtml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/PublishLater.Metadata.Detail.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/PublishLater.Metadata.Detail.BlogPost.cshtml deleted file mode 100644 index 5f282702b..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/PublishLater.Metadata.Detail.BlogPost.cshtml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Detail.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Detail.BlogPost.cshtml deleted file mode 100644 index 58e5dfab6..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Detail.BlogPost.cshtml +++ /dev/null @@ -1,16 +0,0 @@ -@{ - var tagsHtml = new List(); - foreach(var t in Model.Tags) { - if (tagsHtml.Any()) { - tagsHtml.Add(new HtmlString(", ")); - } - tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { })); - } -} - -@if (tagsHtml.Any()) { -

- @T("Tags:") - @foreach(var htmlString in tagsHtml) { @htmlString } -

-} diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Summary.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Summary.BlogPost.cshtml deleted file mode 100644 index 58e5dfab6..000000000 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Summary.BlogPost.cshtml +++ /dev/null @@ -1,16 +0,0 @@ -@{ - var tagsHtml = new List(); - foreach(var t in Model.Tags) { - if (tagsHtml.Any()) { - tagsHtml.Add(new HtmlString(", ")); - } - tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { })); - } -} - -@if (tagsHtml.Any()) { -

- @T("Tags:") - @foreach(var htmlString in tagsHtml) { @htmlString } -

-} diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs index ecf9e25a5..41b121c31 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs @@ -12,7 +12,7 @@ namespace Orchard.Comments.Drivers { return null; if (displayType.StartsWith("Detail")) - return ContentShape(shapeHelper.Parts_Comments_Comments(ContentPart: part)).Location(part.GetLocation("Detail")); + return ContentShape(shapeHelper.Parts_Comments_Comments(ContentPart: part)).Location("Content:10"); if (displayType == "SummaryAdmin") return ContentShape(shapeHelper.Parts_Comments_CountAdmin(ContentPart: part, CommentCount: part.Comments.Count, PendingCount: part.PendingComments.Count)) diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.CountAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.CountAdmin.cshtml index 26bc8188d..fe9da4ea3 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.CountAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.CountAdmin.cshtml @@ -1,5 +1,5 @@ -@model Orchard.Comments.ViewModels.CommentCountViewModel -@using Orchard.Comments.ViewModels; +@using Orchard.Comments.Models; @using Orchard.Comments.Extensions; - -@Html.CommentSummaryLinks(T, Model.Item, Model.CommentCount, Model.PendingCount) +@using Orchard.Comments.ViewModels; +@using Orchard.ContentManagement; +@Html.CommentSummaryLinks(T, (ContentItem)Model.ContentPart.ContentItem, (int)Model.CommentCount, (int)Model.PendingCount) \ 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 0f26916d1..263f5c884 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -229,6 +229,7 @@ namespace Orchard.Setup.Services { htmlWidget.As().Zone = "Content"; htmlWidget.As().Position = "5"; htmlWidget.As().Text = "

Congratulations, you've successfully set-up your Orchard site.

This is the home page of your new site. We've taken the liberty to write here about a few things you could look at next in order to get familiar with the application. Once you feel confident you don't need this anymore, just click Edit to go into edit mode and replace this with whatever you want on your home page to make it your own.

One thing you could do (but you don't have to) is go into Manage Settings (follow the Admin link and then look for it under \"Settings\" in the menu on the left) and check that everything is configured the way you want.

You probably want to make the site your own. One of the ways you can do that is by clicking Manage Themes in the admin menu. A theme is a packaged look and feel that affects the whole site.

Next, you can start playing with the content types that we installed. For example, go ahead and click Add New Page in the admin menu and create an \"about\" page. Then, add it to the navigation menu by going to Manage Menu. You can also click Add New Blog and start posting by clicking \"Add New Post\".

Finally, Orchard has been designed to be extended. It comes with a few built-in modules such as pages and blogs or themes. You can install new themes by going to Manage Themes and clicking Install a new Theme. Like for themes, modules are created by other users of Orchard just like you so if you feel up to it, please consider participating.

--The Orchard Crew

"; + htmlWidget.As().Owner = user; contentManager.Publish(htmlWidget); // and three more for the third aside...really need this elsewhere... diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs index 2789f5d1b..750c10a2b 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs @@ -29,7 +29,7 @@ namespace Orchard.Widgets { var zoneName = contentItem.As().Zone; displaying.ShapeMetadata.Alternates.Add("Items_Widget__" + contentItem.ContentType); displaying.ShapeMetadata.Alternates.Add("Items_Widget__" + zoneName); - //...would like... + //...would like...if '__' was collapsible //displaying.ShapeMetadata.Alternates.Add("Items_Widget__" + zoneName + "__" + contentItem.ContentType); } }); From 2ea7ef7f5242a0e61b2e9c7797584b442195e612 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 14 Oct 2010 11:28:21 -0700 Subject: [PATCH 2/9] Fixing blog post links in the summary admin view Semi-related to http://orchardqa.codeplex.com/workitem/103 --HG-- branch : dev --- .../Orchard.Blogs/Views/Items/BlogPost.SummaryAdmin.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.SummaryAdmin.cshtml index 7c191c172..b4ca94497 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.SummaryAdmin.cshtml @@ -9,11 +9,11 @@
-

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

+

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

@Display(Model.Meta)
@Display(Model.Related) - @Html.Link(T("Edit").Text, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart)))) @T(" | ") + @Html.Link(T("Edit").Text, Url.BlogPostEdit((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart)))) @T(" | ") @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
@Display(Model.Secondary)
From dd5392313031cbddad50050ec231721f055be0e6 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 14 Oct 2010 11:30:58 -0700 Subject: [PATCH 3/9] Correcting http://orchardqa.codeplex.com/workitem/116 - Removed Orchard.Mvc.NotFoundResult, replaced by the new MVC HttpNotFoundViewResult --HG-- branch : dev --- .../Feeds/Controllers/FeedControllerTests.cs | 3 +-- .../Contents/Controllers/AdminController.cs | 13 +++++---- .../Core/Feeds/Controllers/FeedController.cs | 6 ++--- .../Controllers/AdminController.cs | 5 ++-- .../Services/RoutableHomePageProvider.cs | 3 +-- .../Controllers/BlogAdminController.cs | 11 ++++---- .../Controllers/BlogController.cs | 10 +++---- .../Controllers/BlogPostAdminController.cs | 27 +++++++++---------- .../Controllers/BlogPostController.cs | 7 +++-- .../Controllers/AdminController.cs | 25 +++++++++-------- .../Controllers/AdminController.cs | 8 +++--- .../Controllers/AdminController.cs | 5 ++-- .../Controllers/AdminController.cs | 3 +-- .../Controllers/AccountController.cs | 5 ++-- .../Controllers/AdminController.cs | 17 ++++++------ src/Orchard/Mvc/Results/NotFoundResult.cs | 11 -------- src/Orchard/Orchard.Framework.csproj | 1 - 17 files changed, 65 insertions(+), 95 deletions(-) delete mode 100644 src/Orchard/Mvc/Results/NotFoundResult.cs diff --git a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs index fe8f18d21..7f6c7141b 100644 --- a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs +++ b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs @@ -17,7 +17,6 @@ using Orchard.Core.Feeds.Models; using Orchard.Core.Feeds.Rss; using Orchard.Core.Feeds.StandardBuilders; using Orchard.Core.Routable.Models; -using Orchard.Mvc.Results; using Orchard.Tests.Modules; using Orchard.Tests.Stubs; @@ -36,7 +35,7 @@ namespace Orchard.Core.Tests.Feeds.Controllers { var result = controller.Index("no-such-format"); Assert.That(result, Is.Not.Null); - Assert.That(result, Is.TypeOf()); + Assert.That(result, Is.TypeOf()); } [Test] diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index ff30279a6..0ea9a99ab 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -15,7 +15,6 @@ using Orchard.Data; using Orchard.DisplayManagement; using Orchard.Localization; using Orchard.Logging; -using Orchard.Mvc.Results; using Orchard.UI.Notify; namespace Orchard.Core.Contents.Controllers { @@ -47,7 +46,7 @@ namespace Orchard.Core.Contents.Controllers { public ActionResult List(ListContentsViewModel model) { if (model.ContainerId != null && _contentManager.GetLatest((int)model.ContainerId) == null) - return new NotFoundResult(); + return HttpNotFound(); const int pageSize = 20; var skip = (Math.Max(model.Page ?? 0, 1) - 1) * pageSize; @@ -57,7 +56,7 @@ namespace Orchard.Core.Contents.Controllers { if (!string.IsNullOrEmpty(model.TypeName)) { var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(model.TypeName); if (contentTypeDefinition == null) - return new NotFoundResult(); + return HttpNotFound(); model.TypeDisplayName = !string.IsNullOrWhiteSpace(contentTypeDefinition.DisplayName) ? contentTypeDefinition.DisplayName @@ -249,7 +248,7 @@ namespace Orchard.Core.Contents.Controllers { var contentItem = _contentManager.Get(id, VersionOptions.Latest); if (contentItem == null) - return new NotFoundResult(); + return HttpNotFound(); if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Cannot edit content"))) return new HttpUnauthorizedResult(); @@ -264,7 +263,7 @@ namespace Orchard.Core.Contents.Controllers { var contentItem = _contentManager.Get(id, VersionOptions.DraftRequired); if (contentItem == null) - return new NotFoundResult(); + return HttpNotFound(); if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Couldn't edit content"))) return new HttpUnauthorizedResult(); @@ -313,7 +312,7 @@ namespace Orchard.Core.Contents.Controllers { public ActionResult Publish(int id, string returnUrl) { var contentItem = _contentManager.GetLatest(id); if (contentItem == null) - return new NotFoundResult(); + return HttpNotFound(); if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Couldn't publish content"))) return new HttpUnauthorizedResult(); @@ -332,7 +331,7 @@ namespace Orchard.Core.Contents.Controllers { public ActionResult Unpublish(int id, string returnUrl) { var contentItem = _contentManager.GetLatest(id); if (contentItem == null) - return new NotFoundResult(); + return HttpNotFound(); if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Couldn't unpublish content"))) return new HttpUnauthorizedResult(); diff --git a/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs b/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs index 3d01f0693..c09308e2c 100644 --- a/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs +++ b/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs @@ -3,8 +3,6 @@ using System.Linq; using System.Web.Mvc; using Orchard.Core.Feeds.Models; using Orchard.Logging; -using Orchard.Mvc.Results; -using Orchard.Themes; namespace Orchard.Core.Feeds.Controllers { public class FeedController : Controller { @@ -34,7 +32,7 @@ namespace Orchard.Core.Feeds.Controllers { .FirstOrDefault(); if (bestFormatterMatch == null || bestFormatterMatch.FeedBuilder == null) - return new NotFoundResult(); + return HttpNotFound(); context.Builder = bestFormatterMatch.FeedBuilder; @@ -45,7 +43,7 @@ namespace Orchard.Core.Feeds.Controllers { .FirstOrDefault(); if (bestQueryMatch == null || bestQueryMatch.FeedQuery == null) - return new NotFoundResult(); + return HttpNotFound(); return context.Builder.Process(context, () => { bestQueryMatch.FeedQuery.Execute(context); diff --git a/src/Orchard.Web/Core/Localization/Controllers/AdminController.cs b/src/Orchard.Web/Core/Localization/Controllers/AdminController.cs index 3f6e76874..cb3aba8ee 100644 --- a/src/Orchard.Web/Core/Localization/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Localization/Controllers/AdminController.cs @@ -10,7 +10,6 @@ using Orchard.Core.Routable.Models; using Orchard.DisplayManagement; using Orchard.Localization; using Orchard.Localization.Services; -using Orchard.Mvc.Results; using Orchard.UI.Notify; namespace Orchard.Core.Localization.Controllers { @@ -43,7 +42,7 @@ namespace Orchard.Core.Localization.Controllers { // only support translations from the site culture, at the moment at least if (contentItem == null) - return new NotFoundResult(); + return HttpNotFound(); if (!contentItem.Is() || contentItem.As().MasterContentItem != null) { var metadata = _contentManager.GetItemMetadata(contentItem); @@ -79,7 +78,7 @@ namespace Orchard.Core.Localization.Controllers { var contentItem = _contentManager.Get(id, VersionOptions.Latest); if (contentItem == null) - return new NotFoundResult(); + return HttpNotFound(); var model = new AddLocalizationViewModel(); TryUpdateModel(model); diff --git a/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs b/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs index 283416d8b..5a2f32d60 100644 --- a/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs +++ b/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs @@ -3,7 +3,6 @@ using JetBrains.Annotations; using Orchard.Core.Routable.Models; using Orchard.DisplayManagement; using Orchard.Localization; -using Orchard.Mvc.Results; using Orchard.Services; using Orchard.ContentManagement; @@ -35,7 +34,7 @@ namespace Orchard.Core.Routable.Services { public ActionResult GetHomePage(int itemId) { var contentItem = _contentManager.Get(itemId, VersionOptions.Published); if (contentItem == null || !contentItem.Is()) - return new NotFoundResult(); + return new HttpNotFoundResult(); var model = _contentManager.BuildDisplay(contentItem); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs index 483af4134..069495e45 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs @@ -9,7 +9,6 @@ using Orchard.ContentManagement.Aspects; using Orchard.Data; using Orchard.DisplayManagement; using Orchard.Localization; -using Orchard.Mvc.Results; using Orchard.UI.Admin; using Orchard.UI.Notify; @@ -50,7 +49,7 @@ namespace Orchard.Blogs.Controllers { var blog = Services.ContentManager.New("Blog"); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.BuildEditor(blog); return View(model); @@ -86,7 +85,7 @@ namespace Orchard.Blogs.Controllers { var blog = _blogService.Get(blogSlug); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.BuildEditor(blog); return View(model); @@ -100,7 +99,7 @@ namespace Orchard.Blogs.Controllers { var blog = _blogService.Get(blogSlug); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.UpdateEditor(blog, this); if (!ModelState.IsValid) @@ -120,7 +119,7 @@ namespace Orchard.Blogs.Controllers { BlogPart blogPart = _blogService.Get(blogSlug); if (blogPart == null) - return new NotFoundResult(); + return HttpNotFound(); _blogService.Delete(blogPart); @@ -147,7 +146,7 @@ namespace Orchard.Blogs.Controllers { BlogPart blogPart = _blogService.Get(blogSlug); if (blogPart == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.BuildDisplay(blogPart, "DetailAdmin"); return View(model); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs index a226a5178..b7ccc5c1e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs @@ -1,4 +1,3 @@ -using System; using System.Linq; using System.Web; using System.Web.Mvc; @@ -10,7 +9,6 @@ using Orchard.Blogs.Services; using Orchard.Blogs.ViewModels; using Orchard.DisplayManagement; using Orchard.Logging; -using Orchard.Mvc.Results; using Orchard.Themes; namespace Orchard.Blogs.Controllers { @@ -53,11 +51,11 @@ namespace Orchard.Blogs.Controllers { var correctedSlug = _blogSlugConstraint.FindSlug(blogSlug); if (correctedSlug == null) - return new NotFoundResult(); + return HttpNotFound(); BlogPart blog = _blogService.Get(correctedSlug); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); var blogPosts = _blogPostService.Get(blog, (page - 1)*pageSize, pageSize).Select(b => _services.ContentManager.BuildDisplay(b, "Summary")); @@ -81,7 +79,7 @@ namespace Orchard.Blogs.Controllers { BlogPart blogPart = _blogService.Get(blogSlug); if (blogPart == null) - return new NotFoundResult(); + return HttpNotFound(); const string manifestUri = "http://schemas.microsoft.com/wlw/manifest/weblog"; @@ -106,7 +104,7 @@ namespace Orchard.Blogs.Controllers { BlogPart blogPart = _blogService.Get(blogSlug); if (blogPart == null) - return new NotFoundResult(); + return HttpNotFound(); const string manifestUri = "http://archipelago.phrasewise.com/rsd"; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs index ed6acca54..e9ca608a0 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs @@ -6,7 +6,6 @@ using Orchard.ContentManagement; using Orchard.ContentManagement.Aspects; using Orchard.Localization; using Orchard.Mvc.AntiForgery; -using Orchard.Mvc.Results; using Orchard.UI.Admin; using Orchard.UI.Notify; @@ -32,7 +31,7 @@ namespace Orchard.Blogs.Controllers { var blogPost = Services.ContentManager.New("BlogPost"); if (blogPost.BlogPart == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.BuildEditor(blogPost); @@ -46,7 +45,7 @@ namespace Orchard.Blogs.Controllers { var blogPost = Services.ContentManager.New("BlogPost"); if (blogPost.BlogPart == null) - return new NotFoundResult(); + return HttpNotFound(); Services.ContentManager.Create(blogPost, VersionOptions.Draft); var model = Services.ContentManager.UpdateEditor(blogPost, this); @@ -71,11 +70,11 @@ namespace Orchard.Blogs.Controllers { var blog = _blogService.Get(blogSlug); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); var post = _blogPostService.Get(postId, VersionOptions.Latest); if (post == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.BuildEditor(post); @@ -89,12 +88,12 @@ namespace Orchard.Blogs.Controllers { var blog = _blogService.Get(blogSlug); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); // Get draft (create a new version if needed) var blogPost = _blogPostService.Get(postId, VersionOptions.DraftRequired); if (blogPost == null) - return new NotFoundResult(); + return HttpNotFound(); // Validate form input var model = Services.ContentManager.UpdateEditor(blogPost, this); @@ -142,7 +141,7 @@ namespace Orchard.Blogs.Controllers { ActionResult RedirectToEdit(IContent item) { if (item == null || item.As() == null) - return new NotFoundResult(); + return HttpNotFound(); return RedirectToAction("Edit", new { BlogSlug = item.As().BlogPart.Slug, PostId = item.ContentItem.Id }); } @@ -154,11 +153,11 @@ namespace Orchard.Blogs.Controllers { var blog = _blogService.Get(blogSlug); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); var post = _blogPostService.Get(postId, VersionOptions.Latest); if (post == null) - return new NotFoundResult(); + return HttpNotFound(); _blogPostService.Delete(post); Services.Notifier.Information(T("Blog post was successfully deleted")); @@ -173,11 +172,11 @@ namespace Orchard.Blogs.Controllers { var blog = _blogService.Get(blogSlug); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); var post = _blogPostService.Get(postId, VersionOptions.Latest); if (post == null) - return new NotFoundResult(); + return HttpNotFound(); _blogPostService.Publish(post); Services.Notifier.Information(T("Blog post successfully published.")); @@ -192,11 +191,11 @@ namespace Orchard.Blogs.Controllers { var blog = _blogService.Get(blogSlug); if (blog == null) - return new NotFoundResult(); + return HttpNotFound(); var post = _blogPostService.Get(postId, VersionOptions.Latest); if (post == null) - return new NotFoundResult(); + return HttpNotFound(); _blogPostService.Unpublish(post); Services.Notifier.Information(T("Blog post successfully unpublished.")); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs index 2b2b8a3d1..09de5c0c7 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs @@ -7,7 +7,6 @@ using Orchard.ContentManagement; using Orchard.Core.Feeds; using Orchard.DisplayManagement; using Orchard.Localization; -using Orchard.Mvc.Results; using Orchard.Security; using Orchard.Themes; @@ -44,12 +43,12 @@ namespace Orchard.Blogs.Controllers { //TODO: (erikpo) Move looking up the current blog up into a modelbinder var blogPart = _blogService.Get(blogSlug); if (blogPart == null) - return new NotFoundResult(); + return HttpNotFound(); //TODO: (erikpo) Look up the current user and their permissions to this blog post and determine if they should be able to view it or not. var postPart = _blogPostService.Get(blogPart, postSlug, VersionOptions.Published); if (postPart == null) - return new NotFoundResult(); + return HttpNotFound(); var model = _services.ContentManager.BuildDisplay(postPart); @@ -61,7 +60,7 @@ namespace Orchard.Blogs.Controllers { BlogPart blogPart = _blogService.Get(blogSlug); if (blogPart == null) - return new NotFoundResult(); + return HttpNotFound(); var archive = new ArchiveData(archiveData); diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs index 10b0bc380..0e8f9ab48 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs @@ -7,7 +7,6 @@ using Orchard.ContentTypes.Services; using Orchard.ContentTypes.ViewModels; using Orchard.Core.Contents.Settings; using Orchard.Localization; -using Orchard.Mvc.Results; using Orchard.UI.Notify; namespace Orchard.ContentTypes.Controllers { @@ -72,7 +71,7 @@ namespace Orchard.ContentTypes.Controllers { var typeViewModel = _contentDefinitionService.GetType(id); if (typeViewModel == null) - return new NotFoundResult(); + return HttpNotFound(); return View(typeViewModel); } @@ -85,7 +84,7 @@ namespace Orchard.ContentTypes.Controllers { var typeViewModel = _contentDefinitionService.GetType(id); if (typeViewModel == null) - return new NotFoundResult(); + return HttpNotFound(); if (!TryUpdateModel(typeViewModel)) return View(typeViewModel); @@ -109,7 +108,7 @@ namespace Orchard.ContentTypes.Controllers { var typeViewModel = _contentDefinitionService.GetType(id); if (typeViewModel == null) - return new NotFoundResult(); + return HttpNotFound(); var viewModel = new AddPartsViewModel { Type = typeViewModel, @@ -129,7 +128,7 @@ namespace Orchard.ContentTypes.Controllers { var typeViewModel = _contentDefinitionService.GetType(id); if (typeViewModel == null) - return new NotFoundResult(); + return HttpNotFound(); var viewModel = new AddPartsViewModel(); if (!TryUpdateModel(viewModel)) @@ -159,7 +158,7 @@ namespace Orchard.ContentTypes.Controllers { if (typeViewModel == null || !TryUpdateModel(viewModel) || !typeViewModel.Parts.Any(p => p.PartDefinition.Name == viewModel.Name)) - return new NotFoundResult(); + return HttpNotFound(); viewModel.Type = typeViewModel; return View(viewModel); @@ -176,7 +175,7 @@ namespace Orchard.ContentTypes.Controllers { if (typeViewModel == null || !TryUpdateModel(viewModel) || !typeViewModel.Parts.Any(p => p.PartDefinition.Name == viewModel.Name)) - return new NotFoundResult(); + return HttpNotFound(); _contentDefinitionService.RemovePartFromType(viewModel.Name, typeViewModel.Name); @@ -230,7 +229,7 @@ namespace Orchard.ContentTypes.Controllers { var partViewModel = _contentDefinitionService.GetPart(id); if (partViewModel == null) - return new NotFoundResult(); + return HttpNotFound(); return View(partViewModel); } @@ -243,7 +242,7 @@ namespace Orchard.ContentTypes.Controllers { var partViewModel = _contentDefinitionService.GetPart(id); if (partViewModel == null) - return new NotFoundResult(); + return HttpNotFound(); if (!TryUpdateModel(partViewModel)) return View(partViewModel); @@ -272,7 +271,7 @@ namespace Orchard.ContentTypes.Controllers { if (typeViewModel != null) partViewModel = new EditPartViewModel(new ContentPartDefinition(id)); else - return new NotFoundResult(); + return HttpNotFound(); } var viewModel = new AddFieldViewModel { @@ -298,7 +297,7 @@ namespace Orchard.ContentTypes.Controllers { _contentDefinitionService.AddPartToType(partViewModel.Name, typeViewModel.Name); } else { - return new NotFoundResult(); + return HttpNotFound(); } } @@ -334,7 +333,7 @@ namespace Orchard.ContentTypes.Controllers { if (partViewModel == null || !TryUpdateModel(viewModel) || !partViewModel.Fields.Any(p => p.Name == viewModel.Name)) - return new NotFoundResult(); + return HttpNotFound(); viewModel.Part = partViewModel; return View(viewModel); @@ -351,7 +350,7 @@ namespace Orchard.ContentTypes.Controllers { if (partViewModel == null || !TryUpdateModel(viewModel) || !partViewModel.Fields.Any(p => p.Name == viewModel.Name)) - return new NotFoundResult(); + return HttpNotFound(); _contentDefinitionService.RemoveFieldFromPart(viewModel.Name, partViewModel.Name); diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs index 320c0c7fc..867082e3f 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs @@ -4,8 +4,6 @@ using System.Web.Mvc; using Orchard.Data.Migration; using Orchard.Localization; using Orchard.Modules.ViewModels; -using Orchard.Mvc.Results; -using Orchard.Packaging; using Orchard.Packaging.Services; using Orchard.Reports.Services; using Orchard.UI.Notify; @@ -97,7 +95,7 @@ namespace Orchard.Modules.Controllers { return new HttpUnauthorizedResult(); if (string.IsNullOrEmpty(id)) - return new NotFoundResult(); + return HttpNotFound(); _moduleService.EnableFeatures(new[] { id }, force != null && (bool)force); @@ -110,7 +108,7 @@ namespace Orchard.Modules.Controllers { return new HttpUnauthorizedResult(); if (string.IsNullOrEmpty(id)) - return new NotFoundResult(); + return HttpNotFound(); _moduleService.DisableFeatures(new[] { id }, force != null && (bool)force); @@ -123,7 +121,7 @@ namespace Orchard.Modules.Controllers { return new HttpUnauthorizedResult(); if (string.IsNullOrEmpty(id)) - return new NotFoundResult(); + return HttpNotFound(); try { _reportsCoordinator.Register("Data Migration", "Upgrade " + id, "Orchard installation"); diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs index 31cc02bc0..4881ef86a 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs @@ -5,7 +5,6 @@ using Orchard.Environment.Configuration; using Orchard.Localization; using Orchard.MultiTenancy.Services; using Orchard.MultiTenancy.ViewModels; -using Orchard.Mvc.Results; using Orchard.UI.Notify; namespace Orchard.MultiTenancy.Controllers { @@ -76,7 +75,7 @@ namespace Orchard.MultiTenancy.Controllers { var tenant = _tenantService.GetTenants().FirstOrDefault(ss => ss.Name == name); if (tenant == null) - return new NotFoundResult(); + return HttpNotFound(); return View(new TenantEditViewModel { Name = tenant.Name, @@ -100,7 +99,7 @@ namespace Orchard.MultiTenancy.Controllers { var tenant = _tenantService.GetTenants().FirstOrDefault(ss => ss.Name == viewModel.Name); if (tenant == null) - return new NotFoundResult(); + return HttpNotFound(); _tenantService.UpdateTenant( new ShellSettings { diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs index f098fbb9e..54076e862 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs @@ -5,7 +5,6 @@ using System.Web.Mvc; using Orchard.Data.Migration; using Orchard.DisplayManagement; using Orchard.Localization; -using Orchard.Mvc.Results; using Orchard.Reports.Services; using Orchard.Security; using Orchard.Themes.Preview; @@ -176,7 +175,7 @@ namespace Orchard.Themes.Controllers { return new HttpUnauthorizedResult(); if (string.IsNullOrEmpty(themeName)) - return new NotFoundResult(); + return HttpNotFound(); try { _reportsCoordinator.Register("Data Migration", "Upgrade " + themeName, "Orchard installation"); diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs index c4517ed1f..d65a37ff7 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs @@ -14,7 +14,6 @@ using Orchard.Settings; using JetBrains.Annotations; using Orchard.ContentManagement; using Orchard.Users.Models; -using Orchard.Mvc.Results; namespace Orchard.Users.Controllers { [HandleError, Themed] @@ -96,7 +95,7 @@ namespace Orchard.Users.Controllers { // ensure users can register var registrationSettings = CurrentSite.As(); if ( !registrationSettings.UsersCanRegister ) { - return new NotFoundResult(); + return HttpNotFound(); } ViewData["PasswordLength"] = MinPasswordLength; @@ -109,7 +108,7 @@ namespace Orchard.Users.Controllers { // ensure users can register var registrationSettings = CurrentSite.As(); if ( !registrationSettings.UsersCanRegister ) { - return new NotFoundResult(); + return HttpNotFound(); } ViewData["PasswordLength"] = MinPasswordLength; diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs index 59f07e6ea..54022bbd2 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs @@ -5,7 +5,6 @@ using System.Linq; using Orchard.ContentManagement; using Orchard.Core.Contents.Controllers; using Orchard.Localization; -using Orchard.Mvc.Results; using Orchard.UI.Admin; using Orchard.UI.Notify; using Orchard.Widgets.Models; @@ -99,7 +98,7 @@ namespace Orchard.Widgets.Controllers { try { WidgetPart widgetPart = Services.ContentManager.New(widgetType); if (widgetPart == null) - return new NotFoundResult(); + return HttpNotFound(); dynamic model = Services.ContentManager.BuildEditor(widgetPart); return View(model); @@ -119,7 +118,7 @@ namespace Orchard.Widgets.Controllers { int widgetPosition = _widgetsService.GetWidgets(layerId).Count() + 1; WidgetPart widgetPart = _widgetsService.CreateWidget(layerId, widgetType, "", widgetPosition.ToString(), ""); if (widgetPart == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.UpdateEditor(widgetPart, this); if (!ModelState.IsValid) { @@ -143,7 +142,7 @@ namespace Orchard.Widgets.Controllers { try { LayerPart layerPart = Services.ContentManager.New("Layer"); if (layerPart == null) - return new NotFoundResult(); + return HttpNotFound(); dynamic model = Services.ContentManager.BuildEditor(layerPart); return View(model); @@ -162,7 +161,7 @@ namespace Orchard.Widgets.Controllers { try { LayerPart layerPart = _widgetsService.CreateLayer("", "", ""); if (layerPart == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.UpdateEditor(layerPart, this); if (!ModelState.IsValid) { @@ -186,7 +185,7 @@ namespace Orchard.Widgets.Controllers { try { LayerPart layerPart = _widgetsService.GetLayer(id); if (layerPart == null) { - return new NotFoundResult(); + return HttpNotFound(); } dynamic model = Services.ContentManager.BuildEditor(layerPart); @@ -207,7 +206,7 @@ namespace Orchard.Widgets.Controllers { try { LayerPart layerPart = _widgetsService.GetLayer(id); if (layerPart == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.UpdateEditor(layerPart, this); if (!ModelState.IsValid) { @@ -276,7 +275,7 @@ namespace Orchard.Widgets.Controllers { try { widgetPart = _widgetsService.GetWidget(id); if (widgetPart == null) - return new NotFoundResult(); + return HttpNotFound(); var model = Services.ContentManager.UpdateEditor(widgetPart, this); if (!ModelState.IsValid) { @@ -305,7 +304,7 @@ namespace Orchard.Widgets.Controllers { try { widgetPart = _widgetsService.GetWidget(id); if (widgetPart == null) - return new NotFoundResult(); + return HttpNotFound(); _widgetsService.DeleteWidget(widgetPart.Id); Services.Notifier.Information(T("Widget was successfully deleted")); diff --git a/src/Orchard/Mvc/Results/NotFoundResult.cs b/src/Orchard/Mvc/Results/NotFoundResult.cs deleted file mode 100644 index b3dd75778..000000000 --- a/src/Orchard/Mvc/Results/NotFoundResult.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Net; -using System.Web; -using System.Web.Mvc; - -namespace Orchard.Mvc.Results { - public class NotFoundResult : ViewResult { - public override void ExecuteResult(ControllerContext context) { - throw new HttpException((int)HttpStatusCode.NotFound, "Resource not found"); - } - } -} \ No newline at end of file diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index cbf0014a1..1a605f35d 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -757,7 +757,6 @@ - From 1a6359b5cc69afa12833428d41ad126f787b3303 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 14 Oct 2010 11:53:10 -0700 Subject: [PATCH 4/9] Fix unit test --HG-- branch : dev --- src/Orchard.Core.Tests/Body/BodyPartTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard.Core.Tests/Body/BodyPartTests.cs b/src/Orchard.Core.Tests/Body/BodyPartTests.cs index b0d128b65..b2d08db90 100644 --- a/src/Orchard.Core.Tests/Body/BodyPartTests.cs +++ b/src/Orchard.Core.Tests/Body/BodyPartTests.cs @@ -34,6 +34,7 @@ namespace Orchard.Core.Tests.Body { builder.RegisterInstance(new Mock().Object); builder.RegisterInstance(new Mock().Object); builder.RegisterInstance(new Mock().Object); + builder.RegisterInstance(new Mock().Object); builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); From 39adeb5f5a3df7f3576351dff02d4c4e03399e16 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 14 Oct 2010 11:53:45 -0700 Subject: [PATCH 5/9] Putting the shape table debug output into Orchard.Experimental --HG-- branch : dev --- .../Orchard.Experimental/Orchard.Experimental.csproj | 1 + src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs | 6 +++++- .../Orchard.Experimental}/Views/DumpShapeTable.cshtml | 6 ++++-- src/Orchard.Web/Orchard.Web.csproj | 1 - src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml | 9 +-------- 5 files changed, 11 insertions(+), 12 deletions(-) rename src/Orchard.Web/{Themes/TheAdmin => Modules/Orchard.Experimental}/Views/DumpShapeTable.cshtml (87%) diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj b/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj index 02943e426..620b023e2 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj @@ -107,6 +107,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs index b2ec4b240..d343bc32d 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs @@ -7,12 +7,16 @@ namespace Orchard.Experimental { } public void Created(ShapeCreatedContext context) { - if (context.ShapeType != "Layout" && context.ShapeType != "DocumentZone") + if (context.ShapeType != "Layout" && context.ShapeType != "DocumentZone") { context.Shape.Metadata.Wrappers.Add("ThinBorder"); + } if (context.ShapeType == "Header") { context.Shape.Metadata.Wrappers.Add("HackScript"); context.Shape.Metadata.Wrappers.Add("HackStyle"); } + if (context.ShapeType == "Layout") { + context.Shape.Metadata.Wrappers.Add("DumpShapeTable"); + } } } } \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml similarity index 87% rename from src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml index 24f145784..e3b0999e7 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml @@ -1,9 +1,10 @@ @using Orchard; @using Orchard.DisplayManagement.Descriptors; +@Display(Model.Metadata.ChildContent) @{ var workContext = ViewContext.GetWorkContext(); var shapeTable = workContext.Resolve().GetShapeTable(workContext.CurrentTheme.ThemeName); - + +} \ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index ab2ce8eb1..d8c8f2137 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -311,7 +311,6 @@ - diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml index c6040ef15..16f1be5b9 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml @@ -38,11 +38,4 @@ @Display(Model.Navigation)
- -@* tmp *@ - \ No newline at end of file + @Display(Model.Footer) \ No newline at end of file From 22bc1e9a491d86d60202aedf38b1c1623e984a73 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 14 Oct 2010 11:59:24 -0700 Subject: [PATCH 6/9] Fix unit tests --HG-- branch : dev --- .../Common/Providers/CommonPartProviderTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs index 1544fdb2c..fa53d7439 100644 --- a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs +++ b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs @@ -49,6 +49,7 @@ namespace Orchard.Core.Tests.Common.Providers { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterInstance(new Mock().Object); _authn = new Mock(); _authz = new Mock(); From 8f2f5c7fc229e4e2927c5b404da27f2a8ce13833 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 14 Oct 2010 12:03:28 -0700 Subject: [PATCH 7/9] Fix unit tests --HG-- branch : dev --- src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs | 1 + src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs | 1 + src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs index 0ec9e4762..75d313019 100644 --- a/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs +++ b/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs @@ -44,6 +44,7 @@ namespace Orchard.Core.Tests.Routable.Services { builder.RegisterInstance(new Mock().Object); builder.RegisterInstance(new Mock().Object); builder.RegisterInstance(new Mock().Object); + builder.RegisterInstance(new Mock().Object); builder.RegisterType().As(); builder.RegisterType().As(); diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs index 2966f1a19..5d114c702 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs @@ -39,6 +39,7 @@ namespace Orchard.Core.Tests.Scheduling { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterInstance(new Mock().Object); + builder.RegisterInstance(new Mock().Object); builder.RegisterType().As().Named("ScheduledTaskExecutor", typeof(IBackgroundTask)); builder.RegisterInstance(_handler).As(); diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs index 84b098ace..98ec82125 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs @@ -43,6 +43,7 @@ namespace Orchard.Core.Tests.Scheduling { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterInstance(new Mock().Object); + builder.RegisterInstance(new Mock().Object); builder.RegisterType().As(); From 71e61fd3df3f9e7f1028268dd3900b1ee80117f3 Mon Sep 17 00:00:00 2001 From: Michael Dorian Bach Date: Thu, 14 Oct 2010 12:03:45 -0700 Subject: [PATCH 8/9] Fixed Layout-Wrapper so it can accept dynamic has-sidebar class. --HG-- branch : dev --- src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml index c65184ee4..6eccdfc8c 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml @@ -22,9 +22,12 @@ } + Model.Id = "layout-wrapper"; + var tag = Tag (Model, "div"); + } -
+@tag.StartElement @* needs to be the page title, not page (head) title... *@ @* Adds text and html to the header zone *@ @@ -85,4 +88,4 @@ } -
\ No newline at end of file +@tag.EndElement \ No newline at end of file From 995025cebf39b7462ed4d25b7536bf6bf91c5064 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 14 Oct 2010 12:22:00 -0700 Subject: [PATCH 9/9] Fix unit tests --HG-- branch : dev --- src/Orchard.Tests/ContentManagement/ContentQueryTests.cs | 1 + .../ContentManagement/DefaultContentManagerTests.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs index fd540c8ed..6381446bd 100644 --- a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs +++ b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs @@ -52,6 +52,7 @@ namespace Orchard.Tests.ContentManagement { builder.RegisterType().As().SingleInstance(); builder.RegisterType().As(); builder.RegisterInstance(new Mock().Object); + builder.RegisterInstance(new Mock().Object); builder.RegisterType().As(); builder.RegisterType().As(); diff --git a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs index c9524f9c2..a0adb8f8a 100644 --- a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs +++ b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs @@ -62,6 +62,7 @@ namespace Orchard.Tests.ContentManagement { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterInstance(_contentDefinitionManager.Object); + builder.RegisterInstance(new Mock().Object); builder.RegisterType().As(); builder.RegisterType().As();