From 278cc6e0fa6b45bd2d06be97a284aa6f44efbb32 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Wed, 9 Jun 2010 21:21:01 -0700 Subject: [PATCH] Removed calls to _Encoded() that are no longer needed --HG-- branch : dev --- .../Parts/Common.Body.Manage.ascx | 2 +- .../Orchard.Blogs/Views/BlogAdmin/List.ascx | 2 +- .../Orchard.Comments/Views/Admin/Details.aspx | 18 +++++++++--------- .../Orchard.Comments/Views/Admin/Index.aspx | 18 +++++++++--------- .../Orchard.Pages/Views/Admin/List.aspx | 18 +++++++++--------- .../Orchard.Setup/Views/Setup/Index.ascx | 2 +- .../Orchard.Tags/Views/Admin/Index.aspx | 4 ++-- .../Parts/Blogs.BlogPost.Metadata.ascx | 7 +++---- src/Orchard/Mvc/Html/HtmlHelperExtensions.cs | 2 +- src/Orchard/Mvc/ViewPage.cs | 7 ------- src/Orchard/Mvc/ViewUserControl.cs | 7 ------- 11 files changed, 36 insertions(+), 51 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx index ab0c47ace..789b30d21 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
- <%=Html.ItemEditLinkWithReturnUrl(_Encoded("Edit").ToString(), Model.BodyAspect.ContentItem) %> + <%: Html.ItemEditLinkWithReturnUrl(T("Edit"), Model.BodyAspect.ContentItem) %>
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.ascx index 6c0951db7..7d4955817 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.ascx @@ -12,7 +12,7 @@ if (Model.Entries.Count() > 0) { %> int totalPostCount = entry.TotalPostCount; var draftText = (draftCount == 0 ? "": string.Format(" ({0} draft{1})", draftCount, draftCount == 1 ? "" : "s")); - var linkContent = _Encoded("{0} post{1}{2}", totalPostCount, totalPostCount == 1 ? "" : "s", draftText); + var linkContent = T("{0} post{1}{2}", totalPostCount, totalPostCount == 1 ? "" : "s", draftText); html.ViewContext.Writer.Write(html.Link(linkContent.ToString(), Url.BlogForAdmin(entry.ContentItemViewModel.Item.Slug))); }); diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx index c0d8ffceb..5bf6cbca1 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx @@ -22,21 +22,21 @@
" />
"/>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx index f31b07e27..fc464f3aa 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx @@ -7,21 +7,21 @@
" />
"/>
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx index b5dd2e4e2..beeff778c 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx +++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx @@ -12,19 +12,19 @@ using (Html.BeginFormAntiForgeryPost()) { %>
" />
"/>
@@ -75,7 +75,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
<% if (pageEntry.Page.HasPublished) { %> - <%: Html.ActionLink("View", "Item", new { controller = "Page", slug = pageEntry.Page.PublishedSlug }, new {title = _Encoded("View Page")})%><%: T(" | ")%><% + <%: Html.ActionLink("View", "Item", new { controller = "Page", slug = pageEntry.Page.PublishedSlug }, new {title = T("View Page")})%><%: T(" | ")%><% if (pageEntry.Page.HasDraft) { %> " title="<%: T("Publish Draft")%>"><%: T("Publish Draft")%><%: T(" | ")%><% } %> @@ -84,7 +84,7 @@ using (Html.BeginFormAntiForgeryPost()) { %> else { %> " title="<%: T("Publish Page")%>"><%: T("Publish")%><%: T(" | ")%><% } %> - <%: Html.ActionLink(_Encoded("Edit").ToString(), "Edit", new {id = pageEntry.Page.Id}, new {title = _Encoded("Edit Page")})%><%: T(" | ")%> + <%: Html.ActionLink(T("Edit"), "Edit", new {id = pageEntry.Page.Id}, new {title = T("Edit Page")})%><%: T(" | ")%> " title="<%: T("Remove Page")%>"><%: T("Remove")%>
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx index f7d57a9a8..941f95942 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Setup.ViewModels"%> -

<%: Html.TitleForPage(_Encoded("Get Started").ToHtmlString())%>

+

<%: Html.TitleForPage(T("Get Started"))%>

<% using (Html.BeginFormAntiForgeryPost()) { %> <%: Html.ValidationSummary() %> diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx index 7ad7657e0..855e7a634 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx @@ -6,8 +6,8 @@
" />
diff --git a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx index 03bb4f709..0732e3a41 100644 --- a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx @@ -1,7 +1,6 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -<% - if (Model.Creator != null) { - %><%=_Encoded(" | Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %><% - } %> +<% if (Model.Creator != null) { %> + <%: T(" | Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %> +<% } %> diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs index 8615286b2..7e97dab3f 100644 --- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs +++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs @@ -36,7 +36,7 @@ namespace Orchard.Mvc.Html { if (selected) builder.MergeAttribute("selected", "selected"); - builder.SetInnerText(text); + builder.SetInnerText(html.Encode(text)); return MvcHtmlString.Create(builder.ToString(TagRenderMode.Normal)); } diff --git a/src/Orchard/Mvc/ViewPage.cs b/src/Orchard/Mvc/ViewPage.cs index f8b2ba7be..78c285ca8 100644 --- a/src/Orchard/Mvc/ViewPage.cs +++ b/src/Orchard/Mvc/ViewPage.cs @@ -21,13 +21,6 @@ namespace Orchard.Mvc { return MvcHtmlString.Create(Html.Encode(value)); } - public MvcHtmlString _Encoded(string textHint) { - return MvcHtmlString.Create(Html.Encode(T(textHint))); - } - public MvcHtmlString _Encoded(string textHint, params object[] formatTokens) { - return MvcHtmlString.Create(Html.Encode(T(textHint, formatTokens))); - } - public bool AuthorizedFor(Permission permission) { return Html.Resolve().Authorize(permission); } diff --git a/src/Orchard/Mvc/ViewUserControl.cs b/src/Orchard/Mvc/ViewUserControl.cs index a82983efb..24f41aee6 100644 --- a/src/Orchard/Mvc/ViewUserControl.cs +++ b/src/Orchard/Mvc/ViewUserControl.cs @@ -21,13 +21,6 @@ namespace Orchard.Mvc { return MvcHtmlString.Create(Html.Encode(value)); } - public MvcHtmlString _Encoded(string textHint) { - return MvcHtmlString.Create(Html.Encode(T(textHint))); - } - public MvcHtmlString _Encoded(string textHint, params object[] formatTokens) { - return MvcHtmlString.Create(Html.Encode(T(textHint, formatTokens))); - } - public bool AuthorizedFor(Permission permission) { return Html.Resolve().Authorize(permission); }