Replaced Html.Encode with the new <%: %> syntax for auto encoding

--HG--
branch : dev
This commit is contained in:
Phil Haack
2010-06-08 22:44:30 -07:00
parent 521ba68b61
commit 7108d92147
68 changed files with 117 additions and 117 deletions

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Azure.Web</RootNamespace> <RootNamespace>Orchard.Azure.Web</RootNamespace>
<AssemblyName>Orchard.Azure.Web</AssemblyName> <AssemblyName>Orchard.Azure.Web</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

View File

@@ -10,7 +10,7 @@
<%=Html.TextBoxFor(m => m.Title, new { @class = "large text" }) %> <%=Html.TextBoxFor(m => m.Title, new { @class = "large text" }) %>
</fieldset> </fieldset>
<fieldset class="permalink"> <fieldset class="permalink">
<label class="sub" for="Slug"><%=_Encoded("Permalink")%><br /><span><%=Html.Encode(Request.ToRootUrlString())%>/<%=Html.Encode(Model.RoutableAspect.ContentItemBasePath) %></span></label> <label class="sub" for="Slug"><%=_Encoded("Permalink")%><br /><span><%: Request.ToRootUrlString() %>/<%: Model.RoutableAspect.ContentItemBasePath %></span></label>
<span><%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%></span> <span><%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%></span>
</fieldset> </fieldset>
<% using (this.Capture("end-of-page-scripts")) { %> <% using (this.Capture("end-of-page-scripts")) { %>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Futures.Widgets</RootNamespace> <RootNamespace>Futures.Widgets</RootNamespace>
<AssemblyName>Futures.Widgets</AssemblyName> <AssemblyName>Futures.Widgets</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Blogs</RootNamespace> <RootNamespace>Orchard.Blogs</RootNamespace>
<AssemblyName>Orchard.Blogs</AssemblyName> <AssemblyName>Orchard.Blogs</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -3,5 +3,5 @@
<%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>
<h2><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h2> <h2><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h2>
<% if (!string.IsNullOrEmpty(Model.Item.Description)) { %><p><%=Html.Encode(Model.Item.Description) %></p><% } %> <% if (!string.IsNullOrEmpty(Model.Item.Description)) { %><p><%: Model.Item.Description %></p><% } %>
<div class="blog metadata"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%> | <%Html.Zone("meta");%></div> <div class="blog metadata"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%> | <%Html.Zone("meta");%></div>

View File

@@ -17,7 +17,7 @@
<h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.BlogForAdmin(Model.Item.Slug)) %></h3> <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.BlogForAdmin(Model.Item.Slug)) %></h3>
<p><% Html.Zone("meta");%></p> <p><% Html.Zone("meta");%></p>
<%--<p>[list of authors] [modify blog access]</p>--%> <%--<p>[list of authors] [modify blog access]</p>--%>
<p><%=Html.Encode(Model.Item.Description) %></p> <p><%: Model.Item.Description %></p>
</div> </div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>

View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Blog>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Blog>" %>
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>
<div class="blogdescription"> <div class="blogdescription">
<p><%=Html.Encode(Model.Description) %></p> <p><%: Model.Description %></p>
</div> </div>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Comments</RootNamespace> <RootNamespace>Orchard.Comments</RootNamespace>
<AssemblyName>Orchard.Comments</AssemblyName> <AssemblyName>Orchard.Comments</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -77,10 +77,10 @@
else if (commentEntry.Comment.Status == CommentStatus.Pending) { %><%=_Encoded("Pending") %><% } else if (commentEntry.Comment.Status == CommentStatus.Pending) { %><%=_Encoded("Pending") %><% }
else { %><%=_Encoded("Approved") %><% } %> else { %><%=_Encoded("Approved") %><% } %>
</td> </td>
<td><%=Html.Encode(commentEntry.Comment.UserName) %></td> <td><%: commentEntry.Comment.UserName %></td>
<td> <td>
<% if (commentEntry.Comment.CommentText != null) {%> <% 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(" ...") %>
<% } %> <% } %>
</td> </td>
<td><%=Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault()) %></td> <td><%=Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault()) %></td>

View File

@@ -7,21 +7,21 @@
<fieldset class="who"> <fieldset class="who">
<div> <div>
<label for="Name"><%=_Encoded("Name") %></label> <label for="Name"><%=_Encoded("Name") %></label>
<input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" /> <input id="Name" class="text" name="Name" type="text" value="<%: Model.Name %>" />
</div> </div>
<div> <div>
<label for="Email"><%=_Encoded("Email") %></label> <label for="Email"><%=_Encoded("Email") %></label>
<input id="Email" class="text" name="Email" type="text" value="<%=Html.Encode(Model.Email)%>" /> <input id="Email" class="text" name="Email" type="text" value="<%: Model.Email %>" />
</div> </div>
<div> <div>
<label for="SiteName"><%=_Encoded("Url") %></label> <label for="SiteName"><%=_Encoded("Url") %></label>
<input id="SiteName" class="text" name="SiteName" type="text" value="<%=Html.Encode(Model.SiteName) %>" /> <input id="SiteName" class="text" name="SiteName" type="text" value="<%: Model.SiteName %>" />
</div> </div>
</fieldset> </fieldset>
<fieldset class="what"> <fieldset class="what">
<div> <div>
<label for="CommentText"><%=_Encoded("Body") %></label> <label for="CommentText"><%=_Encoded("Body") %></label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText"><%=Html.Encode(Model.CommentText) %></textarea> <textarea id="CommentText" rows="10" cols="30" name="CommentText"><%: Model.CommentText %></textarea>
<input id="CommentId" name="Id" type="hidden" value="<%=Model.Id %>" /> <input id="CommentId" name="Id" type="hidden" value="<%=Model.Id %>" />
</div> </div>
</fieldset> </fieldset>

