Small changes to string usage

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044405

src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/DisplayTemplates/Items/Blogs.Blog.Detail.ascx

@@ -1,23 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<% Html.Title(Model.Item.Name); %>
-<%-- todo: (heskew) get what actions we can out of the h2 :| --%>
-<h2 class="withActions">
-    <a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Name) %></a>
-    <a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit" title="Edit Blog">Edit Blog</a>
-    <span class="actions"><span class="destruct"><a href="<%=Url.BlogDelete(Model.Item.Slug) %>" class="ibutton remove" title="Remove Blog">Remove Blog</a></span></span></h2>
-<p><%=Model.Item.Description%></p>
-<div class="actions"><a href="<%=Url.BlogPostCreate(Model.Item.Slug) %>" class="add button">New Post</a></div>
-<%--TODO: (erikpo) Need to figure out which zones should be displayed in this template--%>
-<%=Html.DisplayZonesAny() %>
-
-<%--<%
-if (Model.Posts.Count() > 0) { %>
-<%=Html.UnorderedList(Model.Posts, (p, i) => Html.DisplayFor(blog => p, "BlogPostPreviewForAdmin").ToHtmlString(), "contentItems")%>
-<div class="actions"><a href="<%=Url.BlogPostCreate(Model.Blog.Slug) %>" class="add button">New Post</a></div><%
-} else { %>
-<div class="info message">This blog is sad with no posts, but don't fret. You can add a new post right <a href="<%=Url.BlogPostCreate(Model.Blog.Slug) %>">here</a>!</div><%
-} %>--%>

src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/DisplayTemplates/Items/Blogs.Blog.Summary.ascx

@@ -1,21 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<h3><a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Name) %></a></h3>
-<div class="meta">
-    <% var postCount = Model.Item.PostCount; %><a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=string.Format("{0} post{1}", postCount, postCount == 1 ? "" : "s") %></a>
-    | <a href="#">?? comments</a>
-</div>
-<%--<p>[list of authors] [modify blog access]</p>--%>
-<p><%=Model.Item.Description %></p>
-<p class="actions">
-    <%-- todo: (heskew) make into a ul --%>
-    <span class="construct">
-        <a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>" class="ibutton blog" title="Manage Blog">Manage Blog</a>
-        <a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit" title="Edit Blog">Edit Blog</a>
-        <a href="<%=Url.Blog(Model.Item.Slug) %>" class="ibutton view" title="View Blog">View Blog</a>
-        <a href="<%=Url.BlogPostCreate(Model.Item.Slug) %>" class="ibutton add page" title="New Post">New Post</a>
-    </span>
-    <span class="destruct"><a href="<%=Url.BlogDelete(Model.Item.Slug) %>" class="ibutton remove" title="Delete Blog">Remove Blog</a></span>
-</p>

src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx

@@ -1,23 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Models"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<h3><a href="<%=Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Title)%></a></h3>
-<div class="meta">
-    <%=Html.PublishedState(Model.Item) %>
-    | <a href="#">?? comments</a>
-</div>
-<div class="content"><%=Model.Item.As<BodyAspect>().Text ?? "<p><em>there's no content for this blog post</em></p>"%></div>
-<p class="actions">
-    <%-- todo: (heskew) make into a ul --%>
-    <span class="construct">
-        <a href="<%=Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Slug) %>" class="ibutton edit" title="Edit Post">Edit Post</a>
-        <a href="<%=Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug) %>" class="ibutton view" title="View Post">View Post</a><%
-        if (Model.Item.Published == null) { // todo: (heskew) be smart about this and maybe have other contextual actions - including view/preview for view up there ^^ %>
-        <a href="<%=Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug) %>" class="ibutton publish" title="Publish Post Now">Publish Post Now</a>
-        <% } %>
-    </span>
-    <span class="destruct"><a href="#" class="ibutton remove" title="Remove Post">Remove Post</a></span>
-</p>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Admin/Blog/Detail.ascx

