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 1 Packages Projects Releases Wiki Activity

Removed calls to _Encoded() that are no longer needed

Browse Source 
--HG--
branch : dev
This commit is contained in:
Phil Haack
2010-06-09 21:21:01 -07:00
parent afb6afe309
commit 278cc6e0fa
11 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BodyDisplayViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BodyDisplayViewModel>" %>
<%@ Import Namespace="Orchard.Core.Common.ViewModels"%> <%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
<div class="manage"> <div class="manage">
<%=Html.ItemEditLinkWithReturnUrl(_Encoded("Edit").ToString(), Model.BodyAspect.ContentItem) %> <%: Html.ItemEditLinkWithReturnUrl(T("Edit"), Model.BodyAspect.ContentItem) %>
</div> </div>

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.ascx
View File

@@ -12,7 +12,7 @@ if (Model.Entries.Count() > 0) { %>
int totalPostCount = entry.TotalPostCount; int totalPostCount = entry.TotalPostCount;
var draftText = (draftCount == 0 ? "": string.Format(" ({0} draft{1})", draftCount, draftCount == 1 ? "" : "s")); 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))); html.ViewContext.Writer.Write(html.Link(linkContent.ToString(), Url.BlogForAdmin(entry.ContentItemViewModel.Item.Slug)));
}); });

18
src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx
View File

@@ -22,21 +22,21 @@
<fieldset class="actions bulk"> <fieldset class="actions bulk">
<label for="publishActions"><%: T("Actions:") %></label> <label for="publishActions"><%: T("Actions:") %></label>
<select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction)%>"> <select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction)%>">
<%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.None, _Encoded("Choose action...").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.None, T("Choose action..."))%>
<%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Approve, _Encoded("Approve").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Approve, T("Approve"))%>
<%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Pend, _Encoded("Pend").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Pend, T("Pend"))%>
<%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.MarkAsSpam, _Encoded("Mark as Spam").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.MarkAsSpam, T("Mark as Spam"))%>
<%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Delete, _Encoded("Remove").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Delete, T("Remove"))%>
</select> </select>
<input class="button" type="submit" name="submit.BulkEdit" value="<%: T("Apply") %>" /> <input class="button" type="submit" name="submit.BulkEdit" value="<%: T("Apply") %>" />
</fieldset> </fieldset>
<fieldset class="actions bulk"> <fieldset class="actions bulk">
<label for="filterResults"><%: T("Filter:")%></label> <label for="filterResults"><%: T("Filter:")%></label>
<select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter)%>"> <select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter)%>">
<%: Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.All, _Encoded("All Comments").ToString())%> <%: Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.All, T("All Comments"))%>
<%: Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Approved, _Encoded("Approved Comments").ToString())%> <%: Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Approved, T("Approved Comments"))%>
<%: Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Pending, _Encoded("Pending Comments").ToString())%> <%: Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Pending, T("Pending Comments"))%>
<%: Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Spam, _Encoded("Spam").ToString())%> <%: Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Spam, T("Spam"))%>
</select> </select>
<input class="button" type="submit" name="submit.Filter" value="<%: T("Apply") %>"/> <input class="button" type="submit" name="submit.Filter" value="<%: T("Apply") %>"/>
</fieldset> </fieldset>

18
src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
View File

