- Some AntiForgeryToken work including making used of SiteSalt

- Moving all* BeginForm usage to BeginFormAntiForgeryPost *except for "complicated" BeginForms that get an AntiForgeryTokenOrchard inserted manually - Some page title cleanup (mainly in the admin) --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044508
2025-11-28 17:32:44 +08:00 · 2009-12-23 16:30:15 +00:00
parent bbab6d0ce5
commit fd2b62437f
106 changed files with 372 additions and 248 deletions
--- a/src/Orchard.Web/Core/Common/Mvc/Filters/AntiForgeryAuthorizationFilter.cs
+++ b/src/Orchard.Web/Core/Common/Mvc/Filters/AntiForgeryAuthorizationFilter.cs
@@ -0,0 +1,25 @@
+using System.Web.Mvc;
+using Orchard.ContentManagement;
+using Orchard.Core.Settings.Models;
+using Orchard.Mvc.Filters;
+using Orchard.Settings;
+
+namespace Orchard.Core.Common.Mvc.Filters {
+    public class AntiForgeryAuthorizationFilter : FilterProvider, IAuthorizationFilter {
+        private readonly ISiteService _siteService;
+
+        public AntiForgeryAuthorizationFilter(ISiteService siteService) {
+            _siteService = siteService;
+        }
+
+        public void OnAuthorization(AuthorizationContext filterContext) {
+            if (!(filterContext.HttpContext.Request.HttpMethod == "POST" && filterContext.RequestContext.HttpContext.Request.IsAuthenticated))
+                return;
+
+            var siteSalt = _siteService.GetSiteSettings().ContentItem.As<SiteSettings>().Record.SiteSalt;
+            ValidateAntiForgeryTokenAttribute validator = new ValidateAntiForgeryTokenAttribute { Salt = siteSalt };
+
+            validator.OnAuthorization(filterContext);
+        }
+    }
+}
--- a/src/Orchard.Web/Core/Common/Mvc/Html/AntiForgeryTokenExtensions.cs
+++ b/src/Orchard.Web/Core/Common/Mvc/Html/AntiForgeryTokenExtensions.cs
@@ -0,0 +1,15 @@
+using System.Web.Mvc;
+using Orchard.ContentManagement;
+using Orchard.Core.Settings.Models;
+using Orchard.Mvc.Html;
+using Orchard.Settings;
+
+namespace Orchard.Core.Common.Mvc.Html {
+    public static class AntiForgeryTokenExtensions {
+        public static MvcHtmlString AntiForgeryTokenOrchard(this HtmlHelper htmlHelper)
+        {
+            var siteSalt = htmlHelper.Resolve<ISiteService>().GetSiteSettings().ContentItem.As<SiteSettings>().Record.SiteSalt;
+            return htmlHelper.AntiForgeryToken(siteSalt);
+        }
+    }
+}
--- a/src/Orchard.Web/Core/Common/Mvc/Html/BeginFormExtensions.cs
+++ b/src/Orchard.Web/Core/Common/Mvc/Html/BeginFormExtensions.cs
@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+using System.Web.Routing;
+
+namespace Orchard.Core.Common.Mvc.Html {
+    public static class BeginFormExtensions {
+        public static MvcForm BeginFormAntiForgeryPost(this HtmlHelper htmlHelper)
+        {
+            return htmlHelper.BeginFormAntiForgeryPost(htmlHelper.ViewContext.HttpContext.Request.RawUrl, FormMethod.Post, new RouteValueDictionary());
+        }
+        //TODO: (erikpo) Uncomment when needed (not currently needed)
+        //public static MvcForm BeginFormAntiForgeryPost(this HtmlHelper htmlHelper, string formAction) {
+        //    return htmlHelper.BeginFormAntiForgeryPost(formAction, FormMethod.Post, new RouteValueDictionary());
+        //}
+        //public static MvcForm BeginFormAntiForgeryPost(this HtmlHelper htmlHelper, string formAction, FormMethod formMethod) {
+        //    return htmlHelper.BeginFormAntiForgeryPost(formAction, formMethod, new RouteValueDictionary());
+        //}
+        //public static MvcForm BeginFormAntiForgeryPost(this HtmlHelper htmlHelper, string formAction, FormMethod formMethod, object htmlAttributes) {
+        //    return htmlHelper.BeginFormAntiForgeryPost(formAction, formMethod, new RouteValueDictionary(htmlAttributes));
+        //}
+        public static MvcForm BeginFormAntiForgeryPost(this HtmlHelper htmlHelper, string formAction, FormMethod formMethod, IDictionary<string, object> htmlAttributes)
+        {
+            TagBuilder tagBuilder = new TagBuilder("form");
+
+            tagBuilder.MergeAttributes(htmlAttributes);
+            tagBuilder.MergeAttribute("action", formAction);
+            tagBuilder.MergeAttribute("method", HtmlHelper.GetFormMethodString(formMethod), true);
+
+            htmlHelper.ViewContext.HttpContext.Response.Output.Write(tagBuilder.ToString(TagRenderMode.StartTag));
+
+            return new MvcFormAntiForgeryPost(htmlHelper);
+        }
+    }
+}
--- a/src/Orchard.Web/Core/Common/Mvc/Html/MvcFormAntiForgeryPost.cs
+++ b/src/Orchard.Web/Core/Common/Mvc/Html/MvcFormAntiForgeryPost.cs
@@ -1,7 +1,7 @@
 using System.Web.Mvc;
 using System.Web.Mvc.Html;

