From 5cd048f30db109e5cacc485e30c1313508cfcf76 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Fri, 15 Oct 2010 12:47:47 -0700 Subject: [PATCH] Committing changes on content Items_ name change --HG-- branch : dev --- .../BasicShapeTemplateHarvesterTests.cs | 27 +++++++------------ src/Orchard.Web/Core/Contents/Shapes.cs | 14 +++++----- .../RemoteBlogPublishingShapes.cs | 2 +- .../Orchard.Widgets/Orchard.Widgets.csproj | 6 ++--- .../Modules/Orchard.Widgets/Shapes.cs | 6 ++--- .../Views/Items_Widget.Editor.cshtml | 11 -------- .../Orchard.Widgets/Views/Items_Widget.cshtml | 2 -- .../DefaultContentDisplay.cs | 6 ++--- .../IShapeTemplateHarvester.cs | 11 +------- 9 files changed, 28 insertions(+), 57 deletions(-) delete mode 100644 src/Orchard.Web/Modules/Orchard.Widgets/Views/Items_Widget.Editor.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.Widgets/Views/Items_Widget.cshtml diff --git a/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs b/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs index 1ee81ae98..10c5aa2cd 100644 --- a/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs +++ b/src/Orchard.Tests/DisplayManagement/Descriptors/BasicShapeTemplateHarvesterTests.cs @@ -6,7 +6,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors { [TestFixture] public class BasicShapeTemplateHarvesterTests { private static void VerifyShapeType(string givenSubPath, string givenFileName, string expectedShapeType) { - var harvester = new BasicShapeTemplateHarvester(Enumerable.Empty()); + var harvester = new BasicShapeTemplateHarvester(); var harvestShapeHits = harvester.HarvestShape(new HarvestShapeInfo { SubPath = givenSubPath, FileName = givenFileName }); Assert.That(harvestShapeHits.Count(), Is.EqualTo(1)); Assert.That(harvestShapeHits.Single().ShapeType, Is.EqualTo(expectedShapeType)); @@ -31,38 +31,31 @@ namespace Orchard.Tests.DisplayManagement.Descriptors { [Test] public void DefaultItemsContentTemplate() { - VerifyShapeType("Views/Items", "Content", "Items_Content"); + VerifyShapeType("Views/Items", "Content", "Content"); } [Test] public void ImplicitSpecializationOfItemsContentTemplate() { - VerifyShapeType("Views/Items", "MyType", "Items_Content__MyType"); + VerifyShapeType("Views/Items", "MyType", "MyType"); } [Test] public void ExplicitSpecializationOfItemsContentTemplate() { - VerifyShapeType("Views/Items", "Content-MyType", "Items_Content__MyType"); + VerifyShapeType("Views/Items", "Content-MyType", "Content__MyType"); } [Test] public void ContentItemDisplayTypes() { - VerifyShapeType("Views/Items", "Content", "Items_Content"); - VerifyShapeType("Views/Items", "Content.Summary", "Items_Content_Summary"); - VerifyShapeType("Views/Items", "Content.Edit", "Items_Content_Edit"); + VerifyShapeType("Views/Items", "Content", "Content"); + VerifyShapeType("Views/Items", "Content.Summary", "Content_Summary"); + VerifyShapeType("Views/Items", "Content.Edit", "Content_Edit"); } [Test] public void ExplicitSpecializationMixedWithDisplayTypes() { - VerifyShapeType("Views/Items", "Content-MyType", "Items_Content__MyType"); - VerifyShapeType("Views/Items", "Content-MyType.Summary", "Items_Content_Summary__MyType"); - VerifyShapeType("Views/Items", "Content-MyType.Edit", "Items_Content_Edit__MyType"); - } - - [Test] - public void ImplicitSpecializationMixedWithDisplayTypes() { - VerifyShapeType("Views/Items", "MyType", "Items_Content__MyType"); - VerifyShapeType("Views/Items", "MyType.Summary", "Items_Content_Summary__MyType"); - VerifyShapeType("Views/Items", "MyType.Edit", "Items_Content_Edit__MyType"); + VerifyShapeType("Views/Items", "Content-MyType", "Content__MyType"); + VerifyShapeType("Views/Items", "Content-MyType.Summary", "Content_Summary__MyType"); + VerifyShapeType("Views/Items", "Content-MyType.Edit", "Content_Edit__MyType"); } [Test] diff --git a/src/Orchard.Web/Core/Contents/Shapes.cs b/src/Orchard.Web/Core/Contents/Shapes.cs index 20abec04f..0999dea75 100644 --- a/src/Orchard.Web/Core/Contents/Shapes.cs +++ b/src/Orchard.Web/Core/Contents/Shapes.cs @@ -4,27 +4,27 @@ using Orchard.DisplayManagement.Descriptors; namespace Orchard.Core.Contents { public class Shapes : IShapeTableProvider { public void Discover(ShapeTableBuilder builder) { - builder.Describe("Items_Content") + builder.Describe("Content") .OnDisplaying(displaying => { ContentItem contentItem = displaying.Shape.ContentItem; if (contentItem != null) { //Content-BlogPost - displaying.ShapeMetadata.Alternates.Add("Items_Content__" + contentItem.ContentType); + displaying.ShapeMetadata.Alternates.Add("Content__" + contentItem.ContentType); //Content-42 - displaying.ShapeMetadata.Alternates.Add("Items_Content__" + contentItem.Id); + displaying.ShapeMetadata.Alternates.Add("Content__" + contentItem.Id); //Content.Summary - displaying.ShapeMetadata.Alternates.Add("Items_Content_" + displaying.ShapeMetadata.DisplayType); + displaying.ShapeMetadata.Alternates.Add("Content_" + displaying.ShapeMetadata.DisplayType); //Content.Summary-Page - displaying.ShapeMetadata.Alternates.Add("Items_Content_" + displaying.ShapeMetadata.DisplayType + "__" + contentItem.ContentType); + displaying.ShapeMetadata.Alternates.Add("Content_" + displaying.ShapeMetadata.DisplayType + "__" + contentItem.ContentType); } }); - builder.Describe("Items_Content_Edit") + builder.Describe("Content_Edit") .OnDisplaying(displaying => { ContentItem contentItem = displaying.Shape.ContentItem; if (contentItem != null) { //Content.Editor-Page - displaying.ShapeMetadata.Alternates.Add("Items_Content_Edit__" + contentItem.ContentType); + displaying.ShapeMetadata.Alternates.Add("Content_Edit__" + contentItem.ContentType); } }); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/RemoteBlogPublishingShapes.cs b/src/Orchard.Web/Modules/Orchard.Blogs/RemoteBlogPublishingShapes.cs index e9c5d7fc7..024076387 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/RemoteBlogPublishingShapes.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/RemoteBlogPublishingShapes.cs @@ -5,7 +5,7 @@ namespace Orchard.Blogs { [OrchardFeature("Remote Blog Publishing")] public class RemoteBlogPublishingShapes : IShapeTableProvider { public void Discover(ShapeTableBuilder builder) { - builder.Describe("Items_Content__Blog") + builder.Describe("Content__Blog") .OnDisplaying(displaying => { if (displaying.ShapeMetadata.DisplayType == "Detail") { displaying.ShapeMetadata.Wrappers.Add("RemoteBlogPublishing"); diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj index 0483cc885..f9e17d2ed 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj @@ -116,12 +116,12 @@ Designer - - + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs index 54de14d3a..a097a2d21 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs @@ -5,7 +5,7 @@ using Orchard.Widgets.Models; namespace Orchard.Widgets { public class Shapes : IShapeTableProvider { public void Discover(ShapeTableBuilder builder) { - builder.Describe("Items_Widget") + builder.Describe("Widget") .Configure(descriptor => { // todo: have "alternates" for chrome //todo: (heskew) something...this still doesn't feel right @@ -20,8 +20,8 @@ namespace Orchard.Widgets { ContentItem contentItem = displaying.Shape.ContentItem; if (contentItem != null) { var zoneName = contentItem.As().Zone; - displaying.ShapeMetadata.Alternates.Add("Items_Widget__" + contentItem.ContentType); - displaying.ShapeMetadata.Alternates.Add("Items_Widget__" + zoneName); + displaying.ShapeMetadata.Alternates.Add("Widget__" + contentItem.ContentType); + displaying.ShapeMetadata.Alternates.Add("Widget__" + zoneName); } }); } diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items_Widget.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items_Widget.Editor.cshtml deleted file mode 100644 index c3a6edaa4..000000000 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items_Widget.Editor.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -
-
- @Display(Model.Primary) -
-
- @Display(Model.secondary) -
- -
-
-
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items_Widget.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items_Widget.cshtml deleted file mode 100644 index 05001230b..000000000 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items_Widget.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@Display(Model.Header) -@Display(Model.Content) \ No newline at end of file diff --git a/src/Orchard/ContentManagement/DefaultContentDisplay.cs b/src/Orchard/ContentManagement/DefaultContentDisplay.cs index d44078a1e..91c68341d 100644 --- a/src/Orchard/ContentManagement/DefaultContentDisplay.cs +++ b/src/Orchard/ContentManagement/DefaultContentDisplay.cs @@ -61,7 +61,7 @@ namespace Orchard.ContentManagement { if (!contentTypeDefinition.Settings.TryGetValue("Stereotype", out stereotype)) stereotype = "Content"; - var actualShapeType = "Items_" + stereotype; + var actualShapeType = stereotype; var actualDisplayType = string.IsNullOrWhiteSpace(displayType) ? "Detail" : displayType; dynamic itemShape = CreateItemShape(actualShapeType); @@ -81,7 +81,7 @@ namespace Orchard.ContentManagement { if (!contentTypeDefinition.Settings.TryGetValue("Stereotype", out stereotype)) stereotype = "Content"; - var actualShapeType = "Items_" + stereotype + "_Edit"; + var actualShapeType = stereotype + "_Edit"; dynamic itemShape = CreateItemShape(actualShapeType); itemShape.ContentItem = content.ContentItem; @@ -99,7 +99,7 @@ namespace Orchard.ContentManagement { if (!contentTypeDefinition.Settings.TryGetValue("Stereotype", out stereotype)) stereotype = "Content"; - var actualShapeType = "Items_" + stereotype + "_Edit"; + var actualShapeType = stereotype + "_Edit"; dynamic itemShape = CreateItemShape(actualShapeType); itemShape.ContentItem = content.ContentItem; diff --git a/src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs b/src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs index 40e573555..3bbcd92d7 100644 --- a/src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs +++ b/src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/IShapeTemplateHarvester.cs @@ -15,11 +15,6 @@ namespace Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy { } public class BasicShapeTemplateHarvester : IShapeTemplateHarvester { - private readonly IEnumerable _shapeTemplateViewEngines; - - public BasicShapeTemplateHarvester(IEnumerable shapeTemplateViewEngines) { - _shapeTemplateViewEngines = shapeTemplateViewEngines; - } public IEnumerable SubPaths() { return new[] { "Views", "Views/Items", "Views/Parts", "Views/Fields" }; @@ -43,14 +38,10 @@ namespace Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy { static string Adjust(string subPath, string fileName, string displayType) { var leader = ""; - if (subPath.StartsWith("Views/")) { + if (subPath.StartsWith("Views/") && subPath != "Views/Items") { leader = subPath.Substring("Views/".Length) + "_"; } - if (leader == "Items_" && !fileName.StartsWith("Content")) { - leader = "Items_Content__"; - } - // canonical shape type names must not have - or . to be compatible // with display and shape api calls))) var shapeType = leader + fileName.Replace("--", "__").Replace("-", "__").Replace('.', '_');