View File

@@ -60,11 +60,11 @@
<td><% if (commentEntry.Comment.Status == CommentStatus.Spam) { %><%=_Encoded("Spam") %><% } <td><% if (commentEntry.Comment.Status == CommentStatus.Spam) { %><%=_Encoded("Spam") %><% }
else if (commentEntry.Comment.Status == CommentStatus.Pending) { %><%=_Encoded("Pending") %><% } else if (commentEntry.Comment.Status == CommentStatus.Pending) { %><%=_Encoded("Pending") %><% }
else { %><%=_Encoded("Approved") %><% } %></td> else { %><%=_Encoded("Approved") %><% } %></td>
<td><%=Html.Encode(commentEntry.Comment.UserName) %></td> <td><%: commentEntry.Comment.UserName %></td>
<td> <td>
<% if (commentEntry.Comment.CommentText != null) {%> <% 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 ... --%> <%-- 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(" ...") %>
<% } %> <% } %>
</td> </td>
<td><%=Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault()) %></td> <td><%=Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault()) %></td>

View File

@@ -10,7 +10,7 @@ foreach (var comment in Model) { %>
</div> </div>
<div class="text"> <div class="text">
<%-- todo: (heskew) comment text needs processing depending on comment markup style --%> <%-- todo: (heskew) comment text needs processing depending on comment markup style --%>
<p><%=Html.Encode(comment.Record.CommentText)%></p> <p><%: comment.Record.CommentText %></p>
</div> </div>
</li><% </li><%
} %> } %>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.DevTools</RootNamespace> <RootNamespace>Orchard.DevTools</RootNamespace>
<AssemblyName>Orchard.DevTools</AssemblyName> <AssemblyName>Orchard.DevTools</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -20,10 +20,10 @@
<ul> <ul>
<%foreach (var partType in Model.PartTypes.OrderBy(x => x.Name)) {%> <%foreach (var partType in Model.PartTypes.OrderBy(x => x.Name)) {%>
<li><span style="font-weight: bold;"> <li><span style="font-weight: bold;">
<%if (partType.IsGenericType) {%><%=Html.Encode(partType.Name +" "+partType.GetGenericArguments().First().Name)%> <%if (partType.IsGenericType) {%><%: partType.Name +" "+partType.GetGenericArguments().First().Name %>
<%=Html.Encode(" (" + partType.GetGenericArguments().First().Namespace + ")")%><%} <%: " (" + partType.GetGenericArguments().First().Namespace + ")" %><%}
else {%><%=Html.Encode(partType.Name)%> else {%><%: partType.Name %>
<%=Html.Encode( " (" + partType.Namespace + ")")%><% <%: " (" + partType.Namespace + ")" %><%
} }
%></span> %></span>
@@ -31,8 +31,8 @@
<%foreach (var prop in partType.GetProperties().Where(x => x.DeclaringType == partType)) { <%foreach (var prop in partType.GetProperties().Where(x => x.DeclaringType == partType)) {
var value = prop.GetValue(Model.Locate(partType), null);%> var value = prop.GetValue(Model.Locate(partType), null);%>
<li style="font-weight: normal;"> <li style="font-weight: normal;">
<%=Html.Encode(prop.Name) %>: <%: prop.Name %>:
<%=Html.Encode(value) %> <%: value %>
<%var valueItem = value as ContentItem; <%var valueItem = value as ContentItem;
if (valueItem == null && value is IContent) { if (valueItem == null && value is IContent) {
valueItem = (value as IContent).ContentItem; valueItem = (value as IContent).ContentItem;
@@ -46,7 +46,7 @@
else if (typeof(IEnumerable).IsAssignableFrom(prop.PropertyType)) { else if (typeof(IEnumerable).IsAssignableFrom(prop.PropertyType)) {
foreach (var item in value as IEnumerable) { foreach (var item in value as IEnumerable) {
%> %>
<li><%=Html.Encode(item.GetType().Name) %>:<%=Html.Encode(item) %></li> <li><%: item.GetType().Name %>:<%: item %></li>
<% <%
} }
@@ -54,8 +54,8 @@
else {%> else {%>
<%foreach (var prop2 in value.GetType().GetProperties().Where(x => x.GetIndexParameters().Count() == 0)) {%> <%foreach (var prop2 in value.GetType().GetProperties().Where(x => x.GetIndexParameters().Count() == 0)) {%>
<li> <li>
<%=Html.Encode(prop2.Name)%> <%: prop2.Name %>
<%=Html.Encode(prop2.GetValue(value, null))%></li> <%: prop2.GetValue(value, null) %></li>
<%} %> <%} %>
<%} %> <%} %>
</ul> </ul>
@@ -71,13 +71,13 @@
<ul> <ul>
<%foreach (var display in Model.Displays) {%> <%foreach (var display in Model.Displays) {%>
<li><span style="font-weight: bold"> <li><span style="font-weight: bold">
<%=Html.Encode(display.Prefix)%></span> <%: display.Prefix %></span>
<%=Html.Encode(display.Model.GetType().Name)%> <%: display.Model.GetType().Name %>
(<%=Html.Encode(display.Model.GetType().Namespace)%>) (<%: display.Model.GetType().Namespace %>)
Template:<%=Html.Encode(display.TemplateName ?? "(null)")%> Template:<%: display.TemplateName ?? "(null)" %>
Prefix:<%=Html.Encode(display.Prefix ?? "(null)")%> Prefix:<%: display.Prefix ?? "(null)" %>
Zone:<%=Html.Encode(display.ZoneName ?? "(null)")%> Zone:<%: display.ZoneName ?? "(null)" %>
Position:<%=Html.Encode(display.Position ?? "(null)")%> Position:<%: display.Position ?? "(null)" %>
<div style="margin-left: 20px; border: solid 1px black;"> <div style="margin-left: 20px; border: solid 1px black;">
<%=Html.DisplayFor(x => display.Model, display.TemplateName, display.Prefix)%> <%=Html.DisplayFor(x => display.Model, display.TemplateName, display.Prefix)%>
</div> </div>
@@ -91,13 +91,13 @@
<ul> <ul>
<%foreach (var editor in Model.Editors) {%> <%foreach (var editor in Model.Editors) {%>
<li><span style="font-weight: bold"> <li><span style="font-weight: bold">
<%=Html.Encode(editor.Prefix) %></span> <%: editor.Prefix %></span>
<%=Html.Encode(editor.Model.GetType().Name) %> <%: editor.Model.GetType().Name %>
(<%=Html.Encode(editor.Model.GetType().Namespace) %>) (<%: editor.Model.GetType().Namespace %>)
Template:<%=Html.Encode(editor.TemplateName ?? "(null)")%> Template:<%: editor.TemplateName ?? "(null)" %>
Prefix:<%=Html.Encode(editor.Prefix ?? "(null)")%> Prefix:<%: editor.Prefix ?? "(null)" %>
Zone:<%=Html.Encode(editor.ZoneName ?? "(null)")%> Zone:<%: editor.ZoneName ?? "(null)" %>
Position:<%=Html.Encode(editor.Position??"(null)") %> Position:<%: editor.Position??"(null)" %>
<div style="margin-left: 20px; border: solid 1px black;"> <div style="margin-left: 20px; border: solid 1px black;">
<%=Html.EditorFor(x=>editor.Model, editor.TemplateName, editor.Prefix) %> <%=Html.EditorFor(x=>editor.Model, editor.TemplateName, editor.Prefix) %>
</div> </div>

View File

@@ -4,7 +4,7 @@
<h2><%=_Encoded("Content Types")%></h2> <h2><%=_Encoded("Content Types")%></h2>
<ul> <ul>
<%foreach(var item in Model.Types.OrderBy(x=>x.Name)){%> <%foreach(var item in Model.Types.OrderBy(x=>x.Name)){%>
<li><%=Html.Encode(item.Name) %></li> <li><%: item.Name %></li>
<%}%> <%}%>
</ul> </ul>
<h2><%=_Encoded("Content Items")%></h2> <h2><%=_Encoded("Content Items")%></h2>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Media</RootNamespace> <RootNamespace>Orchard.Media</RootNamespace>
<AssemblyName>Orchard.Media</AssemblyName> <AssemblyName>Orchard.Media</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -19,8 +19,8 @@
<label for="pageTitle"><%=T("File Path <span> - multiple files must be in a zipped folder</span>")%></label> <label for="pageTitle"><%=T("File Path <span> - multiple files must be in a zipped folder</span>")%></label>
<input id="MediaItemPath" name="MediaItemPath" type="file" class="text" value="<%=_Encoded("Browse") %>" size="64"/> <input id="MediaItemPath" name="MediaItemPath" type="file" class="text" value="<%=_Encoded("Browse") %>" size="64"/>
<span class="hint"><%=_Encoded("After your files have been uploaded, you can edit the titles and descriptions.")%></span> <span class="hint"><%=_Encoded("After your files have been uploaded, you can edit the titles and descriptions.")%></span>
<input type="hidden" id="FolderName" name="FolderName" value="<%=Html.Encode(Model.FolderName) %>" /> <input type="hidden" id="FolderName" name="FolderName" value="<%: Model.FolderName %>" />
<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" /> <input type="hidden" id="MediaPath" name="MediaPath" value="<%: Model.MediaPath %>" />
</fieldset> </fieldset>
<fieldset> <fieldset>
<input type="submit" class="button primaryAction" value="<%=_Encoded("Upload") %>" /> <input type="submit" class="button primaryAction" value="<%=_Encoded("Upload") %>" />

View File

@@ -17,7 +17,7 @@
<fieldset> <fieldset>
<label for="Name"><%=_Encoded("Folder Name") %></label> <label for="Name"><%=_Encoded("Folder Name") %></label>
<input id="Name" class="textMedium" name="Name" type="text" /> <input id="Name" class="textMedium" name="Name" type="text" />
<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" /> <input type="hidden" id="MediaPath" name="MediaPath" value="<%: Model.MediaPath %>" />
</fieldset> </fieldset>
<fieldset> <fieldset>
<input type="submit" class="button primaryAction" value="<%=_Encoded("Save") %>" /> <input type="submit" class="button primaryAction" value="<%=_Encoded("Save") %>" />

View File

@@ -70,7 +70,7 @@
</td> </td>
<td><%=_Encoded("Orchard User")%></td> <td><%=_Encoded("Orchard User")%></td>
<td><%=mediaFile.LastUpdated %></td> <td><%=mediaFile.LastUpdated %></td>
<td><%=Html.Encode(mediaFile.Type) %></td> <td><%: mediaFile.Type %></td>
<td><%=mediaFile.Size %></td> <td><%=mediaFile.Size %></td>
</tr> </tr>
<%}%> <%}%>
@@ -79,7 +79,7 @@
<tr> <tr>
<td> <td>
<input type="checkbox" value="true" name="<%=_Encoded("Checkbox.Folder.{0}", mediaFolder.Name) %>"/> <input type="checkbox" value="true" name="<%=_Encoded("Checkbox.Folder.{0}", mediaFolder.Name) %>"/>
<input type="hidden" value="<%=Html.Encode(mediaFolder.MediaPath) %>" name="<%=Html.Encode(mediaFolder.Name) %>" /> <input type="hidden" value="<%: mediaFolder.MediaPath %>" name="<%: mediaFolder.Name %>" />
</td> </td>
<td> <td>
<img src="<%=ResolveUrl("~/Modules/Orchard.Media/Content/Admin/images/folder.gif")%>" height="16" width="16" class="mediaTypeIcon" alt="<%=_Encoded("Folder") %>" /> <img src="<%=ResolveUrl("~/Modules/Orchard.Media/Content/Admin/images/folder.gif")%>" height="16" width="16" class="mediaTypeIcon" alt="<%=_Encoded("Folder") %>" />

View File

@@ -18,7 +18,7 @@
<%= Html.ValidationSummary() %> <%= Html.ValidationSummary() %>
<div class="primary"> <div class="primary">
<div> <div>
<img src="<%=Model.PublicUrl%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" /> <img src="<%=Model.PublicUrl%>" class="previewImage" alt="<%: Model.Caption %>" />
</div> </div>
<fieldset> <fieldset>
<%-- todo: make these real (including markup) --%> <%-- todo: make these real (including markup) --%>
@@ -37,8 +37,8 @@
<div> <div>
<label for="Name"><%=_Encoded("Name")%></label> <label for="Name"><%=_Encoded("Name")%></label>
<input id="Name" name="Name" type="hidden" value="<%=Html.Encode(Model.Name) %>"/> <input id="Name" name="Name" type="hidden" value="<%: Model.Name %>"/>
<input id="NewName" class="textMedium" name="NewName" type="text" value="<%=Html.Encode(Model.Name) %>"/> <input id="NewName" class="textMedium" name="NewName" type="text" value="<%: Model.Name %>"/>
</div> </div>
<div> <div>
<label for="Caption"><%=_Encoded("Caption")%></label> <label for="Caption"><%=_Encoded("Caption")%></label>
@@ -57,7 +57,7 @@
</div> </div>
<%--<div class="secondary" style="border:1px solid #ff0000;"> <%--<div class="secondary" style="border:1px solid #ff0000;">
<h2><%=_Encoded("Preview")%></h2> <h2><%=_Encoded("Preview")%></h2>
<div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" /></div> <div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%: Model.Caption %>" /></div>
<ul> <ul>
<%-- todo: make these real (including markup) <%-- todo: make these real (including markup)
<li><label><%=T("Dimensions: <span>500 x 375 pixels</span>")%></label></li> <li><label><%=T("Dimensions: <span>500 x 375 pixels</span>")%></label></li>

View File

@@ -17,8 +17,8 @@
<%=Html.ValidationSummary() %> <%=Html.ValidationSummary() %>
<fieldset> <fieldset>
<label for="Name"><%=_Encoded("Folder Name:") %></label> <label for="Name"><%=_Encoded("Folder Name:") %></label>
<input id="MediaPath" name="MediaPath" type="hidden" value="<%=Html.Encode(Model.MediaPath) %>" /> <input id="MediaPath" name="MediaPath" type="hidden" value="<%: Model.MediaPath %>" />
<input id="Name" class="textMedium" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" /> <input id="Name" class="textMedium" name="Name" type="text" value="<%: Model.Name %>" />
</fieldset> </fieldset>
<fieldset> <fieldset>
<input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" /> <input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" />

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.MetaData</RootNamespace> <RootNamespace>Orchard.MetaData</RootNamespace>
<AssemblyName>Orchard.MetaData</AssemblyName> <AssemblyName>Orchard.MetaData</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -60,7 +60,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("Save",new {id=Model.SelectedCon
<input name="<%="part_" + item.Name%>" type="checkbox" /><%}%> <input name="<%="part_" + item.Name%>" type="checkbox" /><%}%>
</td> </td>
<td class="ContentTypePartListRowItem"> <td class="ContentTypePartListRowItem">
<%= Html.Encode(item.Name)%> <%: item.Name %>
</td> </td>
</tr> </tr>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Modules</RootNamespace> <RootNamespace>Orchard.Modules</RootNamespace>
<AssemblyName>Orchard.Modules</AssemblyName> <AssemblyName>Orchard.Modules</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -21,7 +21,7 @@
//temporarily "disable" actions on core features //temporarily "disable" actions on core features
var showActions = categoryName.ToString() != "Core"; %> var showActions = categoryName.ToString() != "Core"; %>
<li class="<%=categoryClassName %>"> <li class="<%=categoryClassName %>">
<h2><%=Html.Encode(categoryName) %></h2> <h2><%: categoryName %></h2>
<ul><% <ul><%
var features = featureGroup.OrderBy(f => f.Descriptor.Name); var features = featureGroup.OrderBy(f => f.Descriptor.Name);
foreach (var feature in features) { foreach (var feature in features) {

View File

@@ -3,21 +3,21 @@
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Modules.ViewModels"%> <%@ Import Namespace="Orchard.Modules.ViewModels"%>
<h1><%=Html.TitleForPage(T("Installed Modules").ToString()) %></h1> <h1><%=Html.TitleForPage(T("Installed Modules").ToString()) %></h1>
<div class="manage"><%=Html.ActionLink(T("Install a module").ToString(), "Add", null, new { @class = "button primaryAction" })%></div> <div class="manage"><%: Html.ActionLink(T("Install a module"), "Add", null, new { @class = "button primaryAction" })%></div>
<% if (Model.Modules.Count() > 0) { %> <% if (Model.Modules.Count() > 0) { %>
<ul class="contentItems"><% <ul class="contentItems"><%
foreach (var module in Model.Modules.OrderBy(m => m.DisplayName)) { %> foreach (var module in Model.Modules.OrderBy(m => m.DisplayName)) { %>
<li> <li>
<div class="summary"> <div class="summary">
<div class="properties"> <div class="properties">
<h2><%:module.DisplayName %><span> - <%=T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? Html.Encode(module.Version) : T("1.0")) %></span></h2><% <h2><%: module.DisplayName %><span> - <%: T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? module.Version : T("1.0").ToString()) %></span></h2><%
if (!string.IsNullOrEmpty(module.Description)) { %> if (!string.IsNullOrEmpty(module.Description)) { %>
<p><%:module.Description %></p><% <p><%: module.Description %></p><%
} %> } %>
<ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;"> <ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;">
<li><%=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())) %></li> <li><%=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())) %></li>
<li>&nbsp;&#124;&nbsp;<%=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]) %></li><%-- very efficient, I know --%> <li>&nbsp;&#124;&nbsp;<%: 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]) %></li><%-- very efficient, I know --%>
<li>&nbsp;&#124;&nbsp;<%=T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? Html.Encode(module.HomePage) : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>"))%></li> <li>&nbsp;&#124;&nbsp;<%: T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? module.HomePage : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>").ToString())%></li>
</ul> </ul>
</div> </div>
</div> </div>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.MultiTenancy</RootNamespace> <RootNamespace>Orchard.MultiTenancy</RootNamespace>
<AssemblyName>Orchard.MultiTenancy</AssemblyName> <AssemblyName>Orchard.MultiTenancy</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -7,7 +7,7 @@
<%=Html.ValidationSummary() %> <%=Html.ValidationSummary() %>
<fieldset> <fieldset>
<div> <div>
<h2><%=Html.Encode(Model.Name) %></h2> <h2><%: Model.Name %></h2>
</div> </div>
<div> <div>
<label for="RequestUrlHost"><%=_Encoded("Host") %></label> <label for="RequestUrlHost"><%=_Encoded("Host") %></label>

View File

@@ -9,7 +9,7 @@
<li class="tenant <%=tenant.State.CurrentState %>"> <li class="tenant <%=tenant.State.CurrentState %>">
<div class="summary"> <div class="summary">
<div class="properties"> <div class="properties">
<h3><span class="tenantName"><%=Html.Encode(tenant.Name) %></span><% <h3><span class="tenantName"><%: tenant.Name %></span><%
if (!string.IsNullOrEmpty(tenant.RequestUrlHost)) { if (!string.IsNullOrEmpty(tenant.RequestUrlHost)) {
%><span class="tenantHost"> - <%=Html.Link(Url.Tenant(tenant), Url.Tenant(tenant))%></span><% %><span class="tenantHost"> - <%=Html.Link(Url.Tenant(tenant), Url.Tenant(tenant))%></span><%
} %></h3> } %></h3>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Pages</RootNamespace> <RootNamespace>Orchard.Pages</RootNamespace>
<AssemblyName>Orchard.Pages</AssemblyName> <AssemblyName>Orchard.Pages</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -3,7 +3,7 @@
<%@ Import Namespace="Orchard.ContentManagement"%> <%@ Import Namespace="Orchard.ContentManagement"%>
<%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Core.Common.Models"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<h3><a href="<%=Url.Action(T("Item").ToString(), "Page", new { area = "Orchard.Pages", slug = Model.Item.Slug }) %>"><%=Html.Encode(Model.Item.Title) %></a></h3> <h3><a href="<%=Url.Action(T("Item").ToString(), "Page", new { area = "Orchard.Pages", slug = Model.Item.Slug }) %>"><%: Model.Item.Title %></a></h3>
<div class="content"> <div class="content">
<% Html.Zone("primary", ":manage :metadata"); %> <% Html.Zone("primary", ":manage :metadata"); %>
</div> </div>

View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<div class="metadata"> <div class="metadata">
<div class="posted"><%=_Encoded("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)"))%></div> <div class="posted"><%: T("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)").ToString())%></div>
</div> </div>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Roles</RootNamespace> <RootNamespace>Orchard.Roles</RootNamespace>
<AssemblyName>Orchard.Roles</AssemblyName> <AssemblyName>Orchard.Roles</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -6,7 +6,7 @@
<fieldset> <fieldset>
<legend><%=_Encoded("Information") %></legend> <legend><%=_Encoded("Information") %></legend>
<label for="pageTitle"><%=_Encoded("Role Name:") %></label> <label for="pageTitle"><%=_Encoded("Role Name:") %></label>
<input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" /> <input id="Name" class="text" name="Name" type="text" value="<%: Model.Name %>" />
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><%=_Encoded("Permissions") %></legend> <legend><%=_Encoded("Permissions") %></legend>
@@ -26,7 +26,7 @@
</thead> </thead>
<% foreach (var permission in Model.ModulePermissions[moduleName]) { %> <% foreach (var permission in Model.ModulePermissions[moduleName]) { %>
<tr> <tr>
<td><%=Html.Encode(permission.Description) %></td> <td><%: permission.Description %></td>
<td style="width:60px;/* todo: (heskew) make not inline :( */"><input type="checkbox" value="true" name="<%=_Encoded("Checkbox.{0}", permission.Name) %>"/></td> <td style="width:60px;/* todo: (heskew) make not inline :( */"><input type="checkbox" value="true" name="<%=_Encoded("Checkbox.{0}", permission.Name) %>"/></td>
</tr> </tr>
<% } %> <% } %>

View File

@@ -6,7 +6,7 @@
<fieldset> <fieldset>
<legend><%=_Encoded("Information") %></legend> <legend><%=_Encoded("Information") %></legend>
<label for="pageTitle"><%=_Encoded("Role Name:") %></label> <label for="pageTitle"><%=_Encoded("Role Name:") %></label>
<input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" /> <input id="Name" class="text" name="Name" type="text" value="<%: Model.Name %>" />
<input type="hidden" value="<%=Model.Id %>" name="Id" /> <input type="hidden" value="<%=Model.Id %>" name="Id" />
</fieldset> </fieldset>
<fieldset> <fieldset>
@@ -28,7 +28,7 @@
</thead> </thead>
<% foreach (var permission in Model.ModulePermissions[moduleName]) { %> <% foreach (var permission in Model.ModulePermissions[moduleName]) { %>
<tr> <tr>
<td><%=Html.Encode(permission.Description) %></td> <td><%: permission.Description %></td>
<td style="width:60px;/* todo: (heskew) make not inline :("> <td style="width:60px;/* todo: (heskew) make not inline :(">
<% if (Model.CurrentPermissions.Contains(permission.Name)) { %> <% if (Model.CurrentPermissions.Contains(permission.Name)) { %>
<input type="checkbox" value="true" name="<%=_Encoded("Checkbox.{0}", permission.Name) %>" checked="checked"/> <input type="checkbox" value="true" name="<%=_Encoded("Checkbox.{0}", permission.Name) %>" checked="checked"/>

View File

@@ -28,7 +28,7 @@
<%foreach (var row in Model.Rows) { %> <%foreach (var row in Model.Rows) { %>
<tr> <tr>
<td><input type="checkbox" value="true" name="<%="Checkbox." + row.Id %>"/></td> <td><input type="checkbox" value="true" name="<%="Checkbox." + row.Id %>"/></td>
<td><%=Html.Encode(row.Name) %></td> <td><%: row.Name %></td>
<td><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })%></td> <td><%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.Id })%></td>
</tr> </tr>
<%}%> <%}%>

View File

@@ -12,7 +12,7 @@
<%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%> <%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%>
<div> <div>
<%=Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%> <%=Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%>
<label class="forcheckbox" for="<%="Roles[" + index + "]_Granted"%>"><%=Html.Encode(entry.Name) %></label> <label class="forcheckbox" for="<%="Roles[" + index + "]_Granted"%>"><%: entry.Name %></label>
</div> </div>
<%++index; <%++index;
} }

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Sandbox</RootNamespace> <RootNamespace>Orchard.Sandbox</RootNamespace>
<AssemblyName>Orchard.Sandbox</AssemblyName> <AssemblyName>Orchard.Sandbox</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Setup</RootNamespace> <RootNamespace>Orchard.Setup</RootNamespace>
<AssemblyName>Orchard.Setup</AssemblyName> <AssemblyName>Orchard.Setup</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Tags</RootNamespace> <RootNamespace>Orchard.Tags</RootNamespace>
<AssemblyName>Orchard.Tags</AssemblyName> <AssemblyName>Orchard.Tags</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -5,7 +5,7 @@
<%=Html.ValidationSummary() %> <%=Html.ValidationSummary() %>
<fieldset> <fieldset>
<label for="TagName"><%=_Encoded("Name:")%></label> <label for="TagName"><%=_Encoded("Name:")%></label>
<input id="TagName" class="text" name="TagName" type="text" value="<%=Html.Encode(Model.TagName) %>" /> <input id="TagName" class="text" name="TagName" type="text" value="<%: Model.TagName %>" />
<input type="submit" class="button" value="<%=_Encoded("Save") %>" /> <input type="submit" class="button" value="<%=_Encoded("Save") %>" />
</fieldset> </fieldset>
<% } %> <% } %>

View File

@@ -6,7 +6,7 @@
<fieldset> <fieldset>
<label for="Name"><%=_Encoded("Name:") %></label> <label for="Name"><%=_Encoded("Name:") %></label>
<input id="Id" name="Id" type="hidden" value="<%=Model.Id %>" /> <input id="Id" name="Id" type="hidden" value="<%=Model.Id %>" />
<input id="TagName" class="text" name="TagName" type="text" value="<%=Html.Encode(Model.TagName) %>" /> <input id="TagName" class="text" name="TagName" type="text" value="<%: Model.TagName %>" />
<input type="submit" class="button" value="<%=_Encoded("Save") %>" /> <input type="submit" class="button" value="<%=_Encoded("Save") %>" />
</fieldset> </fieldset>
<% } %> <% } %>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Themes</RootNamespace> <RootNamespace>Orchard.Themes</RootNamespace>
<AssemblyName>Orchard.Themes</AssemblyName> <AssemblyName>Orchard.Themes</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -6,15 +6,15 @@
%><p><%=_Encoded("There is no current theme in the application. The built-in theme will be used.") %><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><% %><br /><%=Html.ActionLink(T("Install a new Theme").ToString(), "Install") %></p><%
} else { } else {
%><h3><%=_Encoded("Current Theme")%> - <%=Html.Encode(Model.CurrentTheme.DisplayName) %></h3> %><h3><%=_Encoded("Current Theme")%> - <%: Model.CurrentTheme.DisplayName %></h3>
<%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.png"), Html.Encode(Model.CurrentTheme.DisplayName), new { @class = "themePreviewImage" })%> <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.png"), Html.Encode(Model.CurrentTheme.DisplayName), new { @class = "themePreviewImage" })%>
<h5><%=_Encoded("By") %> <%=Html.Encode(Model.CurrentTheme.Author) %></h5> <h5><%=_Encoded("By") %> <%: Model.CurrentTheme.Author %></h5>
<p> <p>
<%=_Encoded("Version:") %> <%=Html.Encode(Model.CurrentTheme.Version) %><br /> <%=_Encoded("Version:") %> <%: Model.CurrentTheme.Version %><br />
<%=Html.Encode(Model.CurrentTheme.Description) %><br /> <%: Model.CurrentTheme.Description %><br />
<%=Html.Encode(Model.CurrentTheme.HomePage) %> <%: Model.CurrentTheme.HomePage %>
</p> </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" })%>
@@ -25,7 +25,7 @@
if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) { if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {
%> <li> %> <li>
<div> <div>
<h3><%=Html.Encode(theme.DisplayName) %></h3> <h3><%: theme.DisplayName %></h3>
<%=Html.Image(Html.ThemePath(theme, "/Theme.png"), Html.Encode(theme.DisplayName), null)%> <%=Html.Image(Html.ThemePath(theme, "/Theme.png"), Html.Encode(theme.DisplayName), null)%>
<% using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) { %> <% using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) { %>
<%=Html.Hidden("themeName", theme.ThemeName)%> <%=Html.Hidden("themeName", theme.ThemeName)%>
@@ -35,11 +35,11 @@
<%=Html.Hidden("themeName", theme.ThemeName)%> <%=Html.Hidden("themeName", theme.ThemeName)%>
<button type="submit" title="<%=_Encoded("Preview") %>"><%=_Encoded("Preview") %></button> <button type="submit" title="<%=_Encoded("Preview") %>"><%=_Encoded("Preview") %></button>
<% } %> <% } %>
<h5><%=_Encoded("By") %> <%=Html.Encode(theme.Author) %></h5> <h5><%=_Encoded("By") %> <%: theme.Author %></h5>
<p> <p>
<%=_Encoded("Version:") %> <%=Html.Encode(theme.Version) %><br /> <%=_Encoded("Version:") %> <%: theme.Version %><br />
<%=Html.Encode(theme.Description) %><br /> <%: theme.Description %><br />
<%=Html.Encode(theme.HomePage) %> <%: theme.HomePage %>
</p> </p>
<% using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { %> <% using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { %>
<%=Html.Hidden("themeName", theme.ThemeName)%> <%=Html.Hidden("themeName", theme.ThemeName)%>

View File

@@ -1,3 +1,3 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<div id="title"><%=Html.Encode(Html.SiteName()) %></div> <div id="title"><%: Html.SiteName() %></div>

View File

@@ -6,5 +6,5 @@
: item.Type == NotifyType.Warning : item.Type == NotifyType.Warning
? "warning" ? "warning"
: "info"; %> : "info"; %>
<div class="<%=className %> message"><%=Html.Encode(item.Message) %></div> <div class="<%=className %> message"><%: item.Message %></div>
<% } %> <% } %>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Users</RootNamespace> <RootNamespace>Orchard.Users</RootNamespace>
<AssemblyName>Orchard.Users</AssemblyName> <AssemblyName>Orchard.Users</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -22,10 +22,10 @@
{ %> { %>
<tr> <tr>
<td> <td>
<%=Html.Encode(row.User.UserName)%> <%: row.User.UserName %>
</td> </td>
<td> <td>
<%=Html.Encode(row.User.Email)%> <%: row.User.Email %>
</td> </td>
<td> <td>
<%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.User.Id })%> | <%=Html.ActionLink(T("Edit").ToString(), "Edit", new { row.User.Id })%> |

