From 411a045648abac8b4954abc193c9c48bd0b46990 Mon Sep 17 00:00:00 2001
From: ErikPorter <none@none>
Date: Wed, 13 Jan 2010 00:12:33 +0000
Subject: [PATCH] Added Html.ThemePath to simplify referencing a file in the
 current theme.

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045315
---
 .../Core/Themes/Views/Admin/Index.aspx            |  4 ++--
 .../Items/Blogs.BlogPost.SummaryAdmin.ascx        |  2 +-
 src/Orchard/Mvc/Html/ThemeExtensions.cs           | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
index b701003a3..3137688ee 100644
--- a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
@@ -10,7 +10,7 @@
    } else {
     %><h3><%=Html.Encode(Model.CurrentTheme.DisplayName) %></h3>
      <p>
-        <%=Html.Image(ResolveUrl(Html.Resolve<IExtensionManager>().GetThemeLocation(Model.CurrentTheme) + "/Theme.gif"), Html.Encode(Model.CurrentTheme.DisplayName), null)%><br />
+        <%=Html.Image(Html.ThemePath("/Theme.gif"), Html.Encode(Model.CurrentTheme.DisplayName), null)%><br />
         <%=_Encoded("By") %> <%=Html.Encode(Model.CurrentTheme.Author) %><br />
         <%=Html.Encode(Model.CurrentTheme.Version) %><br />
         <%=Html.Encode(Model.CurrentTheme.Description) %><br />
@@ -25,7 +25,7 @@
         %>    <li>
         <h3><%=Html.Encode(theme.DisplayName) %></h3>
         <p>
-            <%=Html.Image(ResolveUrl(Html.Resolve<IExtensionManager>().GetThemeLocation(theme) + "/Theme.gif"), Html.Encode(theme.DisplayName), null)%><br />
+            <%=Html.Image(Html.ThemePath(theme, "/Theme.gif"), Html.Encode(theme.DisplayName), null)%><br />
             <%=_Encoded("By") %> <%=Html.Encode(theme.Author) %><br />
             <%=Html.Encode(theme.Version) %><br />
             <%=Html.Encode(theme.Description) %><br />
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx
index 757be1c7b..dd67b068d 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx
@@ -20,7 +20,7 @@
     <li class="destruct">
         <% using (Html.BeginFormAntiForgeryPost(Url.BlogPostDelete(Model.Item.Blog.Slug, Model.Item.Slug))) { %>
             <fieldset>
-                <input type="image" src="<%=ResolveUrl(Html.Resolve<IExtensionManager>().GetThemeLocation(Html.Resolve<IThemeService>().GetRequestTheme(ViewContext.RequestContext)) + "/styles/images/remove.png") %>" alt="<%=_Encoded("Remove Post") %>" title="<%=_Encoded("Remove Post") %>" class="ibutton image remove" />
+                <input type="image" src="<%=Html.ThemePath("/styles/images/remove.png") %>" alt="<%=_Encoded("Remove Post") %>" title="<%=_Encoded("Remove Post") %>" class="ibutton image remove" />
             </fieldset><%
         } %>
     </li>
diff --git a/src/Orchard/Mvc/Html/ThemeExtensions.cs b/src/Orchard/Mvc/Html/ThemeExtensions.cs
index 369757bc6..3d70c969b 100644
--- a/src/Orchard/Mvc/Html/ThemeExtensions.cs
+++ b/src/Orchard/Mvc/Html/ThemeExtensions.cs
@@ -1,5 +1,8 @@
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
+using System.Web.UI;
+using Orchard.Extensions;
+using Orchard.Themes;
 using Orchard.Validation;
 
 namespace Orchard.Mvc.Html {
@@ -11,5 +14,17 @@ namespace Orchard.Mvc.Html {
             Argument.ThrowIfNull(helper, "helper");
             helper.RenderPartial(viewName);
         }
+
+        public static string ThemePath(this HtmlHelper helper, string path) {
+            return helper.ThemePath(helper.Resolve<IThemeService>().GetRequestTheme(helper.ViewContext.RequestContext), path);
+        }
+
+        public static string ThemePath(this HtmlHelper helper, ITheme theme, string path) {
+            Control parent = helper.ViewDataContainer as Control;
+            
+            Argument.ThrowIfNull(parent, "helper.ViewDataContainer");
+
+            return parent.ResolveUrl(helper.Resolve<IExtensionManager>().GetThemeLocation(theme) + path);
+        }
     }
 }