-namespace Orchard.Mvc.Html {
+namespace Orchard.Core.Common.Mvc.Html {
    public class MvcFormAntiForgeryPost : MvcForm {
        private readonly HtmlHelper _htmlHelper;

--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -62,6 +62,10 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Common\Mvc\Filters\AdminFilter.cs" />
+    <Compile Include="Common\Mvc\Filters\AntiForgeryAuthorizationFilter.cs" />
+    <Compile Include="Common\Mvc\Html\AntiForgeryTokenExtensions.cs" />
+    <Compile Include="Common\Mvc\Html\BeginFormExtensions.cs" />
+    <Compile Include="Common\Mvc\Html\MvcFormAntiForgeryPost.cs" />
    <Compile Include="Common\Permissions.cs" />
    <Compile Include="Common\Utilities\LazyField.cs" />
    <Compile Include="Common\Providers\CommonAspectHandler.cs" />
--- a/src/Orchard.Web/Core/Settings/Records/SiteSettingsRecord.cs
+++ b/src/Orchard.Web/Core/Settings/Records/SiteSettingsRecord.cs
@@ -2,6 +2,7 @@

 namespace Orchard.Core.Settings.Records {
    public class SiteSettingsRecord : ContentPartRecord {
+        public virtual string SiteSalt { get; set; }
        public virtual string SiteUrl { get; set; }
        public virtual string SiteName { get; set; }
        public virtual string SuperUser { get; set; }
--- a/src/Orchard.Web/Core/Settings/Services/SiteService.cs
+++ b/src/Orchard.Web/Core/Settings/Services/SiteService.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Orchard.Core.Settings.Models;
 using Orchard.Core.Settings.Records;
 using Orchard.Data;
@@ -27,8 +28,9 @@ namespace Orchard.Core.Settings.Services {
            SiteSettingsRecord record = _siteSettingsRepository.Fetch(x => x.SiteUrl == applicationPath).FirstOrDefault();
            if (record == null) {
                ISite site = _contentManager.Create<SiteSettings>("site", item => {
-                    item.Record.SiteName = "My Orchard Project Application";
+                    item.Record.SiteSalt = Guid.NewGuid().ToString("N");
                    item.Record.SiteUrl = applicationPath;
+                    item.Record.SiteName = "My Orchard Project Application";
                    item.Record.PageTitleSeparator = " - ";
                });
                return site;
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.aspx
@@ -1,5 +1,4 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Core.Settings.ViewModels.SettingsIndexViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <h2><%=Html.TitleForPage("Edit Settings")%></h2>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
 <%= Html.ValidationSummary() %>
--- a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
@@ -1,7 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<ThemesIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Themes.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<h2>Manage Themes</h2>
+<h2><%=Html.TitleForPage("Manage Themes") %></h2>
 <h3>Current Theme</h3>
 <% if (Model.CurrentTheme == null) {
    %><p>There is no current theme in the application. The built-in theme will be used.<br /><%=Html.ActionLink("Install a new Theme", "Install") %></p><%
--- a/src/Orchard.Web/Core/Themes/Views/Admin/Install.aspx
+++ b/src/Orchard.Web/Core/Themes/Views/Admin/Install.aspx
@@ -1,11 +1,11 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<h2>Install Theme</h2>
+<h2><%=Html.TitleForPage("Install Theme") %></h2>
 <% using (Html.BeginForm("Install", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%>
    <%= Html.ValidationSummary() %>
    <fieldset>
        <label for="pageTitle">File Path to the zip file:</label>
        <input id="ThemeZipPath" name="ThemeZipPath" type="file" class="text" value="Browse" size="64"/><br />
 		<input type="submit" class="button" value="Install" />
+		<%=Html.AntiForgeryTokenOrchard() %>
 	</fieldset>
 <% } %> 
--- a/src/Orchard.Web/Core/Themes/Views/layout.ascx
+++ b/src/Orchard.Web/Core/Themes/Views/layout.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %><%
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%><%
 Html.RegisterStyle("site.css"); %>
 <div class="page">
    <div id="header">
--- a/src/Orchard.Web/Core/Web.config
+++ b/src/Orchard.Web/Core/Web.config
@@ -73,6 +73,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx
@@ -1,8 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<% Html.AddTitleParts("Add Blog"); %>
-<h2>Add Blog</h2>
+<h2><%=Html.TitleForPage("Add Blog") %></h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
    <%=Html.EditorForItem(vm => vm.Blog) %>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx
@@ -1,8 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogEditViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<% Html.AddTitleParts("Edit Blog"); %>
-<h2>Edit Blog</h2>
+<h2><%=Html.TitleForPage("Edit Blog") %></h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
    <%=Html.EditorForItem(m => m.Blog) %>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.ascx
@@ -1,4 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <%=Html.DisplayForItem(m => m.Blog) %>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogsViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <% Html.AddTitleParts("Blogs"); %>
 <h1>Blogs</h1>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/Item.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/Item.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogForAdminViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <% Html.AddTitleParts("Manage Blog"); %>
 <%=Html.DisplayForItem(m => m.Blog) %>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx
@@ -1,9 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<AdminBlogsViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<% Html.AddTitleParts("Manage Blogs"); %>
-<h2>Manage Blogs</h2>
+<h2><%=Html.TitleForPage("Manage Blogs") %></h2>
 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p><%
 if (Model.Blogs.Count() > 0) { %>
 <div class="actions"><a class="add button" href="<%=Url.BlogCreate() %>">New Blog</a></div>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx
@@ -1,8 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogPostViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<% Html.AddTitleParts("Add Post"); %>
-<h2>Add Post</h2>
+<h2><%=Html.TitleForPage("Add Post") %></h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
    <%=Html.EditorForItem(m => m.BlogPost) %><%
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx
@@ -1,8 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPostEditViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<% Html.AddTitleParts("Edit Post"); %>
-<h2>Edit Post</h2>
+<h2><%=Html.TitleForPage("Edit Post") %></h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
    <%=Html.EditorForItem(m => m.BlogPost) %><%
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPostViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <% Html.AddTitleParts(Model.Blog.Name); %>
 <%=Html.DisplayForItem(m=>m.BlogPost) %>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx
@@ -1,5 +1,4 @@
 <%@ 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.ContentManagement.ViewModels"%>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<ItemDisplayModel<BlogPost>>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%=Html.UnorderedList(Model, (bp, i) => Html.DisplayForItem(bp).ToHtmlString(), "blogPosts contentItems") %>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.Blog.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.Blog.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<Blog>>" %>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <% Html.AddTitleParts(Model.Item.Name); %>
 <%=Html.EditorZone("primary") %>
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.BlogPost.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.BlogPost.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<BlogPost>>" %>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <% Html.AddTitleParts(Model.Item.Title); %>
 <div class="sections">
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Web.config
@@ -73,6 +73,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx
@@ -2,8 +2,7 @@
 <%@ Import Namespace="Orchard.CmsPages.ViewModels"%>
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Delete pages</h2>
+<h2><%=Html.TitleForPage("Delete pages") %></h2>
 <p>Are you sure you want to delete the pages?</p>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%= Html.ValidationSummary() %>
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx
@@ -2,9 +2,8 @@
 <%@ Import Namespace="Orchard.CmsPages.ViewModels"%>
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
+<h2><%=Html.TitleForPage("Publish later") %></h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
-    <h2>Publish later</h2>
    <p>Enter the scheduled publication date:</p>
    <%=Html.ValidationSummary() %>
    <fieldset>
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
@@ -1,7 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.ChooseTemplateViewModel>" %>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Change Template</h2>
+<h2><%=Html.TitleForPage("Change Template") %></h2>
 <p>Select your layout from one of the templates below.</p>    
 <% using (Html.BeginFormAntiForgeryPost()) {
    %><%= Html.ValidationSummary() %>
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
@@ -1,6 +1,5 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Add a Page</h2>
+<h2><%=Html.TitleForPage("Add a Page") %></h2>
 <p>Select your layout from one of the templates below.</p>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
@@ -1,8 +1,7 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageEditViewModel>" %>
 <%@ Import Namespace="Orchard.CmsPages.Models" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2><%=_Encoded("Edit Page") %></h2>
-<p class="bottomSpacer"><%=_Encoded("about setting up a page") %></p>
+<h2><%=Html.TitleForPage("Edit Page") %></h2>
+<p><%=_Encoded("about setting up a page") %></p>
 <%=Html.ValidationSummary() %>
 <div class="sections">
    <% using (Html.BeginFormAntiForgeryPost()) { %>
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
@@ -1,6 +1,5 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<IEnumerable<Orchard.CmsPages.Models.Page>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Export</h2>
+<h2><%=Html.TitleForPage("Export") %></h2>
 <p>Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.</p>
    <ol>
        <% foreach (var page in Model) {
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Utility"%>
 <%@ Import Namespace="Orchard.CmsPages.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <%-- todo: (heskew) localize --%>
-<h2>Manage Pages</h2>
+<h2><%=Html.TitleForPage("Manage Pages") %></h2>
 <p>Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.</p>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ThreeColumns.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ThreeColumns.aspx
@@ -1,5 +1,4 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.Models.PageRevision>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%--
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/TwoColumns.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/TwoColumns.aspx
@@ -1,5 +1,4 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.Models.PageRevision>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%--
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Web.config
@@ -73,6 +73,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj
@@ -35,6 +35,10 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\lib\joel.net.akismet\Joel.Net.Akismet.dll</HintPath>
    </Reference>
+    <Reference Include="Orchard.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Core\bin\Orchard.Core.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.ComponentModel.DataAnnotations">
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<CommentsCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Comments.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Add Comment</h2>
-<% using(Html.BeginForm()) { %>
-    <%= Html.ValidationSummary() %>
+<h2><%=Html.TitleForPage("Add Comment") %></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
+    <%=Html.ValidationSummary() %>
    <fieldset class="who">
        <label for="CommentName">Name</label>
 	    <input id="CommentName" class="text" name="Name" type="text" value="<%=Model.Name %>" /><br />
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<CommentsDetailsViewModel>" %>
 <%@ Import Namespace="Orchard.Comments.Models"%>
 <%@ Import Namespace="Orchard.Comments.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<h2>Comments for <%= Model.DisplayNameForCommentedItem %></h2>
-<% Html.BeginForm(); %>
+<h2><%=Html.TitleForPage(string.Format("Comments for {0}", Model.DisplayNameForCommentedItem)) %></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
 	<%=Html.ValidationSummary() %>
    <fieldset class="actions bulk">
        <label for="publishActions">Actions: </label>
@@ -53,11 +52,12 @@
            <%
                int commentIndex = 0;
                foreach (var commentEntry in Model.Comments) {
+                    var ci = commentIndex;
            %>
            <tr>
                <td>
-                    <input type="hidden" value="<%=Model.Comments[commentIndex].Comment.Id%>" name="<%=Html.NameOf(m => m.Comments[commentIndex].Comment.Id)%>"/>
-                    <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.Comments[commentIndex].IsChecked)%>"/>
+                    <input type="hidden" value="<%=Model.Comments[commentIndex].Comment.Id%>" name="<%=Html.NameOf(m => m.Comments[ci].Comment.Id)%>"/>
+                    <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.Comments[ci].IsChecked)%>"/>
                    <input type="hidden" value="<%= Model.DisplayNameForCommentedItem %>" name="DisplayNameForCommentedtem" />
                    <input type="hidden" value="<%= Model.CommentedItemId %>" name="CommentedItemId" />
                </td>
@@ -88,4 +88,4 @@
            %><%=Html.ActionLink("Close Comments", "Close", new { commentedItemId = Model.CommentedItemId }, new { @class = "button remove" })%><%
           } %>
    </div>
-<% Html.EndForm(); %>
+<% } %>
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<CommentsEditViewModel>" %>
 <%@ Import Namespace="Orchard.Comments.Models"%>
 <%@ Import Namespace="Orchard.Comments.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Edit Comment</h2>
-<% using(Html.BeginForm()) { %>
+<h2><%=Html.TitleForPage("Edit Comment")%></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
    <%= Html.ValidationSummary() %>
    <fieldset class="who">
        <label for="CommentName">Name</label>
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<CommentsIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Comments.Models"%>
 <%@ Import Namespace="Orchard.Comments.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<h2>Manage Comments</h2>
-<% Html.BeginForm(); %>
+<h2><%=Html.TitleForPage("Manage Comments")%></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
 	<%=Html.ValidationSummary() %>
    <fieldset class="actions bulk">
        <label for="publishActions">Actions: </label>
@@ -48,11 +47,12 @@
            <%
                int commentIndex = 0;
                foreach (var commentEntry in Model.Comments) {
+                    var ci = commentIndex;
            %>
            <tr>
                <td>
-                    <input type="hidden" value="<%=Model.Comments[commentIndex].Comment.Id%>" name="<%=Html.NameOf(m => m.Comments[commentIndex].Comment.Id)%>"/>
-                    <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.Comments[commentIndex].IsChecked)%>"/>
+                    <input type="hidden" value="<%=Model.Comments[commentIndex].Comment.Id%>" name="<%=Html.NameOf(m => m.Comments[ci].Comment.Id)%>"/>
+                    <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.Comments[ci].IsChecked)%>"/>
                </td>
                <td><% if (commentEntry.Comment.Status == CommentStatus.Spam) {%> Spam <% } %>
                <% else {%> Approved <% } %>
@@ -77,4 +77,4 @@
                } %>
        </table>
    </fieldset>
-<% Html.EndForm(); %>
+<% } %>
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.ascx
@@ -1,4 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasComments>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Comments.Models"%>
 <span class="commentcount"><a href="#comments"><%=Model.Comments.Count() %> Comment<%=Model.Comments.Count() == 1 ? "" : "s" %></a></span>
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasComments>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Comments.Models"%>
 <h3 id="comments"><a name="comments"><%=Model.Comments.Count() %> Comment<%=Model.Comments.Count() == 1 ? "" : "s" %></a></h3><%
    foreach (var comment in Model.Comments) { %>
@@ -33,6 +32,7 @@ if (Model.Closed) { %>
            <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" />
+		    <%=Html.AntiForgeryTokenOrchard() %>
        </fieldset><%
   }
 } %>
--- a/src/Orchard.Web/Packages/Orchard.Comments/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Web.config
@@ -76,6 +76,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx
@@ -2,7 +2,6 @@
 <%@ Import Namespace="Orchard.ContentManagement"%>

 <%@ Import Namespace="System.Reflection" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>

 <h3>Content Item</h3>
 <p>
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Index.aspx
@@ -1,5 +1,4 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.DevTools.ViewModels.ContentIndexViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>


 <h3>Content Types</h3>
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Home/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Home/Index.aspx
@@ -1,5 +1,4 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<BaseViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>

 <p><%=Html.ActionLink("Contents", "Index", "Content") %></p>
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Web.config
@@ -76,6 +76,7 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx
@@ -2,8 +2,7 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Add Media </h2>
+<h2><%=Html.TitleForPage("Add Media")%></h2>
 <p>
    <%=Html.ActionLink("Media Folders", "Index")%> &#62; 
    <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
@@ -21,5 +20,6 @@
        <input id="MediaItemPath" name="MediaItemPath" type="file" class="text" value="Browse" size="64"/>
 		<input type="submit" class="button" value="Upload" /><br />
 		<span>After your files have been uploaded, you can edit the titles and descriptions.</span>
+		<%=Html.AntiForgeryTokenOrchard() %>
 	</fieldset>
 <% } %>
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx
@@ -2,8 +2,7 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Add a Folder</h2>
+<h2><%=Html.TitleForPage("Add a Folder")%></h2>
 <p><%=Html.ActionLink("Media Folders", "Index")%> &#62; 
 		<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
 		    <%=Html.ActionLink(navigation.FolderName, "Edit",
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx
@@ -2,8 +2,7 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<h2 class="separator">Manage Folder</h2>
+<h2><%=Html.TitleForPage("Manage Folder")%></h2>
 <div class="manage"><%=Html.ActionLink("Folder Properties", "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%></div>
 <p><%=Html.ActionLink("Media Folders", "Index")%> &#62; 
    <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
@@ -12,7 +11,7 @@
 	    
    <% } %>
    Manage Folder</p>
-<% Html.BeginForm(); %>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
    <fieldset class="actions bulk">
        <label for="publishActions">Actions: </label>
 		<select id="Select1" name="publishActions">
@@ -88,4 +87,4 @@
 	    <%=Html.ActionLink("Add media", "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
 		<%=Html.ActionLink("Add a folder", "Create", new { Model.MediaPath }, new { @class = "button" })%>
    </div>
-<% Html.EndForm(); %>
+<% } %>
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx
@@ -2,8 +2,7 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Edit Media - <%= Model.Name %></h2>
+<h2><%=Html.TitleForPage("Edit Media - {0}", Model.Name)%></h2>
 <p>
    <%=Html.ActionLink("Media Folders", "Index")%> &#62; 
    <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx
@@ -2,8 +2,7 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Folder Properties</h2>
+<h2><%=Html.TitleForPage("Folder Properties")%></h2>
 <p><%=Html.ActionLink("Media Folders", "Index")%> &#62; 
    <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
        <%=Html.ActionLink(navigation.FolderName, "Edit",
@@ -11,8 +10,8 @@
 	    
    <% } %>
    Folder Properties</p>
-<%using (Html.BeginFormAntiForgeryPost()) { %>
-    <%= Html.ValidationSummary() %>
+<% using (Html.BeginFormAntiForgeryPost()) { %>
+    <%=Html.ValidationSummary() %>
    <fieldset>
        <label for="Name">Folder Name:</label>
 		<input id="MediaPath" name="MediaPath" type="hidden" value="<%=Model.MediaPath %>" />
@@ -20,4 +19,4 @@
 		<input type="submit" class="button buttonFocus roundCorners" name="submit.Save" value="Save" />
 		<%--<input type="submit" class="button buttonFocus roundCorners" name="submit.Delete" value="Delete" />--%>
    </fieldset>
-<%}%>
+<% } %>
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<MediaFolderIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<h2>Manage Media Folders</h2>
+<h2><%=Html.TitleForPage("Manage Media Folders")%></h2>
 <p><%=Html.ActionLink("Media Folders", "Index")%> &#62; Manage Media Folders</p>
-<% Html.BeginForm(); %>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
    <fieldset class="actions bulk">
        <label for="publishActions">Actions: </label>
@@ -49,4 +48,4 @@
        </table>
    </fieldset>
    <div class="manage"><%=Html.ActionLink("Add a folder", "Create", new {}, new { @class = "button"}) %></div>
-<% Html.EndForm(); %>
+<% } %>
--- a/src/Orchard.Web/Packages/Orchard.Media/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.Media/Web.config
@@ -76,6 +76,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj
@@ -31,6 +31,10 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Orchard.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Core\bin\Orchard.Core.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.ComponentModel.DataAnnotations">
--- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
@@ -1,7 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<RoleCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Roles.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Add Role</h2>
+<h2><%=Html.TitleForPage("Add Role")%></h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary()%>
    <fieldset>
--- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Edit.aspx
@@ -1,8 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<RoleEditViewModel>" %>
 <%@ Import Namespace="Orchard.Roles.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Edit Role</h2>
-<% using(Html.BeginForm()) { %>
+<h2><%=Html.TitleForPage("Edit Role")%></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
    <fieldset>
 	    <legend>Information</legend>
--- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Index.aspx
@@ -1,7 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Roles.ViewModels.RolesIndexViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Manage Roles</h2>
-<% using(Html.BeginForm()) { %>
+<h2><%=Html.TitleForPage("Manage Roles")%></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
    <fieldset class="actions bulk">
        <label for="publishActions">Actions: </label>
--- a/src/Orchard.Web/Packages/Orchard.Roles/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Web.config
@@ -73,6 +73,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<SandboxPage>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Sandbox.Models" %>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels" %>

--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<SandboxPage>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <%@ Import Namespace="Orchard.Sandbox.Models" %>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels" %>
 <div class="item">
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IContent>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <%@ Import Namespace="Orchard.Sandbox.Models" %>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels" %>
 <%@ Import Namespace="Orchard.ContentManagement" %>
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<SandboxPage>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <%@ Import Namespace="Orchard.Sandbox.Models" %>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels" %>

--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Create.aspx
@@ -1,7 +1,5 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageCreateViewModel>" %>
-
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <h3>
    Create Page</h3>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Edit.aspx
@@ -1,7 +1,5 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageEditViewModel>" %>
-
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <h3>
    Edit Page</h3>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Index.aspx
@@ -1,7 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageIndexViewModel>" %>

 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <h3>
    Sandbox Pages</h3>
 <p>
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx
@@ -1,5 +1,4 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageShowViewModel>" %>

 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <%= Html.DisplayForItem(Model.Page) %>
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Web.config
@@ -73,6 +73,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
@@ -31,6 +31,10 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Orchard.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Core\bin\Orchard.Core.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.ComponentModel.DataAnnotations">
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Create.aspx
@@ -1,13 +1,11 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsAdminCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Add a Tag</h2>
-<%-- todo: (heskew) change all of the explicit begin/end forms to using blocks --%>
-<% Html.BeginForm(); %>
-    <%= Html.ValidationSummary() %>
+<h2><%=Html.TitleForPage("Add a Tag") %></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
+    <%=Html.ValidationSummary() %>
    <fieldset>
        <label for="TagName">Name:</label>
-	    <input id="TagName" class="text" name="TagName" type="text" value="<%= Model.TagName %>" />
+	    <input id="TagName" class="text" name="TagName" type="text" value="<%=Model.TagName%>" />
        <input type="submit" class="button" value="Save" />
    </fieldset>
-<% Html.EndForm(); %>
+<% } %>
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Edit.aspx
@@ -1,13 +1,12 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsAdminEditViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Edit a Tag</h2>
-<% Html.BeginForm(); %>
-    <%= Html.ValidationSummary() %>
+<h2><%=Html.TitleForPage("Edit a Tag") %></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
+    <%=Html.ValidationSummary() %>
    <fieldset>
        <label for="Name">Name:</label>
        <input id="Id" name="Id" type="hidden" value="<%=Model.Id %>" />
        <input id="TagName" class="text" name="TagName" type="text" value="<%= Model.TagName %>" />
 	    <input type="submit" class="button" value="Save" />
 	</fieldset>
-<% Html.EndForm(); %>
+<% } %>
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Index.aspx
@@ -1,8 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsAdminIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<h2>Manage Tags</h2>
-<% Html.BeginForm(); %>
+<h2><%=Html.TitleForPage("Manage Tags")%></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
 	<%=Html.ValidationSummary() %>
    <fieldset class="actions bulk">
        <label for="publishActions">Actions: </label>
@@ -30,11 +29,12 @@
            <%
                int tagIndex = 0;
                foreach (var tagEntry in Model.Tags) {
+                    var ti = tagIndex;
            %>
            <tr>
                <td>
-                    <input type="hidden" value="<%=Model.Tags[tagIndex].Tag.Id%>" name="<%=Html.NameOf(m => m.Tags[tagIndex].Tag.Id)%>"/>
-                    <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.Tags[tagIndex].IsChecked)%>"/>
+                    <input type="hidden" value="<%=Model.Tags[tagIndex].Tag.Id%>" name="<%=Html.NameOf(m => m.Tags[ti].Tag.Id)%>"/>
+                    <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.Tags[ti].IsChecked)%>"/>
                </td>
                <td>
                    <%=Html.ActionLink(tagEntry.Tag.TagName, "Search", new {id = tagEntry.Tag.Id}) %>
@@ -47,4 +47,4 @@
        </table>
    </fieldset>
    <div class="manage"><%=Html.ActionLink("Add a tag", "Create", new { }, new { @class = "button" })%></div>
-<% Html.EndForm(); %>
+<% } %>
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Admin/Search.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsAdminSearchViewModel>" %>
 <%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<h2>List of contents tagged with <%=Model.TagName %></h2>
-<% using(Html.BeginForm()) { %>
+<h2><%=Html.TitleForPage(string.Format("List of contents tagged with {0}", Model.TagName)) %></h2>
+<% using(Html.BeginFormAntiForgeryPost()) { %>
 	<%=Html.ValidationSummary() %>
 	<fieldset>
 		<table class="items">
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/DisplayTemplates/Parts/Tags.ShowTags.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/DisplayTemplates/Parts/Tags.ShowTags.ascx
@@ -1,5 +1,4 @@
 <%@ 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> <% } %>
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/EditorTemplates/Parts/Tags.EditTags.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/EditorTemplates/Parts/Tags.EditTags.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<EditTagsViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <%@ Import Namespace="Orchard.Tags.Models" %>
 <fieldset>
    <%=Html.LabelFor(m=>m.Tags) %>
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Index.aspx
@@ -1,6 +1,5 @@
 <%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<TagsIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%-- todo: (heskew) make master-less when we get into theming --%>
 <asp:Content ContentPlaceHolderID="MainContent" runat="server">
    <h2>Tags</h2>
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx
@@ -1,7 +1,6 @@
 <%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<TagsSearchViewModel>" %>
 <%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%-- todo: (heskew) make master-less when we get into theming --%>
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
    <h2>List of contents tagged with <em><%= Model.TagName %></em></h2>
--- a/src/Orchard.Web/Packages/Orchard.Tags/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Web.config
@@ -76,6 +76,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/Orchard.Users/Orchard.Users.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Users/Orchard.Users.csproj
@@ -31,6 +31,10 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Orchard.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Core\bin\Orchard.Core.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.ComponentModel.DataAnnotations">
--- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Create.aspx
@@ -1,8 +1,6 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UserCreateViewModel>" %>
-
 <%@ Import Namespace="Orchard.Security" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Add User</h2>
+<h2><%=Html.TitleForPage("Add User") %></h2>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary() %>
    <%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
--- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Edit.aspx
@@ -1,16 +1,13 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UserEditViewModel>" %>
-
 <%@ Import Namespace="Orchard.Security" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>
-    Edit User</h2>
+<h2><%=Html.TitleForPage("Edit User") %></h2>
 <%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) %>
-<fieldset>
-    <input class="button" type="submit" value="Save" />
-</fieldset>
+    <%=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" type="submit" value="Save" />
+    </fieldset>
 <% } %>
--- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx
@@ -1,8 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UsersIndexViewModel>" %>
 <%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.Security" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<h2>Manage Users</h2>
+<h2><%=Html.TitleForPage("Manage Users") %></h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <%=Html.ValidationSummary()%>
    <div class="manage"><%=Html.ActionLink("Add a new user", "Create", new { }, new { @class = "button" })%></div>
--- a/src/Orchard.Web/Packages/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<User>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels" %>
 <%@ Import Namespace="Orchard.Users.Models" %>
 <%=Html.EditorZonesAny() %>
--- a/src/Orchard.Web/Packages/Orchard.Users/Web.config
+++ b/src/Orchard.Web/Packages/Orchard.Users/Web.config
@@ -73,6 +73,8 @@
        <add namespace="System.Web.Routing"/>
        <add namespace="System.Linq"/>
        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Core.Common.Mvc.Html" />
+        <add namespace="Orchard.Mvc.Html" />
      </namespaces>
    </pages>

--- a/src/Orchard.Web/Packages/TinyMce/TinyMce.csproj
+++ b/src/Orchard.Web/Packages/TinyMce/TinyMce.csproj
@@ -134,6 +134,9 @@
      <Name>Orchard</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Web.config" />
+  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/src/Orchard.Web/Packages/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx
+++ b/src/Orchard.Web/Packages/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx
@@ -1,6 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
-<%@ Import Namespace="Orchard.Mvc.Html" %>
-<%@ Import Namespace="System.Web.Mvc.Html" %>
 <% Html.RegisterScript("tiny_mce.js"); %>
 <%=Html.TextArea("", Model, 25, 80, new { @class = "html" }) %>

--- a/src/Orchard.Web/Packages/TinyMce/Web.config
+++ b/src/Orchard.Web/Packages/TinyMce/Web.config
@@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+<!-- 
+    Note: As an alternative to hand editing this file you can use the 
+    web admin tool to configure settings for your application. Use
+    the Website->Asp.Net Configuration option in Visual Studio.
+    A full list of settings and comments can be found in 
+    machine.config.comments usually located in 
+    \Windows\Microsoft.Net\Framework\v2.x\Config 
+-->
+<configuration>
+
+  <configSections>
+    <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
+          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+        </sectionGroup>
+      </sectionGroup>
+    </sectionGroup>
+  </configSections>
+
+
+  <system.web>
+
+    <!-- 
+            Set compilation debug="true" to insert debugging 
+            symbols into the compiled page. Because this 
+            affects performance, set this value to true only 
+            during development.
+    -->
+    <compilation debug="true">
+      <assemblies>
+        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+      </assemblies>
+    </compilation>
+
+
+
+    <!--
+            The <customErrors> section enables configuration 
+            of what to do if/when an unhandled error occurs 
+            during the execution of a request. Specifically, 
+            it enables developers to configure html error pages 
+            to be displayed in place of a error stack trace.
+
+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
+            <error statusCode="403" redirect="NoAccess.htm" />
+            <error statusCode="404" redirect="FileNotFound.htm" />
+        </customErrors>
+    -->
+
+    <pages>
+      <controls>
+        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      </controls>
+
+      <namespaces>
+        <add namespace="System.Web.Mvc"/>
+        <add namespace="System.Web.Mvc.Ajax"/>
+        <add namespace="System.Web.Mvc.Html"/>
+        <add namespace="System.Web.Routing"/>
+        <add namespace="System.Linq"/>
+        <add namespace="System.Collections.Generic"/>
+        <add namespace="Orchard.Mvc.Html" />
+      </namespaces>
+    </pages>
+
+    <httpHandlers>
+      <remove verb="*" path="*.asmx"/>
+      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
+      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+    </httpHandlers>
+
+    <httpModules>
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    </httpModules>
+
+  </system.web>
+
+  <system.codedom>
+    <compilers>
+      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4"
+                type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <providerOption name="CompilerVersion" value="v3.5"/>
+        <providerOption name="WarnAsError" value="false"/>
+      </compiler>
+
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4"
+                type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <providerOption name="CompilerVersion" value="v3.5"/>
+        <providerOption name="OptionInfer" value="true"/>
+        <providerOption name="WarnAsError" value="false"/>
+      </compiler>
+    </compilers>
+  </system.codedom>
+
+  <system.web.extensions/>
+
+  <!-- 
+        The system.webServer section is required for running ASP.NET AJAX under Internet
+        Information Services 7.0.  It is not necessary for previous version of IIS.
+  -->
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
+
+    <modules runAllManagedModulesForAllRequests="true">
+      <remove name="ScriptModule" />
+      <remove name="UrlRoutingModule" />
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    </modules>
+
+    <handlers>
+      <remove name="WebServiceHandlerFactory-Integrated"/>
+      <remove name="ScriptHandlerFactory" />
+      <remove name="ScriptHandlerFactoryAppServices" />
+      <remove name="ScriptResource" />
+      <remove name="MvcHttpHandler" />
+      <remove name="UrlRoutingHandler" />
+      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode"
+           type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode"
+           type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    </handlers>
+  </system.webServer>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+</configuration>
--- a/src/Orchard.Web/Themes/Orange/Views/layout.ascx
+++ b/src/Orchard.Web/Themes/Orange/Views/layout.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %><%
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%><%
 Html.RegisterStyle("site.css");
 %>
 <div class="page">
--- a/src/Orchard.Web/Themes/TheAdmin/Views/layout.ascx
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/layout.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<AdminViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Mvc.Html" %><%
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%><%
 Html.RegisterStyle("site.css"); %>
 <div id="header" role="banner">
    <h1><%=Html.ActionLink("Project Orchard", "Index", new { Area = "", Controller = "Home" })%></h1>
--- a/src/Orchard.Web/Views/Account/ChangePassword.ascx
+++ b/src/Orchard.Web/Views/Account/ChangePassword.ascx
@@ -1,7 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.AddTitleParts("Change Password"); %>
-<h2>Change Password</h2>
+<h2><%=Html.TitleForPage("Change Password") %></h2>
 <p>Use the form below to change your password. </p>
 <p>New passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.</p>
 <%= Html.ValidationSummary("Password change was unsuccessful. Please correct the errors and try again.")%>
--- a/src/Orchard.Web/Views/Account/ChangePasswordSuccess.ascx
+++ b/src/Orchard.Web/Views/Account/ChangePasswordSuccess.ascx
@@ -1,5 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.AddTitleParts("Change Password"); %>
-<h2>Change Password</h2>
+<h2><%=Html.TitleForPage("Change Password") %></h2>
 <p>Your password has been changed successfully.</p>
--- a/src/Orchard.Web/Views/Account/LogOn.ascx
+++ b/src/Orchard.Web/Views/Account/LogOn.ascx
@@ -1,11 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<% Html.AddTitleParts("Log On"); %>
-<h2>Log On</h2>
-<p>
-    Please enter your username and password. <%= Html.ActionLink("Register", "Register") %> if you don't have an account.
-</p>
+<h2><%=Html.TitleForPage("Log On") %></h2>
+<p>Please enter your username and password. <%= Html.ActionLink("Register", "Register") %> if you don't have an account.</p>
 <% if (Model != null && Model.Messages != null) Html.RenderPartial("Messages", Model.Messages); %>
 <%= Html.ValidationSummary("Login was unsuccessful. Please correct the errors and try again.") %>

--- a/src/Orchard.Web/Views/Account/Register.ascx
+++ b/src/Orchard.Web/Views/Account/Register.ascx
@@ -1,15 +1,8 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.AddTitleParts("Register"); %>
-<h2>Create a New Account</h2>
-<p>
-    Use the form below to create a new account. 
-</p>
-<p>
-    Passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.
-</p>
+<h2><%=Html.TitleForPage("Create a New Account") %></h2>
+<p>Use the form below to create a new account. </p>
+<p>Passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.</p>
 <%= Html.ValidationSummary("Account creation was unsuccessful. Please correct the errors and try again.") %>
-
 <% using (Html.BeginFormAntiForgeryPost()) { %>
    <div>
        <fieldset>
--- a/src/Orchard.Web/Views/Home/About.ascx
+++ b/src/Orchard.Web/Views/Home/About.ascx
@@ -1,5 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.AddTitleParts("About Us"); %>
-<h2> About</h2>
+<h2><%=Html.TitleForPage("About") %></h2>
 <p>Put content here.</p>
--- a/src/Orchard.Web/Views/Home/Index.ascx
+++ b/src/Orchard.Web/Views/Home/Index.ascx
@@ -1,5 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.AddTitleParts("Home Page"); %>
 <h2><%= Html.Encode(ViewData["Message"]) %></h2>
 <p>To learn more about ASP.NET MVC visit <a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.</p>
--- a/src/Orchard.Web/Views/Shared/Error.aspx
+++ b/src/Orchard.Web/Views/Shared/Error.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<System.Web.Mvc.HandleErrorInfo>" %>
-
+<%-- todo: (heskew) use (and fix, of course) --%>
 <asp:Content ID="errorTitle" ContentPlaceHolderID="TitleContent" runat="server">
    Error
 </asp:Content>
--- a/Show More
+++ b/Show More