From 9183641da019ff6abf05cf2480175c69352049c0 Mon Sep 17 00:00:00 2001 From: Lombiq Date: Sat, 21 Feb 2015 17:04:38 +0100 Subject: [PATCH] #20983: Removing unneeded and wrong SafeMode Document template and adding simple Document template to Orchard.Setup. Orchard.Setup implicitly depended on the SafeMode theme, removing this dependency now. The Setup Document now depends on Core Shapes because of html5.js, but this is much less risky. Work Item: 20983 --- .../Orchard.Setup/Orchard.Setup.csproj | 3 ++ .../Orchard.Setup}/Views/Document.cshtml | 44 +++++++++---------- src/Orchard.Web/Themes/Themes.csproj | 1 - 3 files changed, 25 insertions(+), 23 deletions(-) rename src/Orchard.Web/{Themes/SafeMode => Modules/Orchard.Setup}/Views/Document.cshtml (90%) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj index e6b02c59f..ed3cf33c0 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj @@ -131,6 +131,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Document.cshtml similarity index 90% rename from src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml rename to src/Orchard.Web/Modules/Orchard.Setup/Views/Document.cshtml index 694dea582..140b20cbb 100644 --- a/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Document.cshtml @@ -1,23 +1,23 @@ -@using Orchard.Mvc.Html; -@using Orchard.UI.Resources; -@{ - RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")}); - Script.Include("html5.js").UseCondition("lt IE 9").AtHead(); - - string title = Convert.ToString(Model.Title); - string siteName = Convert.ToString(WorkContext.CurrentSite.SiteName); -} - - - - - @Html.Title(title, siteName) - @Display(Model.Head) - - - -@* Layout (template) is in the Body zone @ the default position (nothing, zero, zilch) *@ -@Display(Model.Body) -@Display(Model.Tail) - +@using Orchard.Mvc.Html; +@using Orchard.UI.Resources; +@{ + RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")}); + Script.Include("~/Core/Shapes/Scripts/html5.js").UseCondition("lt IE 9").AtHead(); + + string title = Convert.ToString(Model.Title); + string siteName = Convert.ToString(WorkContext.CurrentSite.SiteName); +} + + + + + @Html.Title(title, siteName) + @Display(Model.Head) + + + +@* Layout (template) is in the Body zone @ the default position (nothing, zero, zilch) *@ +@Display(Model.Body) +@Display(Model.Tail) + \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj index d98317d1e..c9fdc1750 100644 --- a/src/Orchard.Web/Themes/Themes.csproj +++ b/src/Orchard.Web/Themes/Themes.csproj @@ -109,7 +109,6 @@ -