From 7108d92147c14efa79964dcca6bc24ee3665ffdd Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Tue, 8 Jun 2010 22:44:30 -0700 Subject: [PATCH] Replaced Html.Encode with the new <%: %> syntax for auto encoding --HG-- branch : dev --- .../Orchard.Azure.Web.csproj | 2 +- .../Parts/Common.Routable.ascx | 2 +- .../Futures.Widgets/Futures.Widgets.csproj | 2 +- .../Orchard.Blogs/Orchard.Blogs.csproj | 2 +- .../Items/Blogs.Blog.Summary.ascx | 2 +- .../Items/Blogs.Blog.SummaryAdmin.ascx | 2 +- .../Parts/Blogs.Blog.Description.ascx | 2 +- .../Orchard.Comments/Orchard.Comments.csproj | 2 +- .../Orchard.Comments/Views/Admin/Details.aspx | 4 +- .../Orchard.Comments/Views/Admin/Edit.aspx | 8 ++-- .../Orchard.Comments/Views/Admin/Index.aspx | 4 +- .../Views/ListOfComments.ascx | 2 +- .../Orchard.DevTools/Orchard.DevTools.csproj | 2 +- .../Views/Content/Details.aspx | 46 +++++++++---------- .../Orchard.DevTools/Views/Content/Index.aspx | 2 +- .../Orchard.Media/Orchard.Media.csproj | 2 +- .../Orchard.Media/Views/Admin/Add.aspx | 4 +- .../Orchard.Media/Views/Admin/Create.aspx | 2 +- .../Orchard.Media/Views/Admin/Edit.aspx | 4 +- .../Orchard.Media/Views/Admin/EditMedia.aspx | 8 ++-- .../Views/Admin/EditProperties.aspx | 4 +- .../Orchard.MetaData/Orchard.MetaData.csproj | 2 +- .../Views/MetaData/ContentTypeList.ascx | 2 +- .../Orchard.Modules/Orchard.Modules.csproj | 2 +- .../Orchard.Modules/Views/Admin/Features.ascx | 2 +- .../Orchard.Modules/Views/Admin/Index.ascx | 10 ++-- .../Orchard.MultiTenancy.csproj | 2 +- .../Views/Admin/Edit.ascx | 2 +- .../Views/Admin/Index.ascx | 2 +- .../Orchard.Pages/Orchard.Pages.csproj | 2 +- .../Items/Pages.Page.Summary.ascx | 2 +- .../Parts/Pages.Page.Metadata.ascx | 2 +- .../Orchard.Roles/Orchard.Roles.csproj | 2 +- .../Orchard.Roles/Views/Admin/Create.aspx | 4 +- .../Orchard.Roles/Views/Admin/Edit.aspx | 4 +- .../Orchard.Roles/Views/Admin/Index.aspx | 2 +- .../Parts/Roles.UserRoles.ascx | 2 +- .../Orchard.Sandbox/Orchard.Sandbox.csproj | 2 +- .../Orchard.Setup/Orchard.Setup.csproj | 2 +- .../Modules/Orchard.Tags/Orchard.Tags.csproj | 2 +- .../Orchard.Tags/Views/Admin/Create.aspx | 2 +- .../Orchard.Tags/Views/Admin/Edit.aspx | 2 +- .../Orchard.Themes/Orchard.Themes.csproj | 2 +- .../Orchard.Themes/Views/Admin/Index.aspx | 20 ++++---- .../Modules/Orchard.Themes/Views/Header.ascx | 2 +- .../Orchard.Themes/Views/Messages.ascx | 2 +- .../Orchard.Users/Orchard.Users.csproj | 2 +- .../Orchard.Users/Views/Admin/Index.aspx | 4 +- .../Modules/TinyMce/TinyMce.csproj | 2 +- src/Orchard.Web/Orchard.Web.csproj | 2 +- .../Items/Blogs.Blog.Summary.ascx | 2 +- .../Themes/Classic/Views/Layout.ascx | 2 +- .../Items/Blogs.Blog.Summary.ascx | 2 +- .../Themes/ClassicDark/Views/Layout.ascx | 2 +- .../Themes/Contoso/Views/Footer.ascx | 2 +- .../Themes/Contoso/Views/Header.ascx | 2 +- .../Themes/Contoso/Views/ListOfComments.ascx | 2 +- .../Themes/Contoso/Views/User.ascx | 2 +- .../Themes/Corporate/Views/Footer.ascx | 2 +- .../Corporate/Views/Layout.HomePage.ascx | 2 +- .../Themes/Corporate/Views/Layout.ascx | 2 +- .../Corporate/Views/ListOfComments.ascx | 2 +- .../Themes/Corporate/Views/User.ascx | 2 +- .../Items/Blogs.Blog.Summary.ascx | 2 +- .../Themes/Green/Views/Layout.HomePage.ascx | 2 +- .../Themes/Green/Views/Layout.ascx | 2 +- .../Themes/Green/Views/ListOfComments.ascx | 2 +- .../Themes/TheAdmin/Views/User.ascx | 2 +- 68 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj index 2d5045c4d..7db7fdf13 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj +++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj @@ -12,7 +12,7 @@ Orchard.Azure.Web Orchard.Azure.Web v3.5 - false + true true diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx index b699143bb..894b8e66b 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx @@ -10,7 +10,7 @@ <%=Html.TextBoxFor(m => m.Title, new { @class = "large text" }) %>
- + <%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%>
<% using (this.Capture("end-of-page-scripts")) { %> diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj index b4442b16c..1ba9e0991 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj +++ b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj @@ -12,7 +12,7 @@ Futures.Widgets Futures.Widgets v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index ffe487a97..797ed7bcc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -12,7 +12,7 @@ Orchard.Blogs Orchard.Blogs v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx index 14be9a7ca..84ee0d3e0 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx @@ -3,5 +3,5 @@ <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

<%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %>

-<% if (!string.IsNullOrEmpty(Model.Item.Description)) { %>

<%=Html.Encode(Model.Item.Description) %>

<% } %> +<% if (!string.IsNullOrEmpty(Model.Item.Description)) { %>

<%: Model.Item.Description %>

<% } %>
<%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%> | <%Html.Zone("meta");%>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx index 61f265c43..737d708e4 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx @@ -17,7 +17,7 @@

<%=Html.Link(Html.Encode(Model.Item.Name), Url.BlogForAdmin(Model.Item.Slug)) %>

<% Html.Zone("meta");%>

<%--

[list of authors] [modify blog access]

--%> -

<%=Html.Encode(Model.Item.Description) %>

+

<%: Model.Item.Description %>

\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx index a79b21067..beab3fb41 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Models"%>
-

<%=Html.Encode(Model.Description) %>

+

<%: Model.Description %>

\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj index 391eb11c5..95e38c50c 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj +++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj @@ -12,7 +12,7 @@ Orchard.Comments Orchard.Comments v4.0 - false + true 3.5 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 13d2a6aeb..cc24a9ec9 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx @@ -77,10 +77,10 @@ else if (commentEntry.Comment.Status == CommentStatus.Pending) { %><%=_Encoded("Pending") %><% } else { %><%=_Encoded("Approved") %><% } %> - <%=Html.Encode(commentEntry.Comment.UserName) %> + <%: commentEntry.Comment.UserName %> <% if (commentEntry.Comment.CommentText != null) {%> - <%=Html.Encode(commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText) %><%=_Encoded(" ...") %> + <%: commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText %><%=_Encoded(" ...") %> <% } %> <%=Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault()) %> diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx index ae46c1ded..704b80713 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.aspx @@ -7,21 +7,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 62a851cae..9f6a210e8 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx @@ -60,11 +60,11 @@ <% if (commentEntry.Comment.Status == CommentStatus.Spam) { %><%=_Encoded("Spam") %><% } else if (commentEntry.Comment.Status == CommentStatus.Pending) { %><%=_Encoded("Pending") %><% } else { %><%=_Encoded("Approved") %><% } %> - <%=Html.Encode(commentEntry.Comment.UserName) %> + <%: commentEntry.Comment.UserName %> <% if (commentEntry.Comment.CommentText != null) {%> <%-- todo: (heskew) same text processing comment as on the public display, also need to use the ellipsis character instead of ... --%> - <%=Html.Encode(commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText) %><%=_Encoded(" ...") %> + <%: commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText %><%=_Encoded(" ...") %> <% } %> <%=Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault()) %> diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx index 10fca431e..b92e64e06 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx @@ -10,7 +10,7 @@ foreach (var comment in Model) { %>
<%-- todo: (heskew) comment text needs processing depending on comment markup style --%> -

<%=Html.Encode(comment.Record.CommentText)%>

+

<%: comment.Record.CommentText %>

<% } %> diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj index b97bf93cd..81e865d38 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj @@ -12,7 +12,7 @@ Orchard.DevTools Orchard.DevTools v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx index 4bf063ddc..237149c1c 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Details.aspx @@ -20,10 +20,10 @@
    <%foreach (var partType in Model.PartTypes.OrderBy(x => x.Name)) {%>
  • - <%if (partType.IsGenericType) {%><%=Html.Encode(partType.Name +" "+partType.GetGenericArguments().First().Name)%> - <%=Html.Encode(" (" + partType.GetGenericArguments().First().Namespace + ")")%><%} - else {%><%=Html.Encode(partType.Name)%> - <%=Html.Encode( " (" + partType.Namespace + ")")%><% + <%if (partType.IsGenericType) {%><%: partType.Name +" "+partType.GetGenericArguments().First().Name %> + <%: " (" + partType.GetGenericArguments().First().Namespace + ")" %><%} + else {%><%: partType.Name %> + <%: " (" + partType.Namespace + ")" %><% } %> @@ -31,8 +31,8 @@ <%foreach (var prop in partType.GetProperties().Where(x => x.DeclaringType == partType)) { var value = prop.GetValue(Model.Locate(partType), null);%>
  • - <%=Html.Encode(prop.Name) %>: - <%=Html.Encode(value) %> + <%: prop.Name %>: + <%: value %> <%var valueItem = value as ContentItem; if (valueItem == null && value is IContent) { valueItem = (value as IContent).ContentItem; @@ -46,7 +46,7 @@ else if (typeof(IEnumerable).IsAssignableFrom(prop.PropertyType)) { foreach (var item in value as IEnumerable) { %> -
  • <%=Html.Encode(item.GetType().Name) %>:<%=Html.Encode(item) %>
    • +
  • <%: item.GetType().Name %>:<%: item %>
    • <% } @@ -54,8 +54,8 @@ else {%> <%foreach (var prop2 in value.GetType().GetProperties().Where(x => x.GetIndexParameters().Count() == 0)) {%>
  • - <%=Html.Encode(prop2.Name)%> - <%=Html.Encode(prop2.GetValue(value, null))%>
    • + <%: prop2.Name %> + <%: prop2.GetValue(value, null) %> <%} %> <%} %>
@@ -71,13 +71,13 @@
    <%foreach (var display in Model.Displays) {%>
  • - <%=Html.Encode(display.Prefix)%> - <%=Html.Encode(display.Model.GetType().Name)%> - (<%=Html.Encode(display.Model.GetType().Namespace)%>) - Template:<%=Html.Encode(display.TemplateName ?? "(null)")%> - Prefix:<%=Html.Encode(display.Prefix ?? "(null)")%> - Zone:<%=Html.Encode(display.ZoneName ?? "(null)")%> - Position:<%=Html.Encode(display.Position ?? "(null)")%> + <%: display.Prefix %> + <%: display.Model.GetType().Name %> + (<%: display.Model.GetType().Namespace %>) + Template:<%: display.TemplateName ?? "(null)" %> + Prefix:<%: display.Prefix ?? "(null)" %> + Zone:<%: display.ZoneName ?? "(null)" %> + Position:<%: display.Position ?? "(null)" %>
    <%=Html.DisplayFor(x => display.Model, display.TemplateName, display.Prefix)%>
    @@ -91,13 +91,13 @@
      <%foreach (var editor in Model.Editors) {%>
    • - <%=Html.Encode(editor.Prefix) %> - <%=Html.Encode(editor.Model.GetType().Name) %> - (<%=Html.Encode(editor.Model.GetType().Namespace) %>) - Template:<%=Html.Encode(editor.TemplateName ?? "(null)")%> - Prefix:<%=Html.Encode(editor.Prefix ?? "(null)")%> - Zone:<%=Html.Encode(editor.ZoneName ?? "(null)")%> - Position:<%=Html.Encode(editor.Position??"(null)") %> + <%: editor.Prefix %> + <%: editor.Model.GetType().Name %> + (<%: editor.Model.GetType().Namespace %>) + Template:<%: editor.TemplateName ?? "(null)" %> + Prefix:<%: editor.Prefix ?? "(null)" %> + Zone:<%: editor.ZoneName ?? "(null)" %> + Position:<%: editor.Position??"(null)" %>
      <%=Html.EditorFor(x=>editor.Model, editor.TemplateName, editor.Prefix) %>
      diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx index 5c185c4e6..7bc154dfb 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Content/Index.aspx @@ -4,7 +4,7 @@

      <%=_Encoded("Content Types")%>

        <%foreach(var item in Model.Types.OrderBy(x=>x.Name)){%> -
      • <%=Html.Encode(item.Name) %>
        • +
      • <%: item.Name %>
        • <%}%>

      <%=_Encoded("Content Items")%>

      diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj index 9c6082b22..d7c4f79db 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj +++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj @@ -12,7 +12,7 @@ Orchard.Media Orchard.Media v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx index 1fb37f2ff..09aec2a30 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx @@ -19,8 +19,8 @@ " size="64"/> <%=_Encoded("After your files have been uploaded, you can edit the titles and descriptions.")%> - - + +
      " /> diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx index 60dcd8fb4..c30f5d94b 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx @@ -17,7 +17,7 @@
      - +
      " /> diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx index cd02356b8..213854122 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx @@ -70,7 +70,7 @@ <%=_Encoded("Orchard User")%> <%=mediaFile.LastUpdated %> - <%=Html.Encode(mediaFile.Type) %> + <%: mediaFile.Type %> <%=mediaFile.Size %> <%}%> @@ -79,7 +79,7 @@ "/> - + " height="16" width="16" class="mediaTypeIcon" alt="<%=_Encoded("Folder") %>" /> diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx index 0d5554e77..bb666820d 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx @@ -18,7 +18,7 @@ <%= Html.ValidationSummary() %>
      - <%=Html.Encode(Model.Caption) %> + <%: Model.Caption %>
      <%-- todo: make these real (including markup) --%> @@ -37,8 +37,8 @@
      - - + +
      @@ -57,7 +57,7 @@
      <%--

      <%=_Encoded("Preview")%>

      -
      " class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" />
      +
      " class="previewImage" alt="<%: Model.Caption %>" />
        <%-- todo: make these real (including markup)
        • diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx index 3741a936d..4bcf75abb 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx +++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx @@ -17,8 +17,8 @@ <%=Html.ValidationSummary() %>
        - - + +
        " /> diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj b/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj index 5f6504dcd..6dd6479a1 100644 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj +++ b/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj @@ -12,7 +12,7 @@ Orchard.MetaData Orchard.MetaData v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx b/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx index c0b78eead..16c66fd3f 100644 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx +++ b/src/Orchard.Web/Modules/Orchard.MetaData/Views/MetaData/ContentTypeList.ascx @@ -60,7 +60,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("Save",new {id=Model.SelectedCon " type="checkbox" /><%}%> - <%= Html.Encode(item.Name)%> + <%: item.Name %> diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj index 2668aeaf5..9e20f453b 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj @@ -12,7 +12,7 @@ Orchard.Modules Orchard.Modules v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx index 075b91ed4..897269d2f 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx @@ -21,7 +21,7 @@ //temporarily "disable" actions on core features var showActions = categoryName.ToString() != "Core"; %>
      • -

        <%=Html.Encode(categoryName) %>

        +

        <%: categoryName %>

          <% var features = featureGroup.OrderBy(f => f.Descriptor.Name); foreach (var feature in features) { diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx index 4a47b8b77..73a838b47 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx @@ -3,21 +3,21 @@ <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Modules.ViewModels"%>

          <%=Html.TitleForPage(T("Installed Modules").ToString()) %>

          -
          <%=Html.ActionLink(T("Install a module").ToString(), "Add", null, new { @class = "button primaryAction" })%>
          +
          <%: Html.ActionLink(T("Install a module"), "Add", null, new { @class = "button primaryAction" })%>
          <% if (Model.Modules.Count() > 0) { %>
            <% foreach (var module in Model.Modules.OrderBy(m => m.DisplayName)) { %>
          • -

            <%:module.DisplayName %> - <%=T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? Html.Encode(module.Version) : T("1.0")) %>

            <% +

            <%: module.DisplayName %> - <%: T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? module.Version : T("1.0").ToString()) %>

            <% if (!string.IsNullOrEmpty(module.Description)) { %> -

            <%:module.Description %>

            <% +

            <%: module.Description %>

            <% } %>
            • <%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n))) )).OrderBy(s => s).ToArray())) %>
              • -
            •  | <%=T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? Html.Encode(module.Author) : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %>
              • <%-- very efficient, I know --%> -
            •  | <%=T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? Html.Encode(module.HomePage) : T("http://orchardproject.net"))%>
              • +
            •  | <%: T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? module.Author : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %>
              • <%-- very efficient, I know --%> +
            •  | <%: T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? module.HomePage : T("http://orchardproject.net").ToString())%>
            diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj index 6ab56cf17..aa6a19d74 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -12,7 +12,7 @@ Orchard.MultiTenancy Orchard.MultiTenancy v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx index 44305f195..815bc7f93 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx @@ -7,7 +7,7 @@ <%=Html.ValidationSummary() %>
            -

            <%=Html.Encode(Model.Name) %>

            +

            <%: Model.Name %>

            diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx index d6853f6d5..8fba8c50f 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.ascx @@ -9,7 +9,7 @@
          • -

            <%=Html.Encode(tenant.Name) %><% +

            <%: tenant.Name %><% if (!string.IsNullOrEmpty(tenant.RequestUrlHost)) { %> - <%=Html.Link(Url.Tenant(tenant), Url.Tenant(tenant))%><% } %>

            diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj index 301406985..be3ec1239 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj +++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj @@ -12,7 +12,7 @@ Orchard.Pages Orchard.Pages v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx index 48b621531..0cc265efb 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx +++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx @@ -3,7 +3,7 @@ <%@ Import Namespace="Orchard.ContentManagement"%> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -

            "><%=Html.Encode(Model.Item.Title) %>

            +

            "><%: Model.Item.Title %>

            <% Html.Zone("primary", ":manage :metadata"); %>
            \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx index 09b1438cb..d36b83d4c 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx +++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
            -
            <%=_Encoded("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)"))%>
            +
            <%: T("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)").ToString())%>
            \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index 671501046..288b8fef5 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -12,7 +12,7 @@ Orchard.Roles Orchard.Roles v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx index 1a76203aa..068c02276 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.aspx @@ -6,7 +6,7 @@
            <%=_Encoded("Information") %> - +
            <%=_Encoded("Permissions") %> @@ -26,7 +26,7 @@ <% foreach (var permission in Model.ModulePermissions[moduleName]) { %> - <%=Html.Encode(permission.Description) %> + <%: permission.Description %> "/> <% } %> diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx index b1e086cdf..e1a4a1765 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.aspx @@ -6,7 +6,7 @@
            <%=_Encoded("Information") %> - +
            @@ -28,7 +28,7 @@ <% foreach (var permission in Model.ModulePermissions[moduleName]) { %> - <%=Html.Encode(permission.Description) %> + <%: permission.Description %> <% if (Model.CurrentPermissions.Contains(permission.Name)) { %> " checked="checked"/> diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx index c4e598cbb..5e1c51962 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.aspx @@ -28,7 +28,7 @@ <%foreach (var row in Model.Rows) { %> "/> - <%=Html.Encode(row.Name) %> + <%: row.Name %> <%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })%> <%}%> diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx index 79ce22756..c36fdec88 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx +++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx @@ -12,7 +12,7 @@ <%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%>
            <%=Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%> - +
            <%++index; } diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj index 54b613b8f..b2d5bd58b 100644 --- a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj +++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj @@ -12,7 +12,7 @@ Orchard.Sandbox Orchard.Sandbox v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj index 47e1b5f1d..0b648ae3b 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj @@ -12,7 +12,7 @@ Orchard.Setup Orchard.Setup v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj index 2c93a394a..d5ce73dba 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj @@ -12,7 +12,7 @@ Orchard.Tags Orchard.Tags v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx index dc3207a4e..b8ef25192 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.aspx @@ -5,7 +5,7 @@ <%=Html.ValidationSummary() %>
            - + " />
            <% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx index b50e55d6f..fa3f86416 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.aspx @@ -6,7 +6,7 @@
            - + " />
            <% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj index d5cfcd5ff..500dff09c 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj @@ -12,7 +12,7 @@ Orchard.Themes Orchard.Themes v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx index 618845880..8c36298d1 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx @@ -6,15 +6,15 @@ %>

            <%=_Encoded("There is no current theme in the application. The built-in theme will be used.") %>
            <%=Html.ActionLink(T("Install a new Theme").ToString(), "Install") %>

            <% } else { - %>

            <%=_Encoded("Current Theme")%> - <%=Html.Encode(Model.CurrentTheme.DisplayName) %>

            + %>

            <%=_Encoded("Current Theme")%> - <%: Model.CurrentTheme.DisplayName %>

            <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.png"), Html.Encode(Model.CurrentTheme.DisplayName), new { @class = "themePreviewImage" })%> -
            <%=_Encoded("By") %> <%=Html.Encode(Model.CurrentTheme.Author) %>
            +
            <%=_Encoded("By") %> <%: Model.CurrentTheme.Author %>

            - <%=_Encoded("Version:") %> <%=Html.Encode(Model.CurrentTheme.Version) %>
            - <%=Html.Encode(Model.CurrentTheme.Description) %>
            - <%=Html.Encode(Model.CurrentTheme.HomePage) %> + <%=_Encoded("Version:") %> <%: Model.CurrentTheme.Version %>
            + <%: Model.CurrentTheme.Description %>
            + <%: Model.CurrentTheme.HomePage %>

            <%=Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" })%> @@ -25,7 +25,7 @@ if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) { %>
          • -

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

            +

            <%: theme.DisplayName %>

            <%=Html.Image(Html.ThemePath(theme, "/Theme.png"), Html.Encode(theme.DisplayName), null)%> <% using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) { %> <%=Html.Hidden("themeName", theme.ThemeName)%> @@ -35,11 +35,11 @@ <%=Html.Hidden("themeName", theme.ThemeName)%> <% } %> -
            <%=_Encoded("By") %> <%=Html.Encode(theme.Author) %>
            +
            <%=_Encoded("By") %> <%: theme.Author %>

            - <%=_Encoded("Version:") %> <%=Html.Encode(theme.Version) %>
            - <%=Html.Encode(theme.Description) %>
            - <%=Html.Encode(theme.HomePage) %> + <%=_Encoded("Version:") %> <%: theme.Version %>
            + <%: theme.Description %>
            + <%: theme.HomePage %>

            <% using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { %> <%=Html.Hidden("themeName", theme.ThemeName)%> diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx index d8fc19423..394a60d93 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx +++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx @@ -1,3 +1,3 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> -
            <%=Html.Encode(Html.SiteName()) %>
            \ No newline at end of file +
            <%: Html.SiteName() %>
            diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx index c402c2f05..8fad33c88 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx +++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx @@ -6,5 +6,5 @@ : item.Type == NotifyType.Warning ? "warning" : "info"; %> -
            <%=Html.Encode(item.Message) %>
            +
            <%: item.Message %>
            <% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index 747a36978..faf53194c 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -12,7 +12,7 @@ Orchard.Users Orchard.Users v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx index 3ebac9da5..7f86e0f8a 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx @@ -22,10 +22,10 @@ { %> - <%=Html.Encode(row.User.UserName)%> + <%: row.User.UserName %> - <%=Html.Encode(row.User.Email)%> + <%: row.User.Email %> <%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.User.Id })%> | diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj index 9f7e48552..d51a80f38 100644 --- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj +++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj @@ -12,7 +12,7 @@ TinyMce TinyMce v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 92a1b60ed..958b9a842 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -12,7 +12,7 @@ Orchard.Web Orchard.Web v4.0 - false + true 3.5 diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx index c5952fce6..11765e677 100644 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx @@ -5,4 +5,4 @@

            <%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %>

            <%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%>
            -

            <%=Html.Encode(Model.Item.Description) %>

            +

            <%: Model.Item.Description %>

            diff --git a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx index fe247668c..b0c39f539 100644 --- a/src/Orchard.Web/Themes/Classic/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/Layout.ascx @@ -19,7 +19,7 @@ <%--Top Navigation and branding--%>
          • -

            <%=Html.Encode(comment.Record.CommentText) %>

            +

            <%: comment.Record.CommentText %>

            diff --git a/src/Orchard.Web/Themes/Contoso/Views/User.ascx b/src/Orchard.Web/Themes/Contoso/Views/User.ascx index b16c4d2c6..ac334b191 100644 --- a/src/Orchard.Web/Themes/Contoso/Views/User.ascx +++ b/src/Orchard.Web/Themes/Contoso/Views/User.ascx @@ -2,7 +2,7 @@
              <% if (Request.IsAuthenticated) { %> -
            • <%=_Encoded("Welcome")%> <%=Html.Encode(Page.User.Identity.Name) %>
              • +
            • <%=_Encoded("Welcome")%> <%: Page.User.Identity.Name %>
            • <%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users" })%>
            • <%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%>
              • <% } diff --git a/src/Orchard.Web/Themes/Corporate/Views/Footer.ascx b/src/Orchard.Web/Themes/Corporate/Views/Footer.ascx index 8c8355e4d..5b2eb74e1 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/Footer.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/Footer.ascx @@ -4,7 +4,7 @@
              - ©2010 <%= Html.Encode(Html.SiteName()) %>. All rights reserved.
              + ©2010 <%: Html.SiteName() %>. All rights reserved.
              *This is perfect for disclaimer content. You can use this content to let people know something important. A good example is if you’re FDIC insured, or the organizations you are part of. Use this space wisely. It shows up on every page. You can even put some legal terms in there. diff --git a/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx index a01a36abd..773031601 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/Layout.HomePage.ascx @@ -19,7 +19,7 @@ <% Html.Zone("menu"); %>
              diff --git a/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx b/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx index fa3f583c9..23f8fa043 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/Layout.ascx @@ -19,7 +19,7 @@ <% Html.Zone("menu"); %>
            diff --git a/src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx b/src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx index a427c5f79..c86a1eea1 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx @@ -5,7 +5,7 @@ foreach (var comment in Model) { %>
          • -

            <%=Html.Encode(comment.Record.CommentText) %>

            +

            <%: comment.Record.CommentText %>

            diff --git a/src/Orchard.Web/Themes/Corporate/Views/User.ascx b/src/Orchard.Web/Themes/Corporate/Views/User.ascx index b16c4d2c6..ac334b191 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/User.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/User.ascx @@ -2,7 +2,7 @@
              <% if (Request.IsAuthenticated) { %> -
            • <%=_Encoded("Welcome")%> <%=Html.Encode(Page.User.Identity.Name) %>
              • +
            • <%=_Encoded("Welcome")%> <%: Page.User.Identity.Name %>
            • <%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users" })%>
            • <%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%>
              • <% } diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx index eb7aa6eaf..80b00419b 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx @@ -4,4 +4,4 @@ <%@ Import Namespace="Orchard.Blogs.Models"%>

              <%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %>

              <%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%>
              -

              <%=Html.Encode(Model.Item.Description) %>

              \ No newline at end of file +

              <%: Model.Item.Description %>

              diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx index a92e4714b..ffe097f8d 100644 --- a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx +++ b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx @@ -24,7 +24,7 @@ return false;