View File

@@ -12,7 +12,7 @@
<RootNamespace>TinyMce</RootNamespace> <RootNamespace>TinyMce</RootNamespace>
<AssemblyName>TinyMce</AssemblyName> <AssemblyName>TinyMce</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -12,7 +12,7 @@
<RootNamespace>Orchard.Web</RootNamespace> <RootNamespace>Orchard.Web</RootNamespace>
<AssemblyName>Orchard.Web</AssemblyName> <AssemblyName>Orchard.Web</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews> <MvcBuildViews>true</MvcBuildViews>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>

View File

@@ -5,4 +5,4 @@
<h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3> <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
<div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div> <div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div> <div class="blogdescription"><p><%: Model.Item.Description %></p></div>

View File

@@ -19,7 +19,7 @@
<%--Top Navigation and branding--%> <%--Top Navigation and branding--%>
<div id="headercontainer"> <div id="headercontainer">
<div id="header"> <div id="header">
<h1><%=Html.Encode(Html.SiteName()) %></h1> <h1><%: Html.SiteName() %></h1>
<div class="menucontainer"> <div class="menucontainer">
<% Html.Include("menu"); %> <% Html.Include("menu"); %>
</div> </div>

View File

@@ -5,4 +5,4 @@
<h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3> <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
<div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div> <div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div> <div class="blogdescription"><p><%: Model.Item.Description %></p></div>

