Changing primary content zone to "Primary" (from "primary")

--HG--
branch : dev

src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs

@@ -41,7 +41,7 @@ namespace Orchard.Core.Common.DataMigrations {
         public int UpdateFrom1() {
             ContentDefinitionManager.AlterPartDefinition(typeof(BodyPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "primary", Position = "5" }},
+                    {"Default", new ContentLocation { Zone = "Primary", Position = "5" }},
                 }));
             return 2;
         }
@@ -50,7 +50,7 @@ namespace Orchard.Core.Common.DataMigrations {
             ContentDefinitionManager.AlterPartDefinition(typeof(CommonPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
                     {"Default", new ContentLocation { Zone = "metadata", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "20" }},
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "20" }},
                 }));
             return 3;
         }

src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs

@@ -19,14 +19,14 @@ namespace Orchard.Core.Common.Drivers {
         }
 
         protected override DriverResult Display(ContentPart part, TextField field, string displayType) {
-            var location = field.GetLocation(displayType, "primary", "1");
+            var location = field.GetLocation(displayType, "Primary", "1");
 
             return ContentFieldTemplate(field, TemplateName, GetPrefix(field, part))
                 .Location(location);
         }
 
         protected override DriverResult Editor(ContentPart part, TextField field) {
-            var location = field.GetLocation("Editor", "primary", "1");
+            var location = field.GetLocation("Editor", "Primary", "1");
 
             return ContentFieldTemplate(field, TemplateName, GetPrefix(field, part))
                 .Location(location);

src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml

@@ -1,6 +1,6 @@
 <div class="sections">
     <div class="primary">
-        @Display(Model.primary)
+        @Display(Model.Primary)
     </div>
     <div class="secondary">
         @Display(Model.secondary)

src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml

@@ -1,3 +1,3 @@
 content item -> @Model.ContentItem.ContentType
 
-@Display(Model.primary)
+@Display(Model.Primary)

src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml

@@ -15,5 +15,5 @@
         @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
         <br />@Display(Model.meta)
     </div>
-    <div class="primary">@Display(Model.primary)</div>
+    <div class="primary">@Display(Model.Primary)</div>
 </div>

src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml

@@ -3,6 +3,6 @@
 @Display(Model.Header)
     </header>
     <section>
-@Display(Model.primary)
+@Display(Model.Primary)
     </section>
 </article>

src/Orchard.Web/Core/ContentsLocation/Settings/LocationSettingsEditorEvents.cs

@@ -99,7 +99,7 @@ namespace Orchard.Core.ContentsLocation.Settings {
                 var viewModel = new LocationSettingsViewModel {
                     Definition = location,
                     Location = settings.Get(location.Name),
-                    DefaultLocation = new ContentLocation { Zone = "primary", Position = "1" }
+                    DefaultLocation = new ContentLocation { Zone = "Primary", Position = "1" }
                 };
                 yield return DefinitionTemplate(viewModel, templateName: "LocationSettings", prefix: location.Name);
             }

src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs

@@ -22,8 +22,8 @@ namespace Orchard.Core.Localization.DataMigrations {
         public int UpdateFrom1() {
             ContentDefinitionManager.AlterPartDefinition(typeof(LocalizationPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "primary", Position = "5" }},
+                    {"Default", new ContentLocation { Zone = "Primary", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "1" }},
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }},
                 }));
             return 2;
         }

src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs

@@ -39,7 +39,7 @@ namespace Orchard.Core.Navigation.DataMigrations {
         public int UpdateFrom2() {
             ContentDefinitionManager.AlterPartDefinition(typeof(MenuPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "9" }}
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "9" }}
                 }));
             return 3;
         }

src/Orchard.Web/Core/Routable/Migrations.cs

@@ -24,7 +24,7 @@ namespace Orchard.Core.Routable {
         public int UpdateFrom1() {
             ContentDefinitionManager.AlterPartDefinition(typeof(RoutePart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "before.5" }}
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "before.5" }}
                 } ));
 
             return 2;

src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml

@@ -2,7 +2,7 @@
 @using (Html.BeginFormAntiForgeryPost()) {
 @Html.ValidationSummary()
 
-@Display(Model.primary)
+@Display(Model.Primary)
 <fieldset>
     <input class="button primaryAction" type="submit" value="@T("Save")" />
 </fieldset>

src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs

@@ -51,7 +51,7 @@ namespace Orchard.Blogs.Drivers {
                                           .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";
-                var contentShape = ContentShape(blogPostList).Location("primary");
+                var contentShape = ContentShape(blogPostList).Location("Primary");
                 driverResults.Add(contentShape);
             }
             else if (!displayType.Contains("Summary")) {
@@ -60,7 +60,7 @@ namespace Orchard.Blogs.Drivers {
                                           .Select(bp => _contentManager.BuildDisplay(bp, "Summary.BlogPost")));
                 var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list);
                 blogPostList.Metadata.Type = "Parts_Blogs_BlogPost.List";
-                var contentShape = ContentShape(blogPostList).Location("primary");
+                var contentShape = ContentShape(blogPostList).Location("Primary");
                 driverResults.Add(contentShape);
 
                 _feedManager.Register(part);

src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs

@@ -51,7 +51,7 @@ namespace Orchard.Blogs {
         public int UpdateFrom2() {
             ContentDefinitionManager.AlterPartDefinition(typeof(BlogPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "1" }}
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }}
                 }));
             return 3;
         }

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml

@@ -4,4 +4,4 @@
 @Display(Model.manage)
 <div class="manage"><a href="@Url.BlogPostCreate((BlogPart)Model.ContentItem.Get(typeof(BlogPart)))" class="add button primaryAction">@T("New Post")</a></div>
 @Display(Model.metadata)
-@Display(Model.primary)
+@Display(Model.Primary)

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml

@@ -7,4 +7,4 @@
 <h1>@Html.TitleForPage((string)Model.Title)</h1>
 @Display(Model.manage)
 @Display(Model.metadata)
-@Display(Model.primary)
+@Display(Model.Primary)

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml

@@ -1,3 +1,3 @@
 <h1>@Html.TitleForPage((string)Model.Title)</h1>
 @Display(Model.metadata)
-@Display(Model.primary)
+@Display(Model.Primary)

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml

@@ -1,4 +1,4 @@
 @Html.AddTitleParts(Model.Title)
-@Display(Model.primary)
+@Display(Model.Primary)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111 Content.Edit.Blog !!!!!!!!!!!!!!!!!!!!!!!!11
 <fieldset><input class="button primaryAction" type="submit" value="@T("Add")" /></fieldset>

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml

@@ -5,7 +5,7 @@
 }
 <div class="sections">
     <div class="primary">
-@Display(Model.primary)
+@Display(Model.Primary)
     </div>
     <div class="secondary">
 @Display(Model.secondary)

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml

@@ -5,4 +5,4 @@
 @using Orchard.Core.Common.ViewModels;
 <h2>@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h2>
 <div class="meta">@Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T) | @Display(Model.meta)</div>
-<div class="content">@Display(Model.primary)</div>
+<div class="content">@Display(Model.Primary)</div>

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml

@@ -18,5 +18,5 @@
         @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
         <br />@Display(Model.meta)
     </div>
-    <div class="primary">@Display(Model.primary)</div>
+    <div class="primary">@Display(Model.Primary)</div>
 </div>

src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs

@@ -68,11 +68,11 @@ namespace Orchard.Comments {
         public int UpdateFrom2() {
             ContentDefinitionManager.AlterPartDefinition(typeof(CommentsPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "primary", Position = "before.5" }},
+                    {"Default", new ContentLocation { Zone = "Primary", Position = "before.5" }},
-                    {"Detail", new ContentLocation { Zone = "primary", Position = "after.5" }},
+                    {"Detail", new ContentLocation { Zone = "Primary", Position = "after.5" }},
                     {"SummaryAdmin", new ContentLocation { Zone = "meta", Position = null }},
                     {"Summary", new ContentLocation { Zone = "meta", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "10" }},
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "10" }},
                 }));
 
             ContentDefinitionManager.AlterPartDefinition(typeof(CommentsContainerPart).Name, cfg => cfg

src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs

@@ -28,8 +28,8 @@ namespace Orchard.Tags {
         public int UpdateFrom1() {
             ContentDefinitionManager.AlterPartDefinition(typeof(TagsPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "primary", Position = "49" }},
+                    {"Default", new ContentLocation { Zone = "Primary", Position = "49" }},
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "9" }},
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "9" }},
                 }));
             return 2;
         }

src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs

@@ -82,21 +82,21 @@ namespace Orchard.Widgets {
             ContentDefinitionManager.AlterPartDefinition(typeof(LayerPart).Name, 
                 cfg => cfg
                     .WithLocation(new Dictionary<string, ContentLocation> {
-                        {"Editor", new ContentLocation { Zone = "primary", Position = "1" }}
+                        {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }}
                     })
                 );
 
             ContentDefinitionManager.AlterPartDefinition(typeof(WidgetPart).Name, 
                 cfg => cfg
                     .WithLocation(new Dictionary<string, ContentLocation> {
-                        {"Editor", new ContentLocation { Zone = "primary", Position = "1" }}
+                        {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }}
                    })
                 );
 
             ContentDefinitionManager.AlterPartDefinition(typeof(WidgetBagPart).Name,
                 cfg => cfg
                     .WithLocation(new Dictionary<string, ContentLocation> {
-                        {"Editor", new ContentLocation {Zone = "primary", Position = "5"}}
+                        {"Editor", new ContentLocation {Zone = "Primary", Position = "5"}}
                     })
                 );
             ContentDefinitionManager.AlterTypeDefinition("WidgetPage",

src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml

@@ -7,4 +7,4 @@
 <h1>@Html.TitleForPage((string)Model.Title)</h1>
 @Display(Model.manage)
 @Display(Model.metadata)
-@Display(Model.primary)
+@Display(Model.Primary)

src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs

@@ -10,7 +10,7 @@ namespace Orchard.ContentManagement.Handlers {
         public TemplateFilterForRecord(string prefix, string templateName) {
             _prefix = prefix;
             _templateName = templateName;
-            _location = "primary";
+            _location = "Primary";
             _position = "5";
         }