From f1554f5631902ec29097cd9a7a039f4f2faabd07 Mon Sep 17 00:00:00 2001
From: jowall <jowall@microsoft.com>
Date: Fri, 5 Mar 2010 14:20:11 -0800
Subject: [PATCH] Some updates to the classic theme. Added a zone test file.

--HG--
branch : dev
---
 .../DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx     | 3 ++-
 src/Orchard.Web/Orchard.Web.csproj                         | 1 +
 .../Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx   | 5 ++---
 .../DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx     | 7 ++++---
 .../Views/DisplayTemplates/Items/Blogs.BlogPost.ascx       | 3 +--
 src/Orchard.Web/Themes/Classic/Views/Layout.ascx           | 7 +++++--
 src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx         | 3 +++
 7 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx
index 64282602b..0e2221336 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx
@@ -19,7 +19,8 @@
 </div>
 </form>--%>
 
-
 <div class="actions"><a href="<%=Url.BlogPostCreate(Model.Item) %>" class="add button primaryAction"><%=_Encoded("New Post")%></a></div>
+
+
 <% Html.Zone("primary");
    Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index ba4d3cf2f..4389b5032 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -182,6 +182,7 @@
     <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Pages.Page.Metadata.ascx" />
     <Content Include="Themes\Classic\Views\Footer.ascx" />
     <Content Include="Themes\Classic\Views\Layout.ascx" />
+    <Content Include="Themes\Classic\Views\ZoneTest.ascx" />
     <Content Include="Themes\Green\Content\Images\bodyBackground.gif" />
     <Content Include="Themes\Green\Content\Images\bodyBackground.png" />
     <Content Include="Themes\Green\Content\Images\commentpointer.gif" />
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx
index 87101c6d1..a6b3f67ab 100644
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx
@@ -3,8 +3,7 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-<h2><%=Html.TitleForPage(Model.Item.Name) %></h2>
+<h1><%=Html.TitleForPage(Model.Item.Name) %></h1>
 <% Html.RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest(Model.Item.Slug) });%>
 <% Html.RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd(Model.Item.Slug) });%>
-<% Html.Zone("primary", ":manage :metadata");
-   Html.ZonesAny(); %>
\ No newline at end of file
+<% Html.Zone("primary");%>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
index 3e51b9c82..355ab67b9 100644
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
@@ -4,8 +4,9 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
+<%Model.Zones.AddRenderPartial("zonetest", "ZoneTest", Model); %>
 <h2><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item)) %></h2>
-<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
+<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%> <% Html.Zone("zonetest");%></div>
 <div class="postsummary">
-<% Html.Zone("primary", ":manage :metadata"); %>
-</div>
+<% Html.Zone("primary"); %>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
index 512ffd705..b35bd5e9b 100644
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
@@ -11,5 +11,4 @@
        } %>
 </div>
 --%>
-<% Html.Zone("primary", ":metadata :manage"); // <- flipping metadata and manage to get closer to the desired markup
-   Html.ZonesAny(); %>
\ No newline at end of file
+<% Html.Zone("primary"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx
index d458dc7a6..71945c5fc 100644
--- a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx
@@ -1,6 +1,10 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels" %>
+<%@ Import Namespace="Orchard.ContentManagement"%>
+<%@ Import Namespace="Orchard.Core.Common.Models"%>
+<%@ Import Namespace="Orchard.Blogs.Extensions"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
 <%
   Html.RegisterStyle("site.css");
   Html.RegisterStyle("blog.css");
@@ -41,7 +45,6 @@
             </ul>
         </div>
         <%-- End Content --%>
-        <%Html.Zone("footer");%>
         <% Html.Include("Footer"); %>
     </div>
 </div>
diff --git a/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx b/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx
new file mode 100644
index 000000000..418a5d370
--- /dev/null
+++ b/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx
@@ -0,0 +1,3 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>