View File

@@ -19,7 +19,7 @@
<%--Top Navigation and branding--%> <%--Top Navigation and branding--%>
<div id="headercontainer"> <div id="headercontainer">
<div id="header"> <div id="header">
<h1><%=Html.Encode(Html.SiteName()) %></h1> <h1><%: Html.SiteName() %></h1>
<div class="menucontainer"> <div class="menucontainer">
<% Html.Include("menu"); %> <% Html.Include("menu"); %>
</div> </div>

View File

@@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.Mvc.ViewModels" %> <%@ Import Namespace="Orchard.Mvc.ViewModels" %>
<div class="footer group"> <div class="footer group">
<ul class="group"> <ul class="group">
<li>&copy;2010 <%= Html.Encode(Html.SiteName()) %>. All rights reserved.</li> <li>&copy;2010 <%: Html.SiteName() %>. All rights reserved.</li>
<li><a href="http://www.orchardproject.net" title="Orchard Project">Powered by Orchard</a></li> <li><a href="http://www.orchardproject.net" title="Orchard Project">Powered by Orchard</a></li>
</ul> </ul>
</div> </div>

View File

@@ -2,7 +2,7 @@
<div class="header"> <div class="header">
<div class="brand group"> <div class="brand group">
<div class="title"><%=Html.Encode(Html.SiteName()) %></div> <div class="title"><%: Html.SiteName() %></div>
<% Html.Include("User"); %> <% Html.Include("User"); %>
</div> </div>
</div> </div>