@@ -1,23 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<% Html.Title(Model.Item.Name); %>
-<%-- todo: (heskew) get what actions we can out of the h2 :| --%>
-<h2 class="withActions">
-    <a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Name) %></a>
-    <a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit" title="Edit Blog">Edit Blog</a>
-    <span class="actions"><span class="destruct"><a href="<%=Url.BlogDelete(Model.Item.Slug) %>" class="ibutton remove" title="Remove Blog">Remove Blog</a></span></span></h2>
-<p><%=Model.Item.Description%></p>
-<div class="actions"><a href="<%=Url.BlogPostCreate(Model.Item.Slug) %>" class="add button">New Post</a></div>
-<%--TODO: (erikpo) Need to figure out which zones should be displayed in this template--%>
-<%=Html.DisplayZonesAny() %>
-
-<%--<%
-if (Model.Posts.Count() > 0) { %>
-<%=Html.UnorderedList(Model.Posts, (p, i) => Html.DisplayFor(blog => p, "BlogPostPreviewForAdmin").ToHtmlString(), "contentItems")%>
-<div class="actions"><a href="<%=Url.BlogPostCreate(Model.Blog.Slug) %>" class="add button">New Post</a></div><%
-} else { %>
-<div class="info message">This blog is sad with no posts, but don't fret. You can add a new post right <a href="<%=Url.BlogPostCreate(Model.Blog.Slug) %>">here</a>!</div><%
-} %>--%>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Admin/Blog/Summary.ascx

@@ -1,21 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<h3><a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Name) %></a></h3>
-<div class="meta">
-    <% var postCount = Model.Item.PostCount; %><a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=string.Format("{0} post{1}", postCount, postCount == 1 ? "" : "s") %></a>
-    | <a href="#">?? comments</a>
-</div>
-<%--<p>[list of authors] [modify blog access]</p>--%>
-<p><%=Model.Item.Description %></p>
-<p class="actions">
-    <%-- todo: (heskew) make into a ul --%>
-    <span class="construct">
-        <a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>" class="ibutton blog" title="Manage Blog">Manage Blog</a>
-        <a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit" title="Edit Blog">Edit Blog</a>
-        <a href="<%=Url.Blog(Model.Item.Slug) %>" class="ibutton view" title="View Blog">View Blog</a>
-        <a href="<%=Url.BlogPostCreate(Model.Item.Slug) %>" class="ibutton add page" title="New Post">New Post</a>
-    </span>
-    <span class="destruct"><a href="<%=Url.BlogDelete(Model.Item.Slug) %>" class="ibutton remove" title="Delete Blog">Remove Blog</a></span>
-</p>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Admin/BlogPost/List.ascx

@@ -1,5 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<ItemDisplayModel<BlogPost>>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<%=Html.UnorderedList(Model, (bp, i) => Html.DisplayForItem(bp).ToHtmlString(), "blogPosts contentItems") %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Admin/BlogPost/Summary.ascx

@@ -1,23 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Models"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<h3><a href="<%=Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Title)%></a></h3>
-<div class="meta">
-    <%=Html.PublishedState(Model.Item) %>
-    | <a href="#">?? comments</a>
-</div>
-<div class="content"><%=Model.Item.As<BodyAspect>().Text ?? "<p><em>there's no content for this blog post</em></p>"%></div>
-<p class="actions">
-    <%-- todo: (heskew) make into a ul --%>
-    <span class="construct">
-        <a href="<%=Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Slug) %>" class="ibutton edit" title="Edit Post">Edit Post</a>
-        <a href="<%=Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug) %>" class="ibutton view" title="View Post">View Post</a><%
-        if (Model.Item.Published == null) { // todo: (heskew) be smart about this and maybe have other contextual actions - including view/preview for view up there ^^ %>
-        <a href="<%=Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug) %>" class="ibutton publish" title="Publish Post Now">Publish Post Now</a>
-        <% } %>
-    </span>
-    <span class="destruct"><a href="#" class="ibutton remove" title="Remove Post">Remove Post</a></span>
-</p>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Detail.ascx

@@ -1,11 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<% Html.Title(Model.Item.Name); %>
-<div class="manage"><a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit">edit</a></div>
-<h1><%=Html.Encode(Model.Item.Name) %></h1>
-<div><%=Html.Encode(Model.Item.Description) %></div>
-<%--TODO: (erikpo) Need to figure out which zones should be displayed in this template--%>
-<%=Html.DisplayZonesAny() %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Summary.ascx

