lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

#20983: Removing unneeded and wrong SafeMode Document template and adding simple Document template to Orchard.Setup.

Browse Source 
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
This commit is contained in:
Lombiq
2015-02-21 17:04:51 +01:00
committed by Zoltán Lehóczky
parent a713e9d260
commit 9183641da0
3 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+3
View File
@@ -131,6 +131,9 @@
<ItemGroup>
<Content Include="web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Document.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml → src/Orchard.Web/Modules/Orchard.Setup/Views/Document.cshtml
+22 -22
View File
@@ -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);
}
<!DOCTYPE html>
<html lang="@WorkContext.CurrentCulture" class="static @Html.ClassForPage()">
<head>
<meta charset="utf-8" />
<title>@Html.Title(title, siteName)</title>
@Display(Model.Head)
<script> (function (d) { d.className = "dyn" + d.className.substring(6, d.className.length); })(document.documentElement);</script>
</head>
<body>
@* Layout (template) is in the Body zone @ the default position (nothing, zero, zilch) *@
@Display(Model.Body)
@Display(Model.Tail)
</body>
@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);
}
<!DOCTYPE html>
<html lang="@WorkContext.CurrentCulture" class="static @Html.ClassForPage()">
<head>
<meta charset="utf-8" />
<title>@Html.Title(title, siteName)</title>
@Display(Model.Head)
<script> (function (d) { d.className = "dyn" + d.className.substring(6, d.className.length); })(document.documentElement);</script>
</head>
<body>
@* Layout (template) is in the Body zone @ the default position (nothing, zero, zilch) *@
@Display(Model.Body)
@Display(Model.Tail)
</body>
</html>
src/Orchard.Web/Themes/Themes.csproj
-1
View File
@@ -109,7 +109,6 @@
<Content Include="TheAdmin\Styles\images\tableHeaderBackgroundRed.gif" />
<Content Include="TheAdmin\Styles\site.css" />
<Content Include="TheAdmin\Theme.txt" />
<Content Include="SafeMode\Views\Document.cshtml" />
<Content Include="TheAdmin\Views\Layout.cshtml" />
</ItemGroup>
<ItemGroup>