From 5e53b4dd46ac81bad6aaff75814cc3a10fb0a751 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 13 Sep 2010 14:48:22 -0700
Subject: [PATCH] Getting display in order for the (routable-specified) home
 page

--HG--
branch : theming
---
 .../Core/Contents/Views/Items/Content-HomePage.cshtml | 11 +++++++++++
 src/Orchard.Web/Core/HomePage/Views/HomePage.cshtml   | 11 -----------
 src/Orchard.Web/Core/Orchard.Core.csproj              |  4 ++--
 .../Routable/Services/RoutableHomePageProvider.cs     |  7 +++----
 src/Orchard.Web/Orchard.Web.csproj                    |  1 -
 .../Themes/Contoso/Views/HomePage/Home/Index.cshtml   |  5 -----
 6 files changed, 16 insertions(+), 23 deletions(-)
 create mode 100644 src/Orchard.Web/Core/Contents/Views/Items/Content-HomePage.cshtml
 delete mode 100644 src/Orchard.Web/Core/HomePage/Views/HomePage.cshtml
 delete mode 100644 src/Orchard.Web/Themes/Contoso/Views/HomePage/Home/Index.cshtml

diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content-HomePage.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content-HomePage.cshtml
new file mode 100644
index 000000000..29372907c
--- /dev/null
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content-HomePage.cshtml
@@ -0,0 +1,11 @@
+@{
+    //home page content - should fall back to items/content so this template is optional (e.g. in a theme)
+}
+<article>
+    <header>
+@Display(Model.Header)
+    </header>
+    <section>
+@Display(Model.primary)
+    </section>
+</article>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/HomePage/Views/HomePage.cshtml b/src/Orchard.Web/Core/HomePage/Views/HomePage.cshtml
deleted file mode 100644
index 0357b347d..000000000
--- a/src/Orchard.Web/Core/HomePage/Views/HomePage.cshtml
+++ /dev/null
@@ -1,11 +0,0 @@
-@model dynamic
-        <section style="background:#AAA;color:#000;padding:10px;">
-            <h1>HomePage shape template</h1>
-            <h2>I am the home page</h2>
-            <dl>
-                <dt>content item id</dt>
-                <dd>@Display(Model.Id)</dd>
-                <dt>the hard way to get at the raw body text</dt>
-                <dd>@Display(Model.Parts[3].Text)</dd>
-            </dl>
-        </section>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index fa4d17fbb..e458039d1 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -297,6 +297,7 @@
     <Content Include="PublishLater\Styles\ui.timepickr.css" />
     <Content Include="PublishLater\Views\EditorTemplates\Parts\PublishLater.ascx" />
     <Content Include="Reports\Module.txt" />
+    <None Include="Contents\Views\Items\Content-HomePage.cshtml" />
     <None Include="Reports\Views\Admin\Display.cshtml" />
     <None Include="Reports\Views\Admin\Index.cshtml" />
     <Content Include="Localization\Module.txt" />
@@ -335,6 +336,7 @@
     <Content Include="Web.config" />
     <Content Include="XmlRpc\Module.txt" />
     <None Include="Shapes\Views\Display.cshtml" />
+    <None Include="Shapes\Views\Menu.ascx_" />
     <None Include="XmlRpc\Views\Home\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
@@ -395,14 +397,12 @@
     <None Include="Contents\Views\Items\Content.Edit.cshtml" />
     <None Include="Contents\Views\Items\Content.Summary.cshtml" />
     <None Include="Contents\Views\Items\Content.SummaryAdmin.cshtml" />
-    <None Include="HomePage\Views\HomePage.cshtml" />
     <None Include="Shapes\Views\ContentZone.cshtml" />
     <None Include="Shapes\Views\DocumentZone.cshtml" />
     <None Include="Shapes\Views\Document.cshtml" />
     <None Include="Shapes\Views\User.cshtml" />
     <None Include="Shapes\Views\Header.cshtml" />
     <None Include="Shapes\Views\Layout.cshtml" />
-    <None Include="Shapes\Views\Menu.ascx_" />
     <None Include="Shapes\Views\Menu.cshtml" />
     <None Include="Shapes\Views\MenuItem.cshtml" />
     <None Include="Shapes\Views\Messages.ascx_" />
diff --git a/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs b/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs
index ac0437f0a..06a5d79fa 100644
--- a/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs
+++ b/src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs
@@ -1,6 +1,5 @@
 using System.Web.Mvc;
 using JetBrains.Annotations;
-using Orchard.ContentManagement.Aspects;
 using Orchard.Core.Routable.Models;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
@@ -38,11 +37,11 @@ namespace Orchard.Core.Routable.Services {
             if (contentItem == null || !contentItem.Is<RoutePart>())
                 return new NotFoundResult();
 
-            var model = _contentManager.BuildDisplayModel(contentItem, "Detail");
+            var model = _contentManager.BuildDisplayModel(contentItem, "_HomePage");
 
             return new ViewResult {
-                //ViewName = "~/Core/Routable/Views/Item/Display.ascx",
-                ViewData = new ViewDataDictionary<dynamic>(Shape.HomePage(model))
+                ViewName = "Display",
+                ViewData = new ViewDataDictionary<dynamic>(model)
             };
         }
     }
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index cae3f82bd..16e24d4b3 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -143,7 +143,6 @@
   <ItemGroup>
     <Content Include="Config\Sample.Host.config" />
     <None Include="Themes\Contoso\Views\Header.ascx_" />
-    <None Include="Themes\Contoso\Views\HomePage\Home\Index.cshtml" />
     <None Include="Themes\Contoso\Views\Layout.ascx_" />
     <None Include="Themes\Contoso\Views\Layout.HomePage.ascx_" />
     <None Include="Themes\SafeMode\Views\DocumentZone.cshtml" />
diff --git a/src/Orchard.Web/Themes/Contoso/Views/HomePage/Home/Index.cshtml b/src/Orchard.Web/Themes/Contoso/Views/HomePage/Home/Index.cshtml
deleted file mode 100644
index 7b70bbd12..000000000
--- a/src/Orchard.Web/Themes/Contoso/Views/HomePage/Home/Index.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-@model dynamic
-        <section style="background:#666;color:#fff;padding:10px;">
-            <h1>HomePage action template</h1>
-@Display(Model)
-        </section>            
\ No newline at end of file