@@ -1,10 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
-<div class="blog metadata"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=Model.Item.PostCount %> post<%=Model.Item.PostCount == 1 ? "" : "s" %></a></div>
-<p><%=Model.Item.Description %></p>
-<%--TODO: (erikpo) Need to figure out which zones should be displayed in this template--%>
-<%--<%=Html.DisplayZonesAny() %>--%>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Detail.ascx

@@ -1,15 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<% Html.Title(Model.Item.Title); %>
-<div class="manage"><a href="<%=Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Slug) %>" class="ibutton edit">edit</a></div>
-<h1><%=Html.Encode(Model.Item.Title)%></h1>
-<div class="metadata">
-    <% if (Model.Item.Creator != null)
-       { 
-       %><div class="posted">Posted by <%=Html.Encode(Model.Item.Creator.UserName)%> <%=Html.PublishedWhen(Model.Item)%></div><%
-       } %>
-</div>
-<%=Html.DisplayZonesAny() %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/List.ascx

@@ -1,5 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<ItemDisplayModel<BlogPost>>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<%=Html.UnorderedList(Model, (bp, i) => Html.DisplayForItem(bp).ToHtmlString(), "blogPosts contentItems") %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Summary.ascx

@@ -1,12 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Models"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<h3><a href="<%=Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Title) %></a></h3>
-<div class="meta">
-    <%=Html.PublishedState(Model.Item) %>
-    | <a href="#">?? comments</a>
-</div>
-<div class="content"><%=Model.Item.As<BodyAspect>().Text ?? "<p><em>there's no content for this blog post</em></p>" %></div>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Detail.ascx

@@ -1,7 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<% Html.Title(Model.Item.Name); %>
-<%=Html.EditorZone("primary") %>
-<%=Html.EditorZonesAny() %>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Fields.ascx

@@ -1,15 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Blog>" %>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models" %>
-<fieldset>
-    <label for="Name">Blog Name</label>
-    <%=Html.EditorFor(m => m.Name) %>
-</fieldset>
-<fieldset class="permalink">
-    <label class="sub" for="Slug">Permalink: <span><%=Request.Url.ToRootString() %>/</span></label>
-    <span><%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%></span>
-</fieldset>
-<fieldset>
-    <label for="Description">Description</label>
-    <%=Html.TextAreaFor(m => m.Description, 5, 60, null) %>
-</fieldset>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/Detail.ascx

@@ -1,17 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Models.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<% Html.Title(Model.Item.Title); %>
-<div class="sections">
-    <div class="primary">
-        <%=Html.EditorZone("primary") %>
-        <%=Html.EditorZonesExcept("secondary") %>
-    </div>
-    <div class="secondary">
-        <%=Html.EditorZone("secondary")%>
-        <fieldset>
-            <input class="button" type="submit" name="submit.Save" value="Save"/>
-        </fieldset>
-    </div>
-</div>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/FieldsPrimary.ascx

@@ -1,12 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPost>" %>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<fieldset>
-    <label for="Title">Title</label>
-    <span><%=Html.TextBoxFor(m => m.Title, new { @class = "large text" })%></span>
-</fieldset>
-<fieldset class="permalink">
-    <label class="sub" for="Slug">Permalink<br /><span><%=Request.Url.ToRootString() %>/<%=Model.Blog.Slug %>/</span></label>
-    <span><%=Html.TextBoxFor(m => m.Slug, new { @class = "text" })%></span>
-</fieldset>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/FieldsSecondary.ascx

@@ -1,15 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPost>" %>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<fieldset>
-    <legend>Publish Settings</legend>
-    <label for="Command_SaveDraft"><%=Html.RadioButton("Command", "SaveDraft", true, new { id = "Command_SaveDraft" }) %> Save Draft</label><br />
-</fieldset>
-<%--<fieldset>
-    <label for="Command_PublishNow"><%=Html.RadioButton("Command", "PublishNow", new { id = "Command_PublishNow" }) %> Publish Now</label>
-</fieldset>
-<fieldset>
-    <label for="Command_PublishLater"><%=Html.RadioButton("Command", "PublishLater", new { id = "Command_PublishLater" }) %> Publish Later</label>
-    <%=Html.EditorFor(m => m.Published) %>
-</fieldset>--%>

src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/DisplayTemplates/HasComments.ascx

