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

--HG--
branch : dev

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

@@ -1,25 +1,25 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ThemesIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Themes.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Manage Themes").ToString()) %></h1>
+<h1><%: Html.TitleForPage(T("Manage Themes").ToString()) %></h1>
 <% if (Model.CurrentTheme == null) {
-    %><p><%=_Encoded("There is no current theme in the application. The built-in theme will be used.")
-             %><br /><%=Html.ActionLink(T("Install a new Theme").ToString(), "Install") %></p><%
+    %><p><%: T("There is no current theme in the application. The built-in theme will be used.")
+             %><br /><%: Html.ActionLink(T("Install a new Theme").ToString(), "Install") %></p><%
    } else {
-    %><h3><%=_Encoded("Current Theme")%> - <%: Model.CurrentTheme.DisplayName %></h3>
+    %><h3><%: T("Current Theme")%> - <%: Model.CurrentTheme.DisplayName %></h3>
 
         <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.png"), Html.Encode(Model.CurrentTheme.DisplayName), new { @class = "themePreviewImage" })%>
-        <h5><%=_Encoded("By") %> <%: Model.CurrentTheme.Author %></h5>
+        <h5><%: T("By") %> <%: Model.CurrentTheme.Author %></h5>
         
         <p>
-        <%=_Encoded("Version:") %> <%: Model.CurrentTheme.Version %><br />
+        <%: T("Version:") %> <%: Model.CurrentTheme.Version %><br />
         <%: Model.CurrentTheme.Description %><br />
         <%: Model.CurrentTheme.HomePage %>
         </p>
-        <%=Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" })%>
+        <%: Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" })%>
      
 <% } %>
-<h2><%=_Encoded("Available Themes")%></h2>
+<h2><%: T("Available Themes")%></h2>
 <ul class="templates">
 <% foreach (var theme in Model.Themes) {
     if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {
@@ -28,22 +28,22 @@
         <h3><%: theme.DisplayName %></h3>
         <%=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)%>
-            <button type="submit" title="<%=_Encoded("Activate") %>"><%=_Encoded("Activate") %></button>
+            <%: Html.Hidden("themeName", theme.ThemeName)%>
+            <button type="submit" title="<%: T("Activate") %>"><%: T("Activate") %></button>
         <% } %>
         <% using (Html.BeginFormAntiForgeryPost(Url.Action("Preview"), FormMethod.Post, new { @class = "inline" })) { %>
-            <%=Html.Hidden("themeName", theme.ThemeName)%>
-            <button type="submit" title="<%=_Encoded("Preview") %>"><%=_Encoded("Preview") %></button>
+            <%: Html.Hidden("themeName", theme.ThemeName)%>
+            <button type="submit" title="<%: T("Preview") %>"><%: T("Preview") %></button>
         <% } %>
-        <h5><%=_Encoded("By") %> <%: theme.Author %></h5>
+        <h5><%: T("By") %> <%: theme.Author %></h5>
         <p>
-            <%=_Encoded("Version:") %> <%: theme.Version %><br />
+            <%: T("Version:") %> <%: theme.Version %><br />
             <%: theme.Description %><br />
             <%: theme.HomePage %>
         </p>
         <% using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { %>
-            <%=Html.Hidden("themeName", theme.ThemeName)%>
-           <button type="submit" class="uninstall" title="<%=_Encoded("Uninstall") %>"><%=_Encoded("Uninstall")%></button>
+            <%: Html.Hidden("themeName", theme.ThemeName)%>
+           <button type="submit" class="uninstall" title="<%: T("Uninstall") %>"><%: T("Uninstall")%></button>
         <% } %>
      </div>   
     </li>

src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.aspx

