From 7c8d6599408052285b93fe3b65a68a717db593a0 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 1 Dec 2010 22:38:21 -0800 Subject: [PATCH 01/20] Giving the checkbox and radio inputs in the admin a little focus outline --HG-- branch : dev --- src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index e8fdc6504..293b3de49 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -58,7 +58,6 @@ blockquote, q { quotes: "" ""; } header, footer, aside, nav, article { display: block; } /* end: reset */ - /* Clearing Floats ***************************************************************/ @@ -460,6 +459,10 @@ form.inline fieldset { padding-top:0; } +input[type="checkbox"]:focus, input[type="radio"]:focus { + outline:1px dotted #666d51; +} + legend span { font-weight:normal; } From a13494030599113e777739289d9368a5f60fc32d Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 1 Dec 2010 22:38:54 -0800 Subject: [PATCH 02/20] Updating a blog spec test to rearrange the workflow --HG-- branch : dev --- src/Orchard.Specs/Blogs.feature | 12 ++++++------ src/Orchard.Specs/Blogs.feature.cs | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Orchard.Specs/Blogs.feature b/src/Orchard.Specs/Blogs.feature index 7d2a60a27..cc773d77f 100644 --- a/src/Orchard.Specs/Blogs.feature +++ b/src/Orchard.Specs/Blogs.feature @@ -15,18 +15,18 @@ Scenario: I can create a new blog and blog post | name | value | | Routable.Title | My Blog | And I hit "Save" - And I go to "my-blog" - Then I should see "]*>.*?My Blog.*?" - When I go to "admin/blogs" + And I go to "admin/blogs" And I follow "My Blog" - Then I should see "foo" - When I follow "New Post" + And I follow "New Post" And I fill in | name | value | | Routable.Title | My Post | | Body.Text | Hi there. | And I hit "Publish Now" - And I go to "my-blog/my-post" + And I go to "my-blog" + Then I should see "]*>.*?My Blog.*?" + And I should see "]*>.*?My Post.*?" + When I go to "my-blog/my-post" Then I should see "]*>.*?My Post.*?" And I should see "Hi there." diff --git a/src/Orchard.Specs/Blogs.feature.cs b/src/Orchard.Specs/Blogs.feature.cs index 619696117..47fef6b10 100644 --- a/src/Orchard.Specs/Blogs.feature.cs +++ b/src/Orchard.Specs/Blogs.feature.cs @@ -93,17 +93,11 @@ this.ScenarioSetup(scenarioInfo); #line 17 testRunner.And("I hit \"Save\""); #line 18 - testRunner.And("I go to \"my-blog\""); + testRunner.And("I go to \"admin/blogs\""); #line 19 - testRunner.Then("I should see \"]*>.*?My Blog.*?\""); -#line 20 - testRunner.When("I go to \"admin/blogs\""); -#line 21 testRunner.And("I follow \"My Blog\""); -#line 22 - testRunner.Then("I should see \"foo\""); -#line 23 - testRunner.When("I follow \"New Post\""); +#line 20 + testRunner.And("I follow \"New Post\""); #line hidden TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -114,12 +108,18 @@ this.ScenarioSetup(scenarioInfo); table2.AddRow(new string[] { "Body.Text", "Hi there."}); -#line 24 +#line 21 testRunner.And("I fill in", ((string)(null)), table2); -#line 28 +#line 25 testRunner.And("I hit \"Publish Now\""); +#line 26 + testRunner.And("I go to \"my-blog\""); +#line 27 + testRunner.Then("I should see \"]*>.*?My Blog.*?\""); +#line 28 + testRunner.And("I should see \"]*>.*?My Post.*?\""); #line 29 - testRunner.And("I go to \"my-blog/my-post\""); + testRunner.When("I go to \"my-blog/my-post\""); #line 30 testRunner.Then("I should see \"]*>.*?My Post.*?\""); #line 31 From fd6dc8b92bd26f5b45d9e0fa74a11dad4df1f24e Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 1 Dec 2010 23:59:10 -0800 Subject: [PATCH 03/20] Making it so multiple warning messages don't appear when creating a new container enabled content item (messages which appear when there are no containable enabled content types in the system) work item: 16905 --HG-- branch : dev --- .../Core/Containers/Drivers/ContainerPartDriver.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Core/Containers/Drivers/ContainerPartDriver.cs b/src/Orchard.Web/Core/Containers/Drivers/ContainerPartDriver.cs index 0cd207dde..f95aaa13f 100644 --- a/src/Orchard.Web/Core/Containers/Drivers/ContainerPartDriver.cs +++ b/src/Orchard.Web/Core/Containers/Drivers/ContainerPartDriver.cs @@ -35,16 +35,16 @@ namespace Orchard.Core.Containers.Drivers { } protected override DriverResult Editor(ContainerPart part, dynamic shapeHelper) { - return Editor(part, null, shapeHelper); - } - - protected override DriverResult Editor(ContainerPart part, IUpdateModel updater, dynamic shapeHelper) { // if there are no containable items then show a nice little warning if (!_contentDefinitionManager.ListTypeDefinitions() .Where(typeDefinition => typeDefinition.Parts.Any(partDefinition => partDefinition.PartDefinition.Name == "ContainablePart")).Any()) { Services.Notifier.Warning(T("There are no content types in the system with a Containable part attached. Consider adding a Containable part to some content type, existing or new, in order to relate items to this (Container enabled) item.")); } + return Editor(part, null, shapeHelper); + } + + protected override DriverResult Editor(ContainerPart part, IUpdateModel updater, dynamic shapeHelper) { return ContentShape( "Parts_Container_Edit", () => { From bf005f20a232f2d81a80a8cc25971a8c4ffd6890 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 2 Dec 2010 07:30:33 -0800 Subject: [PATCH 04/20] Cleaning up some string extension methods --HG-- branch : dev --- .../Utility/Extensions/StringExtensions.cs | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Orchard/Utility/Extensions/StringExtensions.cs b/src/Orchard/Utility/Extensions/StringExtensions.cs index d0a760210..b9bdaa0ff 100644 --- a/src/Orchard/Utility/Extensions/StringExtensions.cs +++ b/src/Orchard/Utility/Extensions/StringExtensions.cs @@ -6,8 +6,8 @@ namespace Orchard.Utility.Extensions { public static class StringExtensions { private static readonly Regex humps = new Regex("(?:^[a-zA-Z][^A-Z]*|[A-Z][^A-Z]*)"); public static string CamelFriendly(this string camel) { - if (camel == null) - return null; + if (string.IsNullOrWhiteSpace(camel)) + return ""; var matches = humps.Matches(camel).OfType().Select(m => m.Value); return matches.Any() @@ -20,17 +20,16 @@ namespace Orchard.Utility.Extensions { } public static string Ellipsize(this string text, int characterCount, string ellipsis) { - var cleanTailRegex = new Regex(@"\s+\S*$"); + if (string.IsNullOrWhiteSpace(text) || characterCount < 0 || text.Length <= characterCount) + return ""; - if (string.IsNullOrEmpty(text) || characterCount < 0 || text.Length <= characterCount) - return text; - - return cleanTailRegex.Replace(text.Substring(0, characterCount + 1), "") + ellipsis; + return Regex.Replace(text.Substring(0, characterCount + 1), @"\s+\S*$", "") + ellipsis; } public static string HtmlClassify(this string text) { if (string.IsNullOrWhiteSpace(text)) - return text; + return ""; + var friendlier = text.CamelFriendly(); return Regex.Replace(friendlier, @"[^a-zA-Z]+", m => m.Index == 0 ? "" : "-").ToLowerInvariant(); } @@ -42,10 +41,7 @@ namespace Orchard.Utility.Extensions { } public static string RemoveTags(this string html) { - var tagRegex = new Regex("<[^<>]*>", RegexOptions.Singleline); - var text = tagRegex.Replace(html, ""); - - return text; + return Regex.Replace(html, "<[^<>]*>", "", RegexOptions.Singleline); } } } \ No newline at end of file From 8efaf1ca208d22ab0fcb28addba953164d7eec7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Thu, 2 Dec 2010 08:10:32 -0800 Subject: [PATCH 05/20] Renaming ContainerCustomPart to CustomProperties --HG-- branch : dev --- .../Drivers/ContainerCustomPartDriver.cs | 30 ------------- .../Drivers/ContainerWidgetPartDriver.cs | 2 +- .../Drivers/CustomPropertiesDriver.cs | 30 +++++++++++++ .../Extensions/ContentQueryExtensions.cs | 42 +++++++++---------- src/Orchard.Web/Core/Containers/Migrations.cs | 4 +- ...rCustomPart.cs => CustomPropertiesPart.cs} | 4 +- .../Core/Containers/Placement.info | 2 +- .../Views/EditorTemplates/Container.cshtml | 6 +-- .../EditorTemplates/ContainerWidget.cshtml | 12 +++--- ...rCustom.cshtml => CustomProperties.cshtml} | 2 +- src/Orchard.Web/Core/Orchard.Core.csproj | 6 +-- 11 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 src/Orchard.Web/Core/Containers/Drivers/ContainerCustomPartDriver.cs create mode 100644 src/Orchard.Web/Core/Containers/Drivers/CustomPropertiesDriver.cs rename src/Orchard.Web/Core/Containers/Models/{ContainerCustomPart.cs => CustomPropertiesPart.cs} (65%) rename src/Orchard.Web/Core/Containers/Views/EditorTemplates/{ContainerCustom.cshtml => CustomProperties.cshtml} (84%) diff --git a/src/Orchard.Web/Core/Containers/Drivers/ContainerCustomPartDriver.cs b/src/Orchard.Web/Core/Containers/Drivers/ContainerCustomPartDriver.cs deleted file mode 100644 index fb2ac6767..000000000 --- a/src/Orchard.Web/Core/Containers/Drivers/ContainerCustomPartDriver.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Orchard.ContentManagement; -using Orchard.ContentManagement.Drivers; -using Orchard.ContentManagement.Handlers; -using Orchard.Core.Containers.Models; -using Orchard.Data; - -namespace Orchard.Core.Containers.Drivers { - public class ContainerCustomPartDriver : ContentPartDriver { - protected override DriverResult Editor(ContainerCustomPart part, dynamic shapeHelper) { - return Editor(part, null, shapeHelper); - } - - protected override DriverResult Editor(ContainerCustomPart part, IUpdateModel updater, dynamic shapeHelper) { - return ContentShape( - "Parts_ContainerCustom_Edit", - () => { - if (updater != null) - updater.TryUpdateModel(part, "ContainerCustom", null, null); - - return shapeHelper.EditorTemplate(TemplateName: "ContainerCustom", Model: part, Prefix: "ContainerCustom"); - }); - } - } - - public class ContainerCustomPartHandler : ContentHandler { - public ContainerCustomPartHandler(IRepository repository) { - Filters.Add(StorageFilter.For(repository)); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs b/src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs index d02f5f33a..fc107513c 100644 --- a/src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs +++ b/src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs @@ -86,7 +86,7 @@ namespace Orchard.Core.Containers.Drivers { part.Record.PageSize = 5; part.Record.OrderByProperty = part.Is() ? "CommonPart.PublishedUtc" : ""; part.Record.OrderByDirection = (int)OrderByDirection.Descending; - part.Record.FilterByProperty = "ContainerCustomPart.CustomOne"; + part.Record.FilterByProperty = "CustomPropertiesPart.CustomOne"; part.Record.FilterByOperator = "="; }); } diff --git a/src/Orchard.Web/Core/Containers/Drivers/CustomPropertiesDriver.cs b/src/Orchard.Web/Core/Containers/Drivers/CustomPropertiesDriver.cs new file mode 100644 index 000000000..8a7bda0aa --- /dev/null +++ b/src/Orchard.Web/Core/Containers/Drivers/CustomPropertiesDriver.cs @@ -0,0 +1,30 @@ +using Orchard.ContentManagement; +using Orchard.ContentManagement.Drivers; +using Orchard.ContentManagement.Handlers; +using Orchard.Core.Containers.Models; +using Orchard.Data; + +namespace Orchard.Core.Containers.Drivers { + public class CustomPropertiesPartDriver : ContentPartDriver { + protected override DriverResult Editor(CustomPropertiesPart part, dynamic shapeHelper) { + return Editor(part, null, shapeHelper); + } + + protected override DriverResult Editor(CustomPropertiesPart part, IUpdateModel updater, dynamic shapeHelper) { + return ContentShape( + "Parts_CustomProperties_Edit", + () => { + if (updater != null) + updater.TryUpdateModel(part, "CustomProperties", null, null); + + return shapeHelper.EditorTemplate(TemplateName: "CustomProperties", Model: part, Prefix: "CustomProperties"); + }); + } + } + + public class CustomPropertiesPartHandler : ContentHandler { + public CustomPropertiesPartHandler(IRepository repository) { + Filters.Add(StorageFilter.For(repository)); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Containers/Extensions/ContentQueryExtensions.cs b/src/Orchard.Web/Core/Containers/Extensions/ContentQueryExtensions.cs index d11e033ce..e2ba45a03 100644 --- a/src/Orchard.Web/Core/Containers/Extensions/ContentQueryExtensions.cs +++ b/src/Orchard.Web/Core/Containers/Extensions/ContentQueryExtensions.cs @@ -21,20 +21,20 @@ namespace Orchard.Core.Containers.Extensions ? query.OrderByDescending(record => record.Slug) : query.OrderBy(record => record.Slug); break; - case "ContainerCustomPart.CustomOne": + case "CustomPropertiesPart.CustomOne": query = descendingOrder - ? query.OrderByDescending(record => record.CustomOne) - : query.OrderBy(record => record.CustomOne); + ? query.OrderByDescending(record => record.CustomOne) + : query.OrderBy(record => record.CustomOne); break; - case "ContainerCustomPart.CustomTwo": + case "CustomPropertiesPart.CustomTwo": query = descendingOrder - ? query.OrderByDescending(record => record.CustomTwo) - : query.OrderBy(record => record.CustomTwo); + ? query.OrderByDescending(record => record.CustomTwo) + : query.OrderBy(record => record.CustomTwo); break; - case "ContainerCustomPart.CustomThree": + case "CustomPropertiesPart.CustomThree": query = descendingOrder - ? query.OrderByDescending(record => record.CustomThree) - : query.OrderBy(record => record.CustomThree); + ? query.OrderByDescending(record => record.CustomThree) + : query.OrderBy(record => record.CustomThree); break; default: // "CommonPart.PublishedUtc" query = descendingOrder @@ -69,18 +69,18 @@ namespace Orchard.Core.Containers.Extensions {"CommonPart.PublishedUtc|=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.PublishedUtc == DateTime.Parse(s)))}, // todo: (heskew) not practical as is. needs some sense of precision.... {"CommonPart.PublishedUtc|^=", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* can't modified PublishedUtc for partial comparisons */))}, // todo: (hesekw) this could benefit from a better filter implementation as this is currently very limited in functionality and I have no idea how the custom parts will be used by folks - {"ContainerCustomPart.CustomOne|<", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomOne.CompareTo(s) == -1*/))}, - {"ContainerCustomPart.CustomOne|>", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomOne.CompareTo(s) == 1*/))}, - {"ContainerCustomPart.CustomOne|=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomOne.Equals(s, StringComparison.OrdinalIgnoreCase)))}, - {"ContainerCustomPart.CustomOne|^=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomOne.StartsWith(s, StringComparison.OrdinalIgnoreCase)))}, - {"ContainerCustomPart.CustomTwo|<", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomTwo.CompareTo(s) == -1*/))}, - {"ContainerCustomPart.CustomTwo|>", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomTwo.CompareTo(s) == 1*/))}, - {"ContainerCustomPart.CustomTwo|=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomTwo.Equals(s, StringComparison.OrdinalIgnoreCase)))}, - {"ContainerCustomPart.CustomTwo|^=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomTwo.StartsWith(s, StringComparison.OrdinalIgnoreCase)))}, - {"ContainerCustomPart.CustomThree|<", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomThree.CompareTo(s) == -1*/))}, - {"ContainerCustomPart.CustomThree|>", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomThree.CompareTo(s) == 1*/))}, - {"ContainerCustomPart.CustomThree|=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomThree.Equals(s, StringComparison.OrdinalIgnoreCase)))}, - {"ContainerCustomPart.CustomThree|^=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomThree.StartsWith(s, StringComparison.OrdinalIgnoreCase)))}, + {"CustomPropertiesPart.CustomOne|<", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomOne.CompareTo(s) == -1*/))}, + {"CustomPropertiesPart.CustomOne|>", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomOne.CompareTo(s) == 1*/))}, + {"CustomPropertiesPart.CustomOne|=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomOne.Equals(s, StringComparison.OrdinalIgnoreCase)))}, + {"CustomPropertiesPart.CustomOne|^=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomOne.StartsWith(s, StringComparison.OrdinalIgnoreCase)))}, + {"CustomPropertiesPart.CustomTwo|<", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomTwo.CompareTo(s) == -1*/))}, + {"CustomPropertiesPart.CustomTwo|>", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomTwo.CompareTo(s) == 1*/))}, + {"CustomPropertiesPart.CustomTwo|=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomTwo.Equals(s, StringComparison.OrdinalIgnoreCase)))}, + {"CustomPropertiesPart.CustomTwo|^=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomTwo.StartsWith(s, StringComparison.OrdinalIgnoreCase)))}, + {"CustomPropertiesPart.CustomThree|<", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomThree.CompareTo(s) == -1*/))}, + {"CustomPropertiesPart.CustomThree|>", new Func, string, IContentQuery>((q, s) => q.Where(r => true /* CompareTo is not implemented - r.CustomThree.CompareTo(s) == 1*/))}, + {"CustomPropertiesPart.CustomThree|=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomThree.Equals(s, StringComparison.OrdinalIgnoreCase)))}, + {"CustomPropertiesPart.CustomThree|^=", new Func, string, IContentQuery>((q, s) => q.Where(r => r.CustomThree.StartsWith(s, StringComparison.OrdinalIgnoreCase)))}, }; } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Containers/Migrations.cs b/src/Orchard.Web/Core/Containers/Migrations.cs index decb6f714..4a91eaec6 100644 --- a/src/Orchard.Web/Core/Containers/Migrations.cs +++ b/src/Orchard.Web/Core/Containers/Migrations.cs @@ -25,7 +25,7 @@ namespace Orchard.Core.Containers { .Column("FilterByOperator") .Column("FilterByValue")); - SchemaBuilder.CreateTable("ContainerCustomPartRecord", + SchemaBuilder.CreateTable("CustomPropertiesPartRecord", table => table .ContentPartRecord() .Column("CustomOne") @@ -41,7 +41,7 @@ namespace Orchard.Core.Containers { ContentDefinitionManager.AlterPartDefinition("ContainerPart", builder => builder.Attachable()); ContentDefinitionManager.AlterPartDefinition("ContainablePart", builder => builder.Attachable()); - ContentDefinitionManager.AlterPartDefinition("ContainerCustomPart", builder => builder.Attachable()); + ContentDefinitionManager.AlterPartDefinition("CustomPropertiesPart", builder => builder.Attachable()); return 1; } diff --git a/src/Orchard.Web/Core/Containers/Models/ContainerCustomPart.cs b/src/Orchard.Web/Core/Containers/Models/CustomPropertiesPart.cs similarity index 65% rename from src/Orchard.Web/Core/Containers/Models/ContainerCustomPart.cs rename to src/Orchard.Web/Core/Containers/Models/CustomPropertiesPart.cs index a6a33965c..51afdcac3 100644 --- a/src/Orchard.Web/Core/Containers/Models/ContainerCustomPart.cs +++ b/src/Orchard.Web/Core/Containers/Models/CustomPropertiesPart.cs @@ -2,10 +2,10 @@ using Orchard.ContentManagement.Records; namespace Orchard.Core.Containers.Models { - public class ContainerCustomPart : ContentPart { + public class CustomPropertiesPart : ContentPart { } - public class ContainerCustomPartRecord : ContentPartRecord { + public class CustomPropertiesPartRecord : ContentPartRecord { public virtual string CustomOne { get; set; } public virtual string CustomTwo { get; set; } public virtual string CustomThree { get; set; } diff --git a/src/Orchard.Web/Core/Containers/Placement.info b/src/Orchard.Web/Core/Containers/Placement.info index b98c878cd..17d6f76a9 100644 --- a/src/Orchard.Web/Core/Containers/Placement.info +++ b/src/Orchard.Web/Core/Containers/Placement.info @@ -7,7 +7,7 @@ --> - + diff --git a/src/Orchard.Web/Core/Containers/Views/EditorTemplates/Container.cshtml b/src/Orchard.Web/Core/Containers/Views/EditorTemplates/Container.cshtml index e321e9841..d9cc0c7d2 100644 --- a/src/Orchard.Web/Core/Containers/Views/EditorTemplates/Container.cshtml +++ b/src/Orchard.Web/Core/Containers/Views/EditorTemplates/Container.cshtml @@ -6,9 +6,9 @@ @Html.SelectOption(Model.Record.OrderByProperty, "CommonPart.PublishedUtc", T("Date Published").Text) @Html.SelectOption(Model.Record.OrderByProperty, "RoutePart.Title", T("Title").Text) @Html.SelectOption(Model.Record.OrderByProperty, "RoutePart.Slug", T("Slug").Text) - @Html.SelectOption(Model.Record.OrderByProperty, "ContainerCustomPart.CustomOne", T("Custom 1").Text) - @Html.SelectOption(Model.Record.OrderByProperty, "ContainerCustomPart.CustomTwo", T("Custom 2").Text) - @Html.SelectOption(Model.Record.OrderByProperty, "ContainerCustomPart.CustomThree", T("Custom 3").Text) + @Html.SelectOption(Model.Record.OrderByProperty, "CustomPropertiesPart.CustomOne", T("Custom 1").Text) + @Html.SelectOption(Model.Record.OrderByProperty, "CustomPropertiesPart.CustomTwo", T("Custom 2").Text) + @Html.SelectOption(Model.Record.OrderByProperty, "CustomPropertiesPart.CustomThree", T("Custom 3").Text)