Some page title cleanup. Should about do it for now.

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

src/Orchard.Web/Core/Themes/Styles/site.css

@@ -97,7 +97,7 @@ page width. Or, you can specify an exact pixel width. */
     padding: 0;
 }
 
-#header h1
+#title
 {
     font-weight: bold;
     padding: 5px 0;

src/Orchard.Web/Core/Themes/Views/layout.ascx

@@ -3,7 +3,7 @@
 Html.RegisterStyle("site.css"); %>
 <div class="page">
     <div id="header">
-        <div id="title"><h1><%=Html.TitleForPage(Html.SiteName()) %></h1></div><%
+        <div id="title"><%=Html.TitleForPage(Html.SiteName()) %></div><%
         Html.Zone("header");
         Html.Zone("menu"); %>
         <%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>

src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogsViewModel>" %>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
-<% Html.AddTitleParts("Blogs"); %>
+<h1><%=Html.TitleForPage("Blogs")%></h1>
-<h1>Blogs</h1>
 <p>All of the blogs.</p><%
 if (Model.Blogs.Count() > 0) { %>
 <%=Html.UnorderedList(Model.Blogs, (b, i) => Html.DisplayForItem(b).ToHtmlString(), "blogs contentItems") %><%

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

@@ -2,10 +2,9 @@
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-<% Html.AddTitleParts(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.BlogForAdmin(Model.Item.Slug) %>"><%=Html.TitleForPage(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>

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

@@ -2,9 +2,8 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
-<% Html.AddTitleParts(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>
+<h1><%=Html.TitleForPage(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/DisplayTemplates/Items/Blogs.BlogPost.ascx

@@ -2,9 +2,8 @@
 <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-<% Html.AddTitleParts(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>
+<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
 <div class="metadata">
     <% if (Model.Item.Creator != null)
        { 

src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Details.aspx

@@ -1,17 +1,12 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.DevTools.ViewModels.ContentDetailsViewModel>" %>
 <%@ Import Namespace="Orchard.ContentManagement"%>
-
 <%@ Import Namespace="System.Reflection" %>
-
+<h1><%=Html.TitleForPage(string.Format("{0} Content Type", Model.Item.ContentItem.ContentType), "Content")%></h1>
 <h3>Content Item</h3>
-<p>
+<p>Id:
-    Id:
     <%=Model.Item.ContentItem.Id %></p>
-<p>
+<p>ContentType:
-    ContentType:
     <%=Model.Item.ContentItem.ContentType%> <%=Html.ItemDisplayLink(Model.Item) %> <%=Html.ItemEditLink("edit", Model.Item) %></p>
-
-
 <h3>Content Item Parts</h3>
 <ul>
     <%foreach (var partType in Model.PartTypes.OrderBy(x => x.Name)) {%>

src/Orchard.Web/Packages/Orchard.DevTools/Views/Content/Index.aspx

@@ -1,14 +1,13 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.DevTools.ViewModels.ContentIndexViewModel>" %>
-
+<h1><%=Html.TitleForPage("Content") %></h1>
-
+<h2>Content Types</h2>
-<h3>Content Types</h3>
 <ul>
 <%foreach(var item in Model.Types.OrderBy(x=>x.Name)){%>
 <li><%=Html.Encode(item.Name) %> </li>
 <%}%>
 </ul>
 
-<h3>Content Items</h3>
+<h2>Content Items</h2>
 <ul>
 <%foreach(var item in Model.Items.OrderBy(x=>x.Id)){%>
 <li><%=Html.ActionLink(item.Id+": "+item.ContentType, "details", "content", new{item.Id},new{}) %>
@@ -16,4 +15,3 @@
  <%=Html.ItemEditLink("edit", item) %></li>
 <%}%>
 </ul>
-

src/Orchard.Web/Packages/Orchard.DevTools/Views/Home/Index.aspx

@@ -1,4 +1,4 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<BaseViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-
+<h1><%=Html.TitleForPage("Dev Tools") %></h1>
 <p><%=Html.ActionLink("Contents", "Index", "Content") %></p>

src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Create.aspx

@@ -1,9 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h3>
+<h1><%=Html.TitleForPage("Create Page")%></h1>
-    Create Page</h3>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
-
     <%=Html.LabelFor(x => x.Name)%><%=Html.EditorFor(x => x.Name)%>
     <input type="submit" name="submit" value="Create" />
-<%} %>
+<% } %>

src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Edit.aspx

@@ -1,8 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageEditViewModel>" %>
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h3>
+<h1><%=Html.TitleForPage("Edit Page")%></h1>
-    Edit Page</h3>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
-<%=Html.EditorForItem(Model.Page) %>
+    <%=Html.EditorForItem(Model.Page) %>
-<input type="submit" name="submit" value="Save" />
+    <input type="submit" name="submit" value="Save" />
-<%} %>
+<% } %>

src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Index.aspx

@@ -1,10 +1,7 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageIndexViewModel>" %>
-
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h3>
+<h1><%=Html.TitleForPage("Sandbox Pages")%></h1>
-    Sandbox Pages</h3>
+<p><%=Html.ActionLink("Create new page", "create") %></p>
-<p>
-    <%=Html.ActionLink("Create new page", "create") %></p>
 <%foreach (var item in Model.Pages) {%>
-<%=Html.DisplayForItem(item) %>
+    <%=Html.DisplayForItem(item) %>
 <%}%>

src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx

@@ -1,4 +1,3 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageShowViewModel>" %>
-
 <%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
 <%= Html.DisplayForItem(Model.Page) %>

src/Orchard.Web/Themes/Orange/Styles/site.css

@@ -97,7 +97,7 @@ page width. Or, you can specify an exact pixel width. */
     padding: 0;
 }
 
-#header h1
+#title
 {
     font-weight: bold;
     padding: 5px 0;

src/Orchard.Web/Themes/Orange/Views/layout.ascx

@@ -4,7 +4,7 @@ Html.RegisterStyle("site.css");
  %>
 <div class="page">
     <div id="header">
-        <div id="title"><h1><%=Html.TitleForPage(Html.SiteName()) %></h1></div><%
+        <div id="title"><%=Html.TitleForPage(Html.SiteName()) %></div><%
         Html.Zone("header");
         Html.Zone("menu"); %>
         <%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>

src/Orchard.Web/Views/Home/About.ascx

@@ -1,3 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<h2><%=Html.TitleForPage("About") %></h2>
+<h1><%=Html.TitleForPage("About") %></h1>
 <p>Put content here.</p>

src/Orchard.Web/Views/Home/Index.ascx

@@ -1,3 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
-<h2><%= Html.Encode(ViewData["Message"]) %></h2>
+<h1><%=Html.Encode(Html.SiteName()) %></h1>
+<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>