@@ -7,21 +7,21 @@
<fieldset class="actions bulk"> <fieldset class="actions bulk">
<label for="publishActions"><%: T("Actions:") %></label> <label for="publishActions"><%: T("Actions:") %></label>
<select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction)%>"> <select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction)%>">
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, _Encoded("Choose action...").ToString()) %> <%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, T("Choose action...")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Approve, _Encoded("Approve").ToString()) %> <%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Approve, T("Approve")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Pend, _Encoded("Pend").ToString()) %> <%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Pend, T("Pend")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, _Encoded("Mark as Spam").ToString()) %> <%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, T("Mark as Spam")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, _Encoded("Remove").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, T("Remove"))%>
</select> </select>
<input class="button" type="submit" name="submit.BulkEdit" value="<%: T("Apply") %>" /> <input class="button" type="submit" name="submit.BulkEdit" value="<%: T("Apply") %>" />
</fieldset> </fieldset>
<fieldset class="actions bulk"> <fieldset class="actions bulk">
<label for="filterResults"><%: T("Filter:")%></label> <label for="filterResults"><%: T("Filter:")%></label>
<select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter)%>"> <select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter)%>">
<%: Html.SelectOption(Model.Options.Filter, CommentIndexFilter.All, _Encoded("All Comments").ToString()) %> <%: Html.SelectOption(Model.Options.Filter, CommentIndexFilter.All, T("All Comments")) %>
<%: Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Approved, _Encoded("Approved Comments").ToString()) %> <%: Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Approved, T("Approved Comments")) %>
<%: Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Pending, _Encoded("Pending Comments").ToString()) %> <%: Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Pending, T("Pending Comments")) %>
<%: Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Spam, _Encoded("Spam").ToString())%> <%: Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Spam, T("Spam"))%>
</select> </select>
<input class="button" type="submit" name="submit.Filter" value="<%: T("Apply") %>"/> <input class="button" type="submit" name="submit.Filter" value="<%: T("Apply") %>"/>
</fieldset> </fieldset>

18
src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx
View File

@@ -12,19 +12,19 @@ using (Html.BeginFormAntiForgeryPost()) { %>
<fieldset class="actions bulk"> <fieldset class="actions bulk">
<label for="publishActions"><%: T("Actions:")%></label> <label for="publishActions"><%: T("Actions:")%></label>
<select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction) %>"> <select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction) %>">
<%: Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.None, _Encoded("Choose action...").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.None, T("Choose action..."))%>
<%: Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.PublishNow, _Encoded("Publish Now").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.PublishNow, T("Publish Now"))%>
<%: Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Unpublish, _Encoded("Unpublish").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Unpublish, T("Unpublish"))%>
<%: Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Delete, _Encoded("Remove").ToString())%> <%: Html.SelectOption(Model.Options.BulkAction, PagesBulkAction.Delete, T("Remove"))%>
</select> </select>
<input class="button" type="submit" name="submit.BulkEdit" value="<%: T("Apply") %>" /> <input class="button" type="submit" name="submit.BulkEdit" value="<%: T("Apply") %>" />
</fieldset> </fieldset>
<fieldset class="actions bulk"> <fieldset class="actions bulk">
<label for="filterResults"><%: T("Filter:")%></label> <label for="filterResults"><%: T("Filter:")%></label>
<select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter) %>"> <select id="filterResults" name="<%=Html.NameOf(m => m.Options.Filter) %>">
<%: Html.SelectOption(Model.Options.Filter, PagesFilter.All, _Encoded("All Pages").ToString())%> <%: Html.SelectOption(Model.Options.Filter, PagesFilter.All, T("All Pages"))%>
<%: Html.SelectOption(Model.Options.Filter, PagesFilter.Published, _Encoded("Published Pages").ToString())%> <%: Html.SelectOption(Model.Options.Filter, PagesFilter.Published, T("Published Pages"))%>
<%: Html.SelectOption(Model.Options.Filter, PagesFilter.Offline, _Encoded("Offline Pages").ToString())%> <%: Html.SelectOption(Model.Options.Filter, PagesFilter.Offline, T("Offline Pages"))%>
</select> </select>
<input class="button" type="submit" name="submit.Filter" value="<%: T("Apply") %>"/> <input class="button" type="submit" name="submit.Filter" value="<%: T("Apply") %>"/>
</fieldset> </fieldset>
@@ -75,7 +75,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
</div> </div>
<div class="related"><% <div class="related"><%
if (pageEntry.Page.HasPublished) { %> 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) { %> if (pageEntry.Page.HasDraft) { %>
<a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Publish", new {id = pageEntry.Page.Id})) %>" title="<%: T("Publish Draft")%>"><%: T("Publish Draft")%></a><%: T(" | ")%><% <a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Publish", new {id = pageEntry.Page.Id})) %>" title="<%: T("Publish Draft")%>"><%: T("Publish Draft")%></a><%: T(" | ")%><%
} %> } %>
@@ -84,7 +84,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
else { %> else { %>
<a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Publish", new {id = pageEntry.Page.Id})) %>" title="<%: T("Publish Page")%>"><%: T("Publish")%></a><%: T(" | ")%><% <a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Publish", new {id = pageEntry.Page.Id})) %>" title="<%: T("Publish Page")%>"><%: T("Publish")%></a><%: 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(" | ")%>
<a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Delete", new {id = pageEntry.Page.Id})) %>" title="<%: T("Remove Page")%>"><%: T("Remove")%></a> <a href="<%=Html.AntiForgeryTokenGetUrl(Url.Action("Delete", new {id = pageEntry.Page.Id})) %>" title="<%: T("Remove Page")%>"><%: T("Remove")%></a>
</div> </div>
<div style="clear:both;"></div> <div style="clear:both;"></div>

2
src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SetupViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SetupViewModel>" %>
<%@ Import Namespace="Orchard.Setup.ViewModels"%> <%@ Import Namespace="Orchard.Setup.ViewModels"%>
<h1><%: Html.TitleForPage(_Encoded("Get Started").ToHtmlString())%></h1> <h1><%: Html.TitleForPage(T("Get Started"))%></h1>
<% <%
using (Html.BeginFormAntiForgeryPost()) { %> using (Html.BeginFormAntiForgeryPost()) { %>
<%: Html.ValidationSummary() %> <%: Html.ValidationSummary() %>

4
src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx
View File

@@ -6,8 +6,8 @@
<fieldset class="actions bulk"> <fieldset class="actions bulk">
<label for="publishActions"><%: T("Actions:") %></label> <label for="publishActions"><%: T("Actions:") %></label>
<select id="publishActions" name="<%=Html.NameOf(m => m.BulkAction)%>"> <select id="publishActions" name="<%=Html.NameOf(m => m.BulkAction)%>">
<%: Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, _Encoded("Choose action...").ToString())%> <%: Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, T("Choose action..."))%>
<%: Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.Delete, _Encoded("Remove").ToString())%> <%: Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.Delete, T("Remove"))%>
</select> </select>
<input class="button" type="submit" name="submit.BulkEdit" value="<%: T("Apply") %>" /> <input class="button" type="submit" name="submit.BulkEdit" value="<%: T("Apply") %>" />
</fieldset> </fieldset>

