From e73efc95c2d96660cfe962c540882e374a5b3369 Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Thu, 14 Jan 2010 00:41:00 +0000
Subject: [PATCH] - Fixing the theme preview image path for the current theme
 in the themes admin. - Rolling back the markup in the Orange theme's layout a
 little more

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045372
---
 src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx | 2 +-
 src/Orchard.Web/Themes/Orange/Views/layout.ascx    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
index 3137688ee..42cc955eb 100644
--- a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
@@ -10,7 +10,7 @@
    } else {
     %><h3><%=Html.Encode(Model.CurrentTheme.DisplayName) %></h3>
      <p>
-        <%=Html.Image(Html.ThemePath("/Theme.gif"), Html.Encode(Model.CurrentTheme.DisplayName), null)%><br />
+        <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.gif"), Html.Encode(Model.CurrentTheme.DisplayName), null)%><br />
         <%=_Encoded("By") %> <%=Html.Encode(Model.CurrentTheme.Author) %><br />
         <%=Html.Encode(Model.CurrentTheme.Version) %><br />
         <%=Html.Encode(Model.CurrentTheme.Description) %><br />
diff --git a/src/Orchard.Web/Themes/Orange/Views/layout.ascx b/src/Orchard.Web/Themes/Orange/Views/layout.ascx
index ee5c390aa..c1a4241b9 100644
--- a/src/Orchard.Web/Themes/Orange/Views/layout.ascx
+++ b/src/Orchard.Web/Themes/Orange/Views/layout.ascx
@@ -7,14 +7,14 @@ Model.Zones.AddRenderPartial("menu", "menu", Model);
 Model.Zones.AddRenderPartial("content:before", "messages", Model.Messages);
 %>
 <div class="page">
-    <div id="header"><%Html.Zone("header");%>.ToHtmlString();
-        Html.Zone("header").Render();
+    <div id="header"><%
+        Html.Zone("header");
         Html.Zone("menu"); %>
     </div>
     <div id="main"><%
-        Html.Zone("content"); %>
+        Html.ZoneBody("content"); %>
         <div id="footer"><%
-            Html.Zone("footer", ()=>Html.RenderPartial("footer", Model));
+            Html.Zone("footer");
         %></div>
     </div>
 </div>
\ No newline at end of file