View File

@@ -5,7 +5,7 @@ foreach (var comment in Model) { %>
<li> <li>
<div class="comment"> <div class="comment">
<p><%=Html.Encode(comment.Record.CommentText) %></p> <p><%: comment.Record.CommentText %></p>
</div> </div>
<div class="commentauthor"> <div class="commentauthor">

View File

@@ -2,7 +2,7 @@
<ul class="admin group"> <ul class="admin group">
<% if (Request.IsAuthenticated) <% if (Request.IsAuthenticated)
{ %> { %>
<li><%=_Encoded("Welcome")%> <%=Html.Encode(Page.User.Identity.Name) %></li> <li><%=_Encoded("Welcome")%> <%: Page.User.Identity.Name %></li>
<li><%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users" })%></li> <li><%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users" })%></li>
<li><%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%></li> <li><%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%></li>
<% } <% }

View File

@@ -4,7 +4,7 @@
<div id="footer-content"> <div id="footer-content">
<div id="footernav"> <div id="footernav">
<div> <div>
&copy;2010 <%= Html.Encode(Html.SiteName()) %>. All rights reserved.</div> &copy;2010 <%: Html.SiteName() %>. All rights reserved.</div>
</div> </div>
<div id="disclaimer"> <div id="disclaimer">
*This is perfect for disclaimer content. You can use this content to let people know something important. A good example is if youre 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. *This is perfect for disclaimer content. You can use this content to let people know something important. A good example is if youre 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.

