From 9f623ddbf259bc791553c0a705a9e157b3eea0e9 Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Fri, 11 Dec 2009 20:13:47 +0000
Subject: [PATCH] Starting to make use of zone names and position for rendering
 view parts in Blogs

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043818
---
 .../Packages/Orchard.Blogs/Models/BlogHandler.cs          | 4 ++--
 .../Packages/Orchard.Blogs/Models/BlogPostHandler.cs      | 8 ++++----
 .../Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx  | 1 +
 .../Views/Models/EditorTemplates/BlogPost.ascx            | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogHandler.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogHandler.cs
index 7457cb9c7..2aa2bbae1 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogHandler.cs
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogHandler.cs
@@ -19,11 +19,11 @@ namespace Orchard.Blogs.Models {
             Filters.Add(new ContentItemTemplates<Blog>("Blog", "Detail", "DetailAdmin", "Summary", "SummaryAdmin"));
 
             OnGetEditorViewModel<Blog>((context, blog) =>
-                context.AddEditor(new TemplateViewModel(blog) {TemplateName = "BlogFields"})
+                context.AddEditor(new TemplateViewModel(blog) { TemplateName = "BlogFields", ZoneName = "primary", Position = "1" })
             );
 
             OnUpdateEditorViewModel<Blog>((context, blog) => {
-                context.AddEditor(new TemplateViewModel(blog) {TemplateName = "BlogFields"});
+                context.AddEditor(new TemplateViewModel(blog) { TemplateName = "BlogFields", ZoneName = "primary", Position = "1" });
                 context.Updater.TryUpdateModel(blog, "", null, null);
             });
         }
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs
index 16059f1b5..b11d901cf 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs
@@ -75,13 +75,13 @@ namespace Orchard.Blogs.Models {
             });
 
             OnGetEditorViewModel<BlogPost>((context, blogPost) => {
-                context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsPrimary", ZoneName = "body", Position = "1" });
-                context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsSecondary", ZoneName = "sidebar", Position = "1" });
+                context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsPrimary", ZoneName = "primary", Position = "1" });
+                context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsSecondary", ZoneName = "secondary", Position = "1" });
             });
 
             OnUpdateEditorViewModel<BlogPost>((context, blogPost) => {
-                context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsPrimary", ZoneName = "body", Position = "1" });
-                context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsSecondary", ZoneName = "sidebar", Position = "1" });
+                context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsPrimary", ZoneName = "primary", Position = "1" });
+                context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsSecondary", ZoneName = "secondary", Position = "1" });
                 context.Updater.TryUpdateModel(blogPost, "", null, null);
             });
         }
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx
index 88a4bf383..21dd49db8 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx
@@ -2,4 +2,5 @@
 <%@ Import Namespace="Orchard.Models.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
+<%=Html.EditorZone("primary") %>
 <%=Html.EditorZonesAny() %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx
index ac7d6ce2c..80876fcfc 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx
@@ -4,11 +4,11 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <div class="sections">
     <div class="primary">
-        <%=Html.EditorZone("body") %>
-        <%=Html.EditorZonesExcept("sidebar") %>
+        <%=Html.EditorZone("primary") %>
+        <%=Html.EditorZonesExcept("secondary") %>
     </div>
     <div class="secondary">
-        <%=Html.EditorZone("sidebar") %>
+        <%=Html.EditorZone("secondary")%>
         <fieldset>
             <input class="button" type="submit" name="submit.Save" value="Save"/>
         </fieldset>