From 8ec350ca2b5495df7f79f51e92aad7dfad75286f Mon Sep 17 00:00:00 2001 From: skewed Date: Tue, 12 Jan 2010 18:24:14 +0000 Subject: [PATCH] - Adding some debug logging of view search locations - Making the Themes (Core) Package a theme as well so the default theme can be reactivated --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045306 --- src/Orchard.Web/Core/Orchard.Core.csproj | 2 ++ src/Orchard.Web/Core/Themes/Theme.gif | Bin 0 -> 10347 bytes src/Orchard.Web/Core/Themes/Theme.txt | 6 ++++++ .../Core/Themes/Views/Admin/Index.aspx | 6 ++++-- src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs | 5 +++++ .../ViewEngines/WebFormsViewEngineProvider.cs | 11 +++++++++++ 6 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 src/Orchard.Web/Core/Themes/Theme.gif create mode 100644 src/Orchard.Web/Core/Themes/Theme.txt diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 0ba2ee894..cfee41949 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -142,6 +142,8 @@ + + diff --git a/src/Orchard.Web/Core/Themes/Theme.gif b/src/Orchard.Web/Core/Themes/Theme.gif new file mode 100644 index 0000000000000000000000000000000000000000..4075773311031a3288481fb93f8eb5114942e4fc GIT binary patch literal 10347 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 TlX*dQH9@CZ=j~7k!07(~s>I!s literal 0 HcmV?d00001 diff --git a/src/Orchard.Web/Core/Themes/Theme.txt b/src/Orchard.Web/Core/Themes/Theme.txt new file mode 100644 index 000000000..7b9980171 --- /dev/null +++ b/src/Orchard.Web/Core/Themes/Theme.txt @@ -0,0 +1,6 @@ +name: Blue (default) +author: Jonathan Wall +description: This is the default theme that has a resemblance to the default ASP.NET MVC web project style for some reason. +version: 1.0 +tags: blue, default +homepage: http://www.orchardproject.net \ No newline at end of file diff --git a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx index af59ab516..b701003a3 100644 --- a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx @@ -1,4 +1,6 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Themes"%> +<%@ Import Namespace="Orchard.Extensions"%> <%@ Import Namespace="Orchard.Core.Themes.ViewModels"%>

<%=Html.TitleForPage(T("Manage Themes").ToString()) %>

<%=_Encoded("Current Theme")%>

@@ -8,7 +10,7 @@ } else { %>

<%=Html.Encode(Model.CurrentTheme.DisplayName) %>

- <%=Html.Image(ResolveUrl("~/Themes/" + Model.CurrentTheme.ThemeName + "/Theme.gif"), Html.Encode(Model.CurrentTheme.DisplayName), null) %>
+ <%=Html.Image(ResolveUrl(Html.Resolve().GetThemeLocation(Model.CurrentTheme) + "/Theme.gif"), Html.Encode(Model.CurrentTheme.DisplayName), null)%>
<%=_Encoded("By") %> <%=Html.Encode(Model.CurrentTheme.Author) %>
<%=Html.Encode(Model.CurrentTheme.Version) %>
<%=Html.Encode(Model.CurrentTheme.Description) %>
@@ -23,7 +25,7 @@ %>

  • <%=Html.Encode(theme.DisplayName) %>

    - <%=Html.Image(ResolveUrl("~/Themes/" + theme.ThemeName + "/Theme.gif"), Html.Encode(theme.DisplayName), null) %>
    + <%=Html.Image(ResolveUrl(Html.Resolve().GetThemeLocation(theme) + "/Theme.gif"), Html.Encode(theme.DisplayName), null)%>
    <%=_Encoded("By") %> <%=Html.Encode(theme.Author) %>
    <%=Html.Encode(theme.Version) %>
    <%=Html.Encode(theme.Description) %>
    diff --git a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs index 1413b00bc..759124202 100644 --- a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs +++ b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Web.Mvc; using Orchard.Extensions; +using Orchard.Logging; using Orchard.Mvc.Filters; using Orchard.Themes; @@ -25,6 +26,8 @@ namespace Orchard.Mvc.ViewEngines { _viewEngineProviders = viewEngineProviders; } + public ILogger Logger { get; set; } + public void OnResultExecuting(ResultExecutingContext filterContext) { var viewResultBase = filterContext.Result as ViewResultBase; if (viewResultBase == null) { @@ -44,6 +47,7 @@ namespace Orchard.Mvc.ViewEngines { themeViewEngines = _viewEngineProviders .Select(x => x.CreateThemeViewEngine(new CreateThemeViewEngineParams { VirtualPath = themeLocation })); + Logger.Debug("Theme location:\r\n\t-{0}", themeLocation); } @@ -53,6 +57,7 @@ namespace Orchard.Mvc.ViewEngines { var packageLocations = packages.Select(x => Path.Combine(x.Descriptor.Location, x.Descriptor.Name)); var packageViewEngines = _viewEngineProviders .Select(x => x.CreatePackagesViewEngine(new CreatePackagesViewEngineParams { VirtualPaths = packageLocations })); + Logger.Debug("Package locations:\r\n\t-{0}", string.Join("\r\n\t-", packageLocations.ToArray())); var requestViewEngines = new ViewEngineCollection( themeViewEngines diff --git a/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs b/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs index a5ecff38b..1beca23ca 100644 --- a/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs +++ b/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs @@ -1,11 +1,14 @@ using System.Linq; using System.Web.Mvc; +using Orchard.Logging; namespace Orchard.Mvc.ViewEngines { public class WebFormsViewEngineProvider : IViewEngineProvider { static string[] DisabledFormats = new[] { "~/Disabled" }; + public ILogger Logger { get; set; } + public IViewEngine CreateThemeViewEngine(CreateThemeViewEngineParams parameters) { // Area: if "area" in RouteData. Url hit for package... // Area-Layout Paths - no-op because LayoutViewEngine uses multi-pass instead of layout paths @@ -34,6 +37,8 @@ namespace Orchard.Mvc.ViewEngines { parameters.VirtualPath + "/Views/{0}.aspx", }; + Logger.Debug("PartialViewLocationFormats (theme): \r\n\t-{0}", string.Join("\r\n\t-", viewEngine.PartialViewLocationFormats)); + // for "routed" request views... // enable /Views/{area}/{controller}/{viewName} viewEngine.AreaPartialViewLocationFormats = new[] { @@ -41,6 +46,8 @@ namespace Orchard.Mvc.ViewEngines { parameters.VirtualPath + "/Views/{2}/{1}/{0}.aspx", }; + Logger.Debug("AreaPartialViewLocationFormats (theme): \r\n\t-{0}", string.Join("\r\n\t-", viewEngine.AreaPartialViewLocationFormats)); + return viewEngine; } @@ -52,6 +59,8 @@ namespace Orchard.Mvc.ViewEngines { "~/Packages/{2}/Views/{1}/{0}.aspx", }; + Logger.Debug("AreaFormats (package): \r\n\t-{0}", string.Join("\r\n\t-", areaFormats)); + var universalFormats = parameters.VirtualPaths .SelectMany(x => new[] { x + "/Views/{0}.ascx", @@ -59,6 +68,8 @@ namespace Orchard.Mvc.ViewEngines { }) .ToArray(); + Logger.Debug("UniversalFormats (package): \r\n\t-{0}", string.Join("\r\n\t-", universalFormats)); + var viewEngine = new WebFormViewEngine { MasterLocationFormats = DisabledFormats, ViewLocationFormats = universalFormats,