From d2282e334ba75eededef2e2cce7082af80fb3493 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 2 Jul 2012 17:38:37 -0700 Subject: [PATCH] #18634: Fixing Safe Mode Document shape Work Item: 18634 --HG-- branch : 1.x --- .../Modules/Orchard.Setup/SetupMode.cs | 2 +- .../Themes/SafeMode/Views/Document.cshtml | 21 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs index db0f13d9d..e8efbe99d 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs @@ -149,7 +149,7 @@ namespace Orchard.Setup { class SafeModeSite : ContentPart, ISite { public string PageTitleSeparator { - get { return "*"; } + get { return " - "; } } public string SiteName { diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml b/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml index 88727f382..694dea582 100644 --- a/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml +++ b/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml @@ -2,22 +2,21 @@ @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() - @{ - //todo: (heskew) have resource modules that can be leaned on (like a jQuery module that knows about various CDNs and jQuery's version and min naming schemes) - //todo: (heskew) this is an interim solution to inlude jQuery in every page and still allow that to be overriden in some theme by it containing a headScripts partial - } - @*Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);*@ - @*Html.Zone("head", ":metas :styles :scripts"); %>*@ - @Display(Model.Head) - + + @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)