From 6f8620d03f4fa2e59af31fe51d7f40e9ab50e12c Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 24 Apr 2013 12:05:26 -0700 Subject: [PATCH] Cleaning page class names --HG-- branch : 1.x --- .../Core/Contents/Controllers/ItemController.cs | 4 ++-- .../Core/Contents/Views/Item/Display.cshtml | 6 ++++++ .../Core/Contents/Views/Item/Preview.cshtml | 6 ++++++ src/Orchard.Web/Core/Orchard.Core.csproj | 6 ++++++ .../Orchard.CustomForms/Orchard.CustomForms.csproj | 3 --- .../Orchard.CustomForms/Views/Item/Create.cshtml | 5 ++++- .../Orchard.CustomForms/Views/Item/Edit.cshtml | 5 ----- .../ContentManagement/DefaultContentDisplay.cs | 11 ----------- 8 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 src/Orchard.Web/Core/Contents/Views/Item/Display.cshtml create mode 100644 src/Orchard.Web/Core/Contents/Views/Item/Preview.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Edit.cshtml diff --git a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs index 90779ad52..129d6f03a 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs @@ -33,7 +33,7 @@ namespace Orchard.Core.Contents.Controllers { } dynamic model = _contentManager.BuildDisplay(contentItem); - return new ShapeResult(this, model); + return View((object)model); } // /Contents/Item/Preview/72 @@ -57,7 +57,7 @@ namespace Orchard.Core.Contents.Controllers { } dynamic model = _contentManager.BuildDisplay(contentItem); - return new ShapeResult(this, model); + return View((object)model); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Item/Display.cshtml b/src/Orchard.Web/Core/Contents/Views/Item/Display.cshtml new file mode 100644 index 000000000..d654a7e7d --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Item/Display.cshtml @@ -0,0 +1,6 @@ +@using Orchard.ContentManagement +@using Orchard.Utility.Extensions +@{ + ContentItem contentItem = Model.ContentItem; + Html.AddPageClassNames("detail-" + contentItem.ContentType.HtmlClassify()); +}@Display(Model) \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Item/Preview.cshtml b/src/Orchard.Web/Core/Contents/Views/Item/Preview.cshtml new file mode 100644 index 000000000..1ff18671e --- /dev/null +++ b/src/Orchard.Web/Core/Contents/Views/Item/Preview.cshtml @@ -0,0 +1,6 @@ +@using Orchard.ContentManagement +@using Orchard.Utility.Extensions +@{ + ContentItem contentItem = Model.ContentItem; + Html.AddPageClassNames("preview", "detail-" + contentItem.ContentType.HtmlClassify()); +}@Display(Model) \ 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 1397981ed..3bd67bc1e 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -550,6 +550,12 @@ + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj b/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj index 0fa628a16..07e31b67e 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj @@ -114,9 +114,6 @@ - - - diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Create.cshtml b/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Create.cshtml index 68fde09c2..a225d7c50 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Create.cshtml +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Create.cshtml @@ -1,8 +1,11 @@ @using Orchard.ContentManagement +@using Orchard.Utility.Extensions @{ ContentItem customForm = Model.ContentItem; string returnUrl = Model.ReturnUrl; - + + Html.AddPageClassNames("edit-" + customForm.ContentType.HtmlClassify()); + // remove default Save/Publish buttons Model.Zones["Sidebar"].Items.Clear(); } diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Edit.cshtml deleted file mode 100644 index db7c3fab8..000000000 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Views/Item/Edit.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -@using (Html.BeginFormAntiForgeryPost()) { - @Html.ValidationSummary() - // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type - @Display(Model) -} \ No newline at end of file diff --git a/src/Orchard/ContentManagement/DefaultContentDisplay.cs b/src/Orchard/ContentManagement/DefaultContentDisplay.cs index fa581293d..125d022fe 100644 --- a/src/Orchard/ContentManagement/DefaultContentDisplay.cs +++ b/src/Orchard/ContentManagement/DefaultContentDisplay.cs @@ -7,13 +7,10 @@ using Orchard.DisplayManagement; using Orchard.DisplayManagement.Descriptors; using Orchard.FileSystems.VirtualPath; using Orchard.Logging; -using Orchard.UI.PageClass; using Orchard.UI.Zones; -using Orchard.Utility.Extensions; namespace Orchard.ContentManagement { public class DefaultContentDisplay : IContentDisplay { - private readonly IPageClassBuilder _pageClassBuilder; private readonly Lazy> _handlers; private readonly IShapeFactory _shapeFactory; private readonly Lazy _shapeTableLocator; @@ -23,14 +20,12 @@ namespace Orchard.ContentManagement { private readonly IWorkContextAccessor _workContextAccessor; public DefaultContentDisplay( - IPageClassBuilder pageClassBuilder, Lazy> handlers, IShapeFactory shapeFactory, Lazy shapeTableLocator, RequestContext requestContext, IVirtualPathProvider virtualPathProvider, IWorkContextAccessor workContextAccessor) { - _pageClassBuilder = pageClassBuilder; _handlers = handlers; _shapeFactory = shapeFactory; _shapeTableLocator = shapeTableLocator; @@ -52,10 +47,6 @@ namespace Orchard.ContentManagement { var actualShapeType = stereotype; var actualDisplayType = string.IsNullOrWhiteSpace(displayType) ? "Detail" : displayType; - if (actualDisplayType == "Detail") { - _pageClassBuilder.AddClassNames("detail-" + content.ContentItem.ContentType.HtmlClassify()); - } - dynamic itemShape = CreateItemShape(actualShapeType); itemShape.ContentItem = content.ContentItem; itemShape.Metadata.DisplayType = actualDisplayType; @@ -77,7 +68,6 @@ namespace Orchard.ContentManagement { stereotype = "Content"; var actualShapeType = stereotype + "_Edit"; - _pageClassBuilder.AddClassNames("edit-" + content.ContentItem.ContentType.HtmlClassify()); dynamic itemShape = CreateItemShape(actualShapeType); itemShape.ContentItem = content.ContentItem; @@ -101,7 +91,6 @@ namespace Orchard.ContentManagement { stereotype = "Content"; var actualShapeType = stereotype + "_Edit"; - _pageClassBuilder.AddClassNames("edit-" + content.ContentItem.ContentType.HtmlClassify()); dynamic itemShape = CreateItemShape(actualShapeType); itemShape.ContentItem = content.ContentItem;