Some work towards standardizing on (some) template zone names and positions...

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044851

src/Orchard.Web/Core/Common/Providers/BodyAspectHandler.cs

@@ -16,18 +16,18 @@ namespace Orchard.Core.Common.Providers {
 
             OnGetDisplayViewModel<BodyAspect>((context, body) => {
                 var model = new BodyDisplayViewModel { BodyAspect = body };
-                context.AddDisplay(new TemplateViewModel(model, TemplatePrefix) { TemplateName = TemplateName, ZoneName = "body" });
+                context.AddDisplay(new TemplateViewModel(model, TemplatePrefix) { TemplateName = TemplateName, ZoneName = "primary" });
             });
 
             OnGetEditorViewModel<BodyAspect>((context, body) => {
                 var model = new BodyEditorViewModel { BodyAspect = body, TextEditorTemplate = DefaultTextEditorTemplate };
-                context.AddEditor(new TemplateViewModel(model, TemplatePrefix) { TemplateName = TemplateName, ZoneName = "body" });
+                context.AddEditor(new TemplateViewModel(model, TemplatePrefix) { TemplateName = TemplateName, ZoneName = "primary" });
             });
 
             OnUpdateEditorViewModel<BodyAspect>((context, body) => {
                 var model = new BodyEditorViewModel { BodyAspect = body, TextEditorTemplate = DefaultTextEditorTemplate };
                 context.Updater.TryUpdateModel(model, TemplatePrefix, null, null);
-                context.AddEditor(new TemplateViewModel(model, TemplatePrefix) { TemplateName = TemplateName, ZoneName = "body" });
+                context.AddEditor(new TemplateViewModel(model, TemplatePrefix) { TemplateName = TemplateName, ZoneName = "primary" });
             });
         }
     }

src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs

@@ -102,7 +102,7 @@ namespace Orchard.Core.Common.Providers {
             if (instance.Owner != null)
                 viewModel.Owner = instance.Owner.UserName;
 
-            context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { TemplateName="Parts/Common.Owner", Position = "9" });
+            context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" });
         }
 
 
@@ -132,7 +132,7 @@ namespace Orchard.Core.Common.Providers {
                     instance.Owner = newOwner;
                 }
             }
-            context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { TemplateName = "Parts/Common.Owner", Position = "9" });
+            context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" });
         }
     }
 }

src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx

@@ -10,4 +10,5 @@
        %><div class="posted">Posted by <%=Html.Encode(Model.Item.Creator.UserName)%> <%=Html.PublishedWhen(Model.Item)%></div><%
        } %>
 </div>
+<% Html.Zone("primary"); %>
 <% Html.ZonesAny(); %>

src/Orchard.Web/Packages/Orchard.Comments/Controllers/HasCommentsDriver.cs

@@ -9,6 +9,8 @@ namespace Orchard.Comments.Controllers {
                 return null;
             }
 
+            // todo: (heskew) need to be more flexible with displaying parts somehow. e.g. where should the...
+            // comment count go in any given skin or what if the skin builder doesn't want the count
             if (displayType.StartsWith("Detail")) {
                 return Combined(
                     PartTemplate(part, "Parts/Comments.Count").Location("body", "above.5"),
@@ -19,12 +21,12 @@ namespace Orchard.Comments.Controllers {
         }
 
         protected override DriverResult Editor(HasComments part) {
-            return PartTemplate(part, "Parts/Comments.HasComments");
+            return PartTemplate(part, "Parts/Comments.HasComments").Location("primary", "99");
         }
 
         protected override DriverResult Editor(HasComments part, IUpdateModel updater) {
             updater.TryUpdateModel(part, Prefix, null, null);
-            return PartTemplate(part, "Parts/Comments.HasComments");
+            return PartTemplate(part, "Parts/Comments.HasComments").Location("primary", "99");
         }
     }
 }

src/Orchard.Web/Packages/Orchard.Tags/Controllers/HasTagsDriver.cs

@@ -25,7 +25,7 @@ namespace Orchard.Tags.Controllers {
             var model = new EditTagsViewModel {
                 Tags = string.Join(", ", part.CurrentTags.Select((t, i) => t.TagName).ToArray())
             };
-            return PartTemplate(model, "Parts/Tags.EditTags");
+            return PartTemplate(model, "Parts/Tags.EditTags").Location("primary", "9");
         }
 
         protected override DriverResult Editor(HasTags part, IUpdateModel updater) {
@@ -36,7 +36,7 @@ namespace Orchard.Tags.Controllers {
             var tagNames = TagHelpers.ParseCommaSeparatedTagNames(model.Tags);
             _tagService.UpdateTagsForContentItem(part.ContentItem.Id, tagNames);
 
-            return PartTemplate(model, "Parts/Tags.EditTags");
+            return PartTemplate(model, "Parts/Tags.EditTags").Location("primary", "9");
         }
     }
 }