7
src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx
View File

@@ -1,7 +1,6 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %>
<%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>
<% <% if (Model.Creator != null) { %>
if (Model.Creator != null) { <%: T(" | Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %>
%><%=_Encoded(" | Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %><% <% } %>
} %>

2
src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
View File

@@ -36,7 +36,7 @@ namespace Orchard.Mvc.Html {
if (selected) if (selected)
builder.MergeAttribute("selected", "selected"); builder.MergeAttribute("selected", "selected");
builder.SetInnerText(text); builder.SetInnerText(html.Encode(text));
return MvcHtmlString.Create(builder.ToString(TagRenderMode.Normal)); return MvcHtmlString.Create(builder.ToString(TagRenderMode.Normal));
} }

7
src/Orchard/Mvc/ViewPage.cs
View File

@@ -21,13 +21,6 @@ namespace Orchard.Mvc {
return MvcHtmlString.Create(Html.Encode(value)); 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) { public bool AuthorizedFor(Permission permission) {
return Html.Resolve<IAuthorizer>().Authorize(permission); return Html.Resolve<IAuthorizer>().Authorize(permission);
} }

7
src/Orchard/Mvc/ViewUserControl.cs
View File

@@ -21,13 +21,6 @@ namespace Orchard.Mvc {
return MvcHtmlString.Create(Html.Encode(value)); 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) { public bool AuthorizedFor(Permission permission) {
return Html.Resolve<IAuthorizer>().Authorize(permission); return Html.Resolve<IAuthorizer>().Authorize(permission);
} }