diff --git a/src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs b/src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs index 1e7e55a07..bd6a106ff 100644 --- a/src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs +++ b/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")); + context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { Position = "9" }); } @@ -132,7 +132,7 @@ namespace Orchard.Core.Common.Providers { instance.Owner = newOwner; } } - context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect")); + context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { Position = "9" }); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs index dd77cd9ef..16059f1b5 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs @@ -74,12 +74,14 @@ namespace Orchard.Blogs.Models { } }); - OnGetEditorViewModel((context, blogPost) => - context.AddEditor(new TemplateViewModel(blogPost) {TemplateName = "BlogPostFields"}) - ); + OnGetEditorViewModel((context, blogPost) => { + context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsPrimary", ZoneName = "body", Position = "1" }); + context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsSecondary", ZoneName = "sidebar", Position = "1" }); + }); OnUpdateEditorViewModel((context, blogPost) => { - context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFields" }); + context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsPrimary", ZoneName = "body", Position = "1" }); + context.AddEditor(new TemplateViewModel(blogPost) { TemplateName = "BlogPostFieldsSecondary", ZoneName = "sidebar", Position = "1" }); context.Updater.TryUpdateModel(blogPost, "", null, null); }); } diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj index 478e78b01..906878724 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj @@ -109,7 +109,7 @@ - + @@ -119,6 +119,7 @@ + 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 b9dd43f6e..ac7d6ce2c 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 @@ -2,4 +2,15 @@ <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -<%=Html.EditorZonesAny() %> \ No newline at end of file +
+
+ <%=Html.EditorZone("body") %> + <%=Html.EditorZonesExcept("sidebar") %> +
+
+ <%=Html.EditorZone("sidebar") %> +
+ +
+
+
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFields.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFields.ascx deleted file mode 100644 index ed0b123e6..000000000 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFields.ascx +++ /dev/null @@ -1,31 +0,0 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Blogs.Models"%> -<%@ Import Namespace="Orchard.Blogs.Extensions"%> -<%@ Import Namespace="Orchard.Blogs.ViewModels"%> -
-
- <%-- todo: (heskew) thin out the fieldsets if they become overkill --%> -
- - <%=Html.TextBoxFor(m => m.Title, new { id = "title", @class = "large text" })%> -
-
- - <%=Html.TextBoxFor(m => m.Slug, new { id = "permalink", @class = "text" })%> -
-
-
-
- Publish Settings -
- -
- <%--
- -
-
- - <%=Html.EditorFor(m => m.Published) %> -
--%> -
-
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFieldsPrimary.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFieldsPrimary.ascx new file mode 100644 index 000000000..12c8c287d --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFieldsPrimary.ascx @@ -0,0 +1,12 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Blogs.Extensions"%> +<%@ Import Namespace="Orchard.Blogs.ViewModels"%> +
+ + <%=Html.TextBoxFor(m => m.Title, new { id = "title", @class = "large text" })%> +
+
+ + <%=Html.TextBoxFor(m => m.Slug, new { id = "permalink", @class = "text" })%> +
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFieldsSecondary.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFieldsSecondary.ascx new file mode 100644 index 000000000..26bd69bd2 --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPostFieldsSecondary.ascx @@ -0,0 +1,15 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Blogs.Extensions"%> +<%@ Import Namespace="Orchard.Blogs.ViewModels"%> +
+ Publish Settings +
+
+<%--
+ +
+
+ + <%=Html.EditorFor(m => m.Published) %> +
--%> \ No newline at end of file