View File

@@ -19,7 +19,7 @@
<div id="nav"> <div id="nav">
<div class="brand group"> <div class="brand group">
<div class="title"> <div class="title">
<%=Html.Encode(Html.SiteName()) %></div> <%: Html.SiteName() %></div>
</div> </div>
<% Html.Zone("menu"); %> <% Html.Zone("menu"); %>
</div> </div>

View File

@@ -19,7 +19,7 @@
<div id="nav"> <div id="nav">
<div class="brand group"> <div class="brand group">
<div class="title"> <div class="title">
<%=Html.Encode(Html.SiteName()) %></div> <%: Html.SiteName() %></div>
</div> </div>
<% Html.Zone("menu"); %> <% Html.Zone("menu"); %>
</div> </div>

View File

@@ -5,7 +5,7 @@ foreach (var comment in Model) { %>
<li> <li>
<div class="comment"> <div class="comment">
<p><%=Html.Encode(comment.Record.CommentText) %></p> <p><%: comment.Record.CommentText %></p>
</div> </div>
<div class="commentauthor"> <div class="commentauthor">

View File

@@ -2,7 +2,7 @@
<ul class="admin group"> <ul class="admin group">
<% if (Request.IsAuthenticated) <% if (Request.IsAuthenticated)
{ %> { %>
<li><%=_Encoded("Welcome")%> <%=Html.Encode(Page.User.Identity.Name) %></li> <li><%=_Encoded("Welcome")%> <%: Page.User.Identity.Name %></li>
<li><%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users" })%></li> <li><%=Html.ActionLink(T("Log Off").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users" })%></li>
<li><%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%></li> <li><%= Html.ActionLink("Admin", "Index", new {Area = "Dashboard", Controller = "Admin"})%></li>
<% } <% }

