lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 04:43:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Continuing theming work...the rendering passes are all working

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044128
This commit is contained in:
skewed
2009-12-16 07:54:36 +00:00
parent 08a5a8b92d
commit c5bd6f0e14
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Core/SafeMode/Views/Shared/document.aspx
View File

@@ -1,10 +1,10 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title><%=Html.Title() %></title> <title><%=Html.Title() %> - Safe Mode!</title>
<% Html.RenderZone("metas"); %> <% Html.RenderZone("metas"); %>
<% Html.RenderZone("styles"); %> <% Html.RenderZone("styles"); %>
<% Html.RenderZone("scripts"); %> <% Html.RenderZone("scripts"); %>

2
src/Orchard/Mvc/ViewEngines/OrchardLayoutContext.cs
View File

@@ -13,7 +13,7 @@ namespace Orchard.Mvc.ViewEngines {
} }
public static OrchardLayoutContext From(HttpContextBase context) { public static OrchardLayoutContext From(HttpContextBase context) {
if (context.Items.Contains(_key)) { if (!context.Items.Contains(_key)) {
context.Items.Add(_key, new OrchardLayoutContext()); context.Items.Add(_key, new OrchardLayoutContext());
} }
return (OrchardLayoutContext)context.Items[_key]; return (OrchardLayoutContext)context.Items[_key];

2
src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
View File

@@ -30,12 +30,14 @@ namespace Orchard.Mvc.ViewEngines {
// enable /Views/Shared/"EditorTemplates/+{templateName} // enable /Views/Shared/"EditorTemplates/+{templateName}
viewEngine.PartialViewLocationFormats = new[] { viewEngine.PartialViewLocationFormats = new[] {
parameters.VirtualPath + "/Views/Shared/{0}.ascx", parameters.VirtualPath + "/Views/Shared/{0}.ascx",
parameters.VirtualPath + "/Views/Shared/{0}.aspx",
}; };
// for "routed" request views... // for "routed" request views...
// enable /Views/{area}/{controller}/{viewName} // enable /Views/{area}/{controller}/{viewName}
viewEngine.AreaPartialViewLocationFormats = new[] { viewEngine.AreaPartialViewLocationFormats = new[] {
parameters.VirtualPath + "/Views/{2}/{1}/{0}.ascx", parameters.VirtualPath + "/Views/{2}/{1}/{0}.ascx",
parameters.VirtualPath + "/Views/{2}/{1}/{0}.aspx",
}; };
return viewEngine; return viewEngine;