From 7c4d00ee013aae491eafd40d437faa6fa040ca0b Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Tue, 21 Sep 2010 21:43:46 -0700
Subject: [PATCH] Converting/cleaning a few templates in Core.Shapes

--HG--
branch : dev
---
 src/Orchard.Web/Core/Orchard.Core.csproj              |  6 ++----
 .../Views/DisplayTemplates/Items/ContentItem.ascx     |  5 -----
 .../Views/EditorTemplates/Items/ContentItem.ascx      |  5 -----
 src/Orchard.Web/Core/Shapes/Views/UI/Switchable.ascx  | 11 -----------
 .../Core/Shapes/Views/UI/Switchable.cshtml            |  5 +++++
 5 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 src/Orchard.Web/Core/Shapes/Views/DisplayTemplates/Items/ContentItem.ascx
 delete mode 100644 src/Orchard.Web/Core/Shapes/Views/EditorTemplates/Items/ContentItem.ascx
 delete mode 100644 src/Orchard.Web/Core/Shapes/Views/UI/Switchable.ascx
 create mode 100644 src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml

diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 639b2e755..46971259d 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -267,7 +267,7 @@
     <None Include="Contents\Views\Admin\List.cshtml" />
     <None Include="Feeds\Views\Feed.cshtml" />
     <None Include="Localization\Views\EditorTemplates\Parts\Localization.Translation.cshtml" />
-    <Content Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.ascx" />
+    <None Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.cshtml" />
     <None Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.SummaryAdmin.cshtml" />
     <Content Include="Messaging\Module.txt" />
     <None Include="Messaging\Views\EditorTemplates\Parts\Messaging.MessageSettings.cshtml" />
@@ -319,12 +319,10 @@
     <Content Include="Shapes\Styles\Images\toolBarHoverButtonBackground.gif" />
     <Content Include="Shapes\Styles\jquery.switchable.css" />
     <Content Include="Shapes\Styles\special.css" />
-    <Content Include="Shapes\Views\DisplayTemplates\Items\ContentItem.ascx" />
-    <Content Include="Shapes\Views\EditorTemplates\Items\ContentItem.ascx" />
     <None Include="Shapes\Views\HeadPreload.cshtml" />
     <None Include="Shapes\Views\Message.cshtml" />
     <None Include="Shapes\Views\NotFound.cshtml" />
-    <Content Include="Shapes\Views\UI\Switchable.ascx" />
+    <None Include="Shapes\Views\UI\Switchable.cshtml" />
     <Content Include="Web.config" />
     <Content Include="XmlRpc\Module.txt" />
     <None Include="Settings\Views\EditorTemplates\Parts\Settings.SiteSettingsPart.cshtml" />
diff --git a/src/Orchard.Web/Core/Shapes/Views/DisplayTemplates/Items/ContentItem.ascx b/src/Orchard.Web/Core/Shapes/Views/DisplayTemplates/Items/ContentItem.ascx
deleted file mode 100644
index 51c472a16..000000000
--- a/src/Orchard.Web/Core/Shapes/Views/DisplayTemplates/Items/ContentItem.ascx
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<% Html.Zone("primary");
-   Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Shapes/Views/EditorTemplates/Items/ContentItem.ascx b/src/Orchard.Web/Core/Shapes/Views/EditorTemplates/Items/ContentItem.ascx
deleted file mode 100644
index 51c472a16..000000000
--- a/src/Orchard.Web/Core/Shapes/Views/EditorTemplates/Items/ContentItem.ascx
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<% Html.Zone("primary");
-   Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.ascx b/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.ascx
deleted file mode 100644
index 11ba8a8e7..000000000
--- a/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.ascx
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
-<%@ Import Namespace="Orchard.UI.Resources" %>
-<%
-    // todo: use Style.Require and Script.Require when this is converted to use a base Orchard view type.
-    var rm = Html.Resolve<IResourceManager>();
-    rm.Require("stylesheet", "Switchable");
-    rm.Require("script", "Switchable");
-    var cssClass = string.Format("{0} switchable", Model);
-    
- %>
- <%:cssClass %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml b/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml
new file mode 100644
index 000000000..8f3d5b92c
--- /dev/null
+++ b/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml
@@ -0,0 +1,5 @@
+@{
+    Style.Require("Switchable");
+    Script.Require("Switchable");
+}
+@string.Format("{0} switchable", Model)
\ No newline at end of file