Changed multiple usages of <%= to <%: where appropriate

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Users/Views/Account/AccessDenied.ascx

@@ -1,4 +1,4 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BaseViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Access Denied").ToString()) %></h1>
-<p><%=_Encoded("You do not have permission to complete your request.")%></p>
+<h1><%: Html.TitleForPage(T("Access Denied").ToString()) %></h1>
+<p><%: T("You do not have permission to complete your request.")%></p>

src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.ascx

@@ -1,28 +1,28 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
-<h1><%=Html.TitleForPage(T("Change Password").ToString()) %></h1>
-<p><%=_Encoded("Use the form below to change your password.")%></p>
-<p><%=_Encoded("New passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string) %></p>
-<%=Html.ValidationSummary(T("Password change was unsuccessful. Please correct the errors and try again.").ToString())%>
+<h1><%: Html.TitleForPage(T("Change Password").ToString()) %></h1>
+<p><%: T("Use the form below to change your password.")%></p>
+<p><%: T("New passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string) %></p>
+<%: Html.ValidationSummary(T("Password change was unsuccessful. Please correct the errors and try again.").ToString())%>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <fieldset>
-        <legend><%=_Encoded("Account Information")%></legend>
+        <legend><%: T("Account Information")%></legend>
         <div>
-            <label for="currentPassword"><%=_Encoded("Current password:")%></label>
-            <%=Html.Password("currentPassword") %>
-            <%=Html.ValidationMessage("currentPassword") %>
+            <label for="currentPassword"><%: T("Current password:")%></label>
+            <%: Html.Password("currentPassword") %>
+            <%: Html.ValidationMessage("currentPassword") %>
         </div>
         <div>
-            <label for="newPassword"><%=_Encoded("New password:")%></label>
-            <%= Html.Password("newPassword") %>
-            <%= Html.ValidationMessage("newPassword") %>
+            <label for="newPassword"><%: T("New password:")%></label>
+            <%: Html.Password("newPassword") %>
+            <%: Html.ValidationMessage("newPassword") %>
         </div>
         <div>
-            <label for="confirmPassword"><%=_Encoded("Confirm new password:")%></label>
-            <%= Html.Password("confirmPassword") %>
-            <%= Html.ValidationMessage("confirmPassword") %>
+            <label for="confirmPassword"><%: T("Confirm new password:")%></label>
+            <%: Html.Password("confirmPassword") %>
+            <%: Html.ValidationMessage("confirmPassword") %>
         </div>
         <div>
-            <input type="submit" value="<%=_Encoded("Change Password") %>" />
+            <input type="submit" value="<%: T("Change Password") %>" />
         </div>
     </fieldset>
 <% } %>

src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePasswordSuccess.ascx

@@ -1,3 +1,3 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
-<h1><%=Html.TitleForPage(T("Change Password").ToString()) %></h1>
-<p><%=_Encoded("Your password has been changed successfully.")%></p>
+<h1><%: Html.TitleForPage(T("Change Password").ToString()) %></h1>
+<p><%: T("Your password has been changed successfully.")%></p>

src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx

@@ -1,25 +1,25 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<LogOnViewModel>" %>
 <%@ Import Namespace="Orchard.Users.ViewModels"%>
-<h1><%=Html.TitleForPage(Model.Title)%></h1>
-<p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink("Register", "Register")%><%=_Encoded(" if you don't have an account.")%></p>
-<%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())%>
+<h1><%: Html.TitleForPage(Model.Title)%></h1>
+<p><%: T("Please enter your username and password.")%> <%: Html.ActionLink("Register", "Register")%><%: T(" if you don't have an account.")%></p>
+<%: Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())%>
 <%
 using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Request.QueryString["ReturnUrl"]}))) { %>
 <fieldset>
-    <legend><%=_Encoded("Account Information")%></legend>
+    <legend><%: T("Account Information")%></legend>
     <div>
-        <label for="userNameOrEmail"><%=_Encoded("Username or Email:")%></label>
-        <%= Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%>
-        <%= Html.ValidationMessage("userNameOrEmail")%>
+        <label for="userNameOrEmail"><%: T("Username or Email:")%></label>
+        <%: Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%>
+        <%: Html.ValidationMessage("userNameOrEmail")%>
     </div>
     <div>
-        <label for="password"><%=_Encoded("Password:")%></label>
-        <%= Html.Password("password")%>
-        <%= Html.ValidationMessage("password")%>
+        <label for="password"><%: T("Password:")%></label>
+        <%: Html.Password("password")%>
+        <%: Html.ValidationMessage("password")%>
     </div>
     <div>
-        <%= Html.CheckBox("rememberMe")%><label class="forcheckbox" for="rememberMe"><%=_Encoded("Remember me?")%></label>
+        <%: Html.CheckBox("rememberMe")%><label class="forcheckbox" for="rememberMe"><%: T("Remember me?")%></label>
     </div>
-    <input type="submit" value="<%=_Encoded("Log On") %>" />
+    <input type="submit" value="<%: T("Log On") %>" />
 </fieldset><%
 } %>

src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.ascx

@@ -1,33 +1,33 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
-<h1><%=Html.TitleForPage(T("Create a New Account").ToString()) %></h1>
-<p><%=_Encoded("Use the form below to create a new account.")%></p>
-<p><%=_Encoded("Passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string)%></p>
-<%=Html.ValidationSummary(T("Account creation was unsuccessful. Please correct the errors and try again.").ToString()) %>
+<h1><%: Html.TitleForPage(T("Create a New Account").ToString()) %></h1>
+<p><%: T("Use the form below to create a new account.")%></p>
+<p><%: T("Passwords are required to be a minimum of {0} characters in length.", ViewData["PasswordLength"] as string)%></p>
+<%: Html.ValidationSummary(T("Account creation was unsuccessful. Please correct the errors and try again.").ToString()) %>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <fieldset>
-        <legend><%=_Encoded("Account Information")%></legend>
+        <legend><%: T("Account Information")%></legend>
         <div>
-            <label for="username"><%=_Encoded("Username:")%></label>
-            <%= Html.TextBox("username") %>
-            <%= Html.ValidationMessage("username") %>
+            <label for="username"><%: T("Username:")%></label>
+            <%: Html.TextBox("username") %>
+            <%: Html.ValidationMessage("username") %>
         </div>
         <div>
-            <label for="email"><%=_Encoded("Email:")%></label>
-            <%= Html.TextBox("email") %>
-            <%= Html.ValidationMessage("email") %>
+            <label for="email"><%: T("Email:")%></label>
+            <%: Html.TextBox("email") %>
+            <%: Html.ValidationMessage("email") %>
         </div>
         <div>
-            <label for="password"><%=_Encoded("Password:")%></label>
-            <%= Html.Password("password") %>
-            <%= Html.ValidationMessage("password") %>
+            <label for="password"><%: T("Password:")%></label>
+            <%: Html.Password("password") %>
+            <%: Html.ValidationMessage("password") %>
         </div>
         <div>
-            <label for="confirmPassword"><%=_Encoded("Confirm password:")%></label>
-            <%= Html.Password("confirmPassword") %>
-            <%= Html.ValidationMessage("confirmPassword") %>
+            <label for="confirmPassword"><%: T("Confirm password:")%></label>
+            <%: Html.Password("confirmPassword") %>
+            <%: Html.ValidationMessage("confirmPassword") %>
         </div>
         <div>
-            <input type="submit" value="<%=_Encoded("Register") %>" />
+            <input type="submit" value="<%: T("Register") %>" />
         </div>
     </fieldset>
 <% } %>

src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx

@@ -1,14 +1,14 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<UserCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Users.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Add User").ToString()) %></h1>
+<h1><%: Html.TitleForPage(T("Add User").ToString()) %></h1>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
-    <%=Html.ValidationSummary() %>
-    <%=Html.EditorFor(m=>m.UserName, "inputTextLarge")%>
-    <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
-    <%=Html.EditorFor(m=>m.Password, "inputPasswordLarge") %>
-    <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
-    <%=Html.EditorForItem(Model.User) %>
+    <%: Html.ValidationSummary() %>
+    <%: Html.EditorFor(m=>m.UserName, "inputTextLarge")%>
+    <%: Html.EditorFor(m=>m.Email, "inputTextLarge") %>
+    <%: Html.EditorFor(m=>m.Password, "inputPasswordLarge") %>
+    <%: Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
+    <%: Html.EditorForItem(Model.User) %>
     <fieldset>
-        <input class="button primaryAction" type="submit" value="<%=_Encoded("Add") %>" />
+        <input class="button primaryAction" type="submit" value="<%: T("Add") %>" />
     </fieldset>
 <% } %>

src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.aspx

@@ -1,13 +1,13 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<UserEditViewModel>" %>
 <%@ Import Namespace="Orchard.Users.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Edit User").ToString()) %></h1>
+<h1><%: Html.TitleForPage(T("Edit User").ToString()) %></h1>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
-    <%=Html.ValidationSummary() %>
-    <%=Html.EditorFor(m=>m.Id) %>
-    <%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
-    <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
-    <%=Html.EditorForItem(Model.User) %>
+    <%: Html.ValidationSummary() %>
+    <%: Html.EditorFor(m=>m.Id) %>
+    <%: Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
+    <%: Html.EditorFor(m=>m.Email, "inputTextLarge") %>
+    <%: Html.EditorForItem(Model.User) %>
     <fieldset>
-        <input class="button primaryAction" type="submit" value="<%=_Encoded("Save") %>" />
+        <input class="button primaryAction" type="submit" value="<%: T("Save") %>" />
     </fieldset>
 <% } %>

src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
 <fieldset>
-    <%=Html.LabelForModel() %>
-    <%=Html.Password("", Model, new { @class = "textMedium" })%>
-    <%=Html.ValidationMessage("", "*") %>
+    <%: Html.LabelForModel() %>
+    <%: Html.Password("", Model, new { @class = "textMedium" })%>
+    <%: Html.ValidationMessage("", "*") %>
 </fieldset>

src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
 <fieldset>
-    <%=Html.LabelForModel() %>
-    <%=Html.TextBox("", Model, new { @class = "textMedium" })%>
-    <%=Html.ValidationMessage("", "*") %>
+    <%: Html.LabelForModel() %>
+    <%: Html.TextBox("", Model, new { @class = "textMedium" })%>
+    <%: Html.ValidationMessage("", "*") %>
 </fieldset>

src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx

@@ -1,9 +1,9 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<UsersIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Users.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Manage Users").ToString()) %></h1>
+<h1><%: Html.TitleForPage(T("Manage Users").ToString()) %></h1>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
-    <%=Html.ValidationSummary()%>
-    <div class="manage"><%=Html.ActionLink(T("Add a new user").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
+    <%: Html.ValidationSummary()%>
+    <div class="manage"><%: Html.ActionLink(T("Add a new user").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
     <fieldset>
         <table class="items">
             <colgroup>
@@ -13,9 +13,9 @@
             </colgroup>
             <thead>
                 <tr>
-                    <th scope="col"><%=_Encoded("Name")%></th>
-                    <th scope="col"><%=_Encoded("Email")%></th>
-                    <th scope="col"><%=_Encoded("") %></th>
+                    <th scope="col"><%: T("Name")%></th>
+                    <th scope="col"><%: T("Email")%></th>
+                    <th scope="col"><%: T("") %></th>
                 </tr>
             </thead>
             <% foreach (var row in Model.Rows)
@@ -28,8 +28,8 @@
                     <%: row.User.Email %>
                 </td>
                 <td>
-                    <%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.User.Id })%> | 
-                    <%=Html.ActionLink(T("Remove").ToString(), "Delete", new { row.User.Id })%> 
+                    <%: Html.ActionLink(T("Edit").ToString(), "Edit", new { row.User.Id })%> | 
+                    <%: Html.ActionLink(T("Remove").ToString(), "Delete", new { row.User.Id })%> 
                 </td>
             </tr>
             <%}%>