View File

@@ -4,4 +4,4 @@
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>
<h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3> <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
<div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div> <div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div> <div class="blogdescription"><p><%: Model.Item.Description %></p></div>

View File

@@ -24,7 +24,7 @@ return false;
<div id="hd" role="banner"> <div id="hd" role="banner">
<div class="yui-g" id="branding"> <div class="yui-g" id="branding">
<div class="yui-u first"> <div class="yui-u first">
<h1><a href="/" title="Go to Home"><%=Html.Encode(Html.SiteName()) %></a></h1> <h1><a href="/" title="Go to Home"><%: Html.SiteName() %></a></h1>
</div> </div>
<div class="yui-u"> <div class="yui-u">
<div id="logIn"> <div id="logIn">

View File

@@ -22,7 +22,7 @@ return false;
<div id="hd" role="banner"> <div id="hd" role="banner">
<div class="yui-g" id="branding"> <div class="yui-g" id="branding">
<div class="yui-u first"> <div class="yui-u first">
<h1><a href="/" title="Go to Home"><%=Html.Encode(Html.SiteName()) %></a></h1> <h1><a href="/" title="Go to Home"><%: Html.SiteName() %></a></h1>
</div> </div>
<div class="yui-u"> <div class="yui-u">
<div id="logIn"> <div id="logIn">

View File

@@ -5,7 +5,7 @@ foreach (var comment in Model) { %>
<li> <li>
<div class="comment"> <div class="comment">
<p><%=Html.Encode(comment.Record.CommentText) %></p> <p><%: comment.Record.CommentText %></p>
</div> </div>
<div class="commentauthor"> <div class="commentauthor">

View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BaseViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BaseViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<% if (Model.CurrentUser != null) { <% if (Model.CurrentUser != null) {
%><div id="login"><%=_Encoded("User:")%> <%=Html.Encode(Model.CurrentUser.UserName)%> | <%=Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" }) %></div><% %><div id="login"><%=_Encoded("User:")%> <%: Model.CurrentUser.UserName %> | <%=Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" }) %></div><%
} %> } %>