@@ -1,38 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasComments>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Comments.Models"%>
-<h3 id="comments"><%=Model.Comments.Count() %> Comment<%=Model.Comments.Count() == 1 ? "" : "s" %></h3><%
-    foreach (var comment in Model.Comments) { %>
-<div>
-    <div class="comment">
-        <%--TODO: (erikpo) Need to clean the name and url so nothing dangerous goes out--%>
-        <span class="who"><%=Html.LinkOrDefault(comment.UserName, comment.SiteName, new { rel = "nofollow" })%></span>
-        <span>said <%=Html.Link(Html.DateTimeRelative(comment.CommentDate), "#")%></span>
-    </div>
-    <div class="text">
-        <p><%=comment.CommentText %></p>
-    </div>
-</div><%
-    }
-if (Model.Closed) { %>
-    <p>Comments have been disabled for this content.</p><%
-} else { %>
-    <% using(Html.BeginForm("Create", "Admin", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comments" })) { %>
-        <%=Html.ValidationSummary() %>
-        <fieldset class="who">
-            <%= Html.Hidden("CommentedOn", Model.ContentItem.Id) %>
-            <%= Html.Hidden("ReturnUrl", Context.Request.Url) %>
-            <label for="Name">Name</label>
-            <input id="Name" class="text" name="Name" type="text" /><br />
-            <label for="Email">Email</label>
-            <input id="Email" class="text" name="Email" type="text" /><br />				
-            <label for="SiteName">Url</label>
-            <input id="SiteName" class="text" name="SiteName" type="text" /><br />
-        </fieldset>
-        <fieldset class="what">
-            <label for="CommentText">Leave a comment</label>
-            <textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea><br />
-            <input type="submit" class="button" value="Submit Comment" />
-        </fieldset><%
-   }
-} %>

src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/EditorTemplates/CommentSettingsRecord.ascx

@@ -1,34 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Comments.Models.CommentSettingsRecord>" %>
-<h3>Comments</h3>
-<ol>
-    <li>
-        <%= Html.LabelFor(x=>x.RequireLoginToAddComment) %>
-        <%= Html.EditorFor(x=>x.RequireLoginToAddComment) %>
-        <%= Html.ValidationMessage("RequireLoginToAddComment", "*")%>
-    </li>
-    <li>
-        <%= Html.LabelFor(x=>x.EnableCommentsOnPages) %>
-        <%= Html.EditorFor(x=>x.EnableCommentsOnPages) %>
-        <%= Html.ValidationMessage("EnableCommentsOnPages", "*")%>
-    </li>
-    <li>
-        <%= Html.LabelFor(x=>x.EnableCommentsOnPosts) %>
-        <%= Html.EditorFor(x=>x.EnableCommentsOnPosts) %>
-        <%= Html.ValidationMessage("EnableCommentsOnPosts", "*")%>
-    </li>
-    <li>
-        <%= Html.LabelFor(x=>x.EnableSpamProtection) %>
-        <%= Html.EditorFor(x=>x.EnableSpamProtection) %>
-        <%= Html.ValidationMessage("EnableSpamProtection", "*")%>
-    </li>
-     <li>
-        <%= Html.LabelFor(x=>x.AkismetKey) %>
-        <%= Html.EditorFor(x=>x.AkismetKey) %>
-        <%= Html.ValidationMessage("AkismetKey", "*")%>
-    </li>
-     <li>
-        <%= Html.LabelFor(x=>x.AkismetUrl) %>
-        <%= Html.EditorFor(x=>x.AkismetUrl) %>
-        <%= Html.ValidationMessage("AkismetUrl", "*")%>
-    </li>
-</ol>

src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/EditorTemplates/HasComments.ascx

@@ -1,20 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasComments>" %>
-<%@ Import Namespace="Orchard.Comments.Models"%>
-<fieldset>
-    <legend>Comments<% if (Model.ContentItem.Id != 0) { %>: <% var commentCount = Model.Comments.Count(); %>
-    <%=Html.ActionLink(
-            string.Format("{0} comment{1}", commentCount, commentCount == 1 ? "" : "s"),
-            "Details",
-            new { Area = "Orchard.Comments", Controller = "Admin", id = Model.ContentItem.Id, returnUrl = Context.Request.Url }
-            ) %>
-    - <a href="#">0 pending</a><% } %></legend>
-    <label for="Closed">
-    <% if (Model.Closed) {%>
-        <input id="Closed" name="Closed" type="checkbox" checked="checked" />
-     <% } else { %>
-        <input id="Closed" name="Closed" type="checkbox" />
-     <% } %> 
-        Comments are disabled
-     </label>
-</fieldset>
-

src/Orchard.Web/Packages/Orchard.Media/Views/Shared/EditorTemplates/MediaSettingsRecord.ascx

@@ -1,10 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<MediaSettingsRecord>" %>
-<%@ Import Namespace="Orchard.Media.Models"%>
-<h3>Media</h3>
-<ol>
-    <li>
-        <%= Html.LabelFor(x=>x.RootMediaFolder) %>
-        <%= Html.EditorFor(x=>x.RootMediaFolder) %>
-        <%= Html.ValidationMessage("RootMediaFolder", "*")%>
-    </li>
-</ol>

src/Orchard.Web/Packages/Orchard.Roles/Controllers/UserRolesDriver.cs

@@ -57,7 +57,7 @@ namespace Orchard.Roles.Controllers {
                 UserRoles = userRoles,
             };
 
-            if (updater.TryUpdateModel(model, "UserRoles", null, null)) {
+            if (updater.TryUpdateModel(model, Prefix, null, null)) {
 
                 var currentUserRoleRecords = _userRolesRepository.Fetch(x => x.UserId == model.User.Id);
                 var currentRoleRecords = currentUserRoleRecords.Select(x => x.Role);

src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/DisplayTemplates/HasTags.ascx

@@ -1,16 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasTags>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Tags.Models"%>
-<%--<h3>Tags</h3>
-<% Html.BeginForm("Edit", "Home", new { area = "Orchard.Tags" }); %>
-    <%= Html.ValidationSummary() %>
-    <%= Html.Hidden("TaggedContentId", Model.ContentItem.Id) %>
-    <%= Html.Hidden("ReturnUrl", Context.Request.Url) %>
-	<h3>Add new tags</h3>
-	<ol>
-	    <li>
-	        <input id="NewTagName" class="inputText inputTextLarge" name="NewTagName" type="text" value="" />
-	        <input type="submit" class="button" name="submit.Add" value="Add" />
-	    </li>
-	</ol>
-<% Html.EndForm(); %>--%>

src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/DisplayTemplates/HasTagsList.ascx

@@ -1,8 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasTags>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<%@ Import Namespace="Orchard.Tags.Models" %>
-<p class="tags">
-<% if (Model.CurrentTags.Count > 0) { %><span>Tags:</span> <% } %>
-<%=string.Join(", ", Model.CurrentTags.Select(t => Html.ActionLink(t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = t.TagName }, new { }).ToHtmlString()).ToArray())%>
-<%--<%=Html.UnorderedList(Model.CurrentTags, (t, i) => Html.ActionLink(t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = t.TagName }, new { }).ToHtmlString(), "tags")%>--%>
-</p>

src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/EditorTemplates/HasTags.ascx

@@ -1,8 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasTags>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Tags.Models"%>
-<formset>
-    <label for="Tags">Tags</label>
-    <input class="large text" id="Tags" name="Tags" type="text" value="<%=string.Join(", ", Model.CurrentTags.Select((t, i) => t.TagName).ToArray()) %>" />
-</formset>
-<%--<% Html.BeginForm("Update", "Home", new { area = "Orchard.Tags" }); %>--%>

src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/EditorTemplates/TagSettingsRecord.ascx

@@ -1,10 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<TagSettingsRecord>" %>
-<%@ Import Namespace="Orchard.Tags.Models"%>
-<h3>Tags</h3>
-<ol>
-    <li>
-        <%= Html.LabelFor(x=>x.EnableTagsOnPages) %>
-        <%= Html.EditorFor(x=>x.EnableTagsOnPages) %>
-        <%= Html.ValidationMessage("EnableTagsOnPages", "*")%>
-    </li>
-</ol>

src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs

@@ -30,7 +30,7 @@ namespace Orchard.Users.Controllers {
 
         public ActionResult Index() {
             var users = Services.ContentManager
-                .Query<User, UserRecord>(Models.User.ContentType.Name)
+                .Query<User, UserRecord>()
                 .Where(x => x.UserName != null)
                 .List();