@@ -1,12 +1,12 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<object>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<h1><%=Html.TitleForPage(T("Install Theme").ToString()) %></h1>
+<h1><%: Html.TitleForPage(T("Install Theme").ToString()) %></h1>
 <% using (Html.BeginForm("Install", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%>
-    <%=Html.ValidationSummary() %>
+    <%: Html.ValidationSummary() %>
     <fieldset>
-        <label for="ThemeZipPath"><%=_Encoded("File Path to the zip file:")%></label>
-        <input id="ThemeZipPath" name="ThemeZipPath" type="file" class="text" value="<%=_Encoded("Browse") %>" size="64" /><br />
-		<input type="submit" class="button" value="<%=_Encoded("Install") %>" />
-		<%=Html.AntiForgeryTokenOrchard() %>
+        <label for="ThemeZipPath"><%: T("File Path to the zip file:")%></label>
+        <input id="ThemeZipPath" name="ThemeZipPath" type="file" class="text" value="<%: T("Browse") %>" size="64" /><br />
+		<input type="submit" class="button" value="<%: T("Install") %>" />
+		<%: Html.AntiForgeryTokenOrchard() %>
 	</fieldset>
 <% } %> 

src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx

@@ -59,11 +59,11 @@ html.dyn #themepreview button.preview { display:none; }
 <% using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Orchard.Themes"}), FormMethod.Post, new { @class = "inline" })) { %>
     <fieldset>    
         <span><%=T("You are previewing: ")%></span>
-        <%=Html.Hidden("ReturnUrl", Context.Request.RawUrl)%>
+        <%: Html.Hidden("ReturnUrl", Context.Request.RawUrl)%>
         <%=Html.DropDownList("ThemeName", Model.Themes, new {onChange = "this.form.submit();"})%>
-        <button type="submit" class="preview" title="<%=_Encoded("Preview")%>" name="submit.Preview" value="<%=_Encoded("Preview")%>"><%=_Encoded("Preview")%></button>
-        <button type="submit" title="<%=_Encoded("Apply")%>" name="submit.Apply" value="<%=_Encoded("Apply")%>"><%=_Encoded("Apply this theme") %></button>
-        <button type="submit" class="cancel" title="<%=_Encoded("Cancel")%>" name="submit.Cancel" value="<%=_Encoded("Cancel")%>"><%=_Encoded("Cancel")%></button>
+        <button type="submit" class="preview" title="<%: T("Preview")%>" name="submit.Preview" value="<%: T("Preview")%>"><%: T("Preview")%></button>
+        <button type="submit" title="<%: T("Apply")%>" name="submit.Apply" value="<%: T("Apply")%>"><%: T("Apply this theme") %></button>
+        <button type="submit" class="cancel" title="<%: T("Cancel")%>" name="submit.Cancel" value="<%: T("Cancel")%>"><%: T("Cancel")%></button>
     </fieldset>
 <% } %>
 </div>

src/Orchard.Web/Modules/Orchard.Themes/Views/Document.aspx

@@ -4,7 +4,7 @@
 %><!DOCTYPE html>
 <html lang="en" class="static">
 <head>
-    <title><%=Html.Title(Html.SiteName()) %></title>
+    <title><%: Html.Title(Html.SiteName()) %></title>
     <link rel="shortcut icon" type="image/x-icon" href="<%=ResolveUrl("../Content/orchard.ico") %>" /><%
      //todo: (heskew) have resource modules that can be leaned on (like a jQuery module that knows about various CDNs and jQuery's version and min naming schemes)
      //todo: (heskew) this is an interim solution to inlude jQuery in every page and still allow that to be overriden in some theme by it containing a headScripts partial
@@ -12,7 +12,7 @@
      Html.Zone("head", ":metas :styles :scripts"); %>
     <script type="text/javascript">document.documentElement.className="dyn";</script>
 </head>
-<body class="<%=Html.ClassForPage() %>"><%
+<body class="<%: Html.ClassForPage() %>"><%
     Html.ZoneBody("body"); %>
 </body>
 </html>

src/Orchard.Web/Modules/Orchard.Themes/Views/NotFound.ascx

@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Not found").ToString()) %></h1>
-<p><%=_Encoded("The page you are looking for does not exist.")%></p>
+<h1><%: Html.TitleForPage(T("Not found").ToString()) %></h1>
+<p><%: T("The page you are looking for does not exist.")%></p>

src/Orchard.Web/Modules/Orchard.Themes/Views/User.ascx

@@ -2,10 +2,10 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <div id="logindisplay">
 <% if (Request.IsAuthenticated) { %> 
-    <%=T("Welcome, <strong>{0}</strong>!", Html.Encode(Page.User.Identity.Name)) %> 
-    <%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })%>
-    &nbsp;&#124;&nbsp;<%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%>
+    <%: T("Welcome, <strong>{0}</strong>!", Page.User.Identity.Name) %> 
+    <%: Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })%>
+    &nbsp;&#124;&nbsp;<%: Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%>
 <% } else { %>
-    <%=Html.ActionLink(T("Log On").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }) %>
+    <%: Html.ActionLink(T("Log On").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }) %>
 <% } %>
 </div>