From 38a20fb68f1a7802df50820ee988056097d58318 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 13 Oct 2010 11:01:21 -0700 Subject: [PATCH] Some progress on getting blogs back in order. Definately still in progress. Even what has been changed is not necessarily baked. --HG-- branch : dev --- .../Orchard.Blogs/Controllers/BlogAdminController.cs | 2 +- .../Controllers/BlogPostAdminController.cs | 6 ------ .../Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs | 10 +++------- .../Modules/Orchard.Blogs/Orchard.Blogs.csproj | 4 ++-- ...ent.Admin.Blog.cshtml => Content.Blog.Admin.cshtml} | 0 ...ost.cshtml => Items_Content_Editor-BlogPost.cshtml} | 2 +- ...html => Items_Content_SummaryAdmin_BlogPost.cshtml} | 0 src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs | 1 + .../Modules/Orchard.Widgets/Views/Admin/Index.cshtml | 7 ++++--- 9 files changed, 12 insertions(+), 20 deletions(-) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/{Content.Admin.Blog.cshtml => Content.Blog.Admin.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Items/Content.Edit.BlogPost.cshtml => Items_Content_Editor-BlogPost.cshtml} (95%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Items/Content.SummaryAdmin.BlogPost.cshtml => Items_Content_SummaryAdmin_BlogPost.cshtml} (100%) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs index 84c95f4ad..5d588442a 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs @@ -151,7 +151,7 @@ namespace Orchard.Blogs.Controllers { 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, "Admin.Blog"); + var model = Services.ContentManager.BuildDisplay(blogPart, "Blog_Admin"); return View(model); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs index 4d0360a2d..ed6acca54 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs @@ -36,9 +36,6 @@ namespace Orchard.Blogs.Controllers { var model = Services.ContentManager.BuildEditor(blogPost); - //todo: (heskew) unhack - model.Metadata.Type += ".BlogPost"; - return View(model); } @@ -82,9 +79,6 @@ namespace Orchard.Blogs.Controllers { var model = Services.ContentManager.BuildEditor(post); - //todo: (heskew) unhack - model.Metadata.Type += ".BlogPost"; - return View(model); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs index 331334fbd..140c45da4 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs @@ -38,28 +38,24 @@ namespace Orchard.Blogs.Drivers { var driverResults = new List(); var metadata = shapeHelper.Parts_Blogs_Blog_Manage(ContentPart: part); - metadata.Metadata.Type = "Parts_Blogs_Blog.Manage"; driverResults.Add(ContentShape(metadata).Location("manage")); var description = shapeHelper.Parts_Blogs_Blog_Description(ContentPart: part); - description.Metadata.Type = "Parts_Blogs_Blog.Description"; 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, "SummaryAdmin.BlogPost"))); - var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list); - blogPostList.Metadata.Type = "Parts_Blogs_BlogPost.List.Admin"; + .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, "Summary.BlogPost"))); + .Select(bp => _contentManager.BuildDisplay(bp, "BlogPost_Summary"))); var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list); - blogPostList.Metadata.Type = "Parts_Blogs_BlogPost.List"; var contentShape = ContentShape(blogPostList).Location("Primary"); driverResults.Add(contentShape); diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index f66d8c7c8..c2c2b3d57 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -136,13 +136,13 @@ Code - + Code - + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.Admin.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.Admin.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_Editor-BlogPost.cshtml similarity index 95% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_Editor-BlogPost.cshtml index 530a190d0..cd956410b 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_Editor-BlogPost.cshtml @@ -8,7 +8,7 @@ @Display(Model.Primary)
-@Display(Model.secondary) +@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 *@ diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_SummaryAdmin_BlogPost.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_SummaryAdmin_BlogPost.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs index 414d858f8..2789f5d1b 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs @@ -13,6 +13,7 @@ namespace Orchard.Widgets { public void Discover(ShapeTableBuilder builder) { builder.Describe("Items_Widget") .Configure(descriptor => { + // todo: have "alternates" for chrome if (_orchardServices.Authorizer.Authorize(Permissions.ManageWidgets)) descriptor.Wrappers.Add("Widget_Manage"); else diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml index cd53940cf..4f5d71477 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml @@ -1,14 +1,15 @@ @model WidgetsIndexViewModel @using Orchard.Widgets.Models; @using Orchard.Widgets.ViewModels; -@{ Style.Require("WidgetsAdmin"); } - +@{ + Style.Require("WidgetsAdmin"); +}

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

+
@Html.ActionLink(T("Add a layer").ToString(), "AddLayer", new { }, new { @class = "button primaryAction" })
@using(Html.BeginFormAntiForgeryPost()) { Html.ValidationSummary(); -
@Html.ActionLink(T("Add a layer").ToString(), "AddLayer", new { }, new { @class = "button primaryAction" })