From 2e3910778b42dbe7e5e805cd30441034e1d1a342 Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Fri, 18 Dec 2009 01:14:38 +0000
Subject: [PATCH] Some work with page titles in blogs

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044247
---
 src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx  | 1 +
 src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx    | 1 +
 .../Packages/Orchard.Blogs/Views/Blog/ItemForAdmin.ascx        | 1 +
 src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx    | 1 +
 .../Packages/Orchard.Blogs/Views/Blog/ListForAdmin.ascx        | 1 +
 .../Packages/Orchard.Blogs/Views/BlogPost/Create.ascx          | 1 +
 .../Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx            | 1 +
 .../Packages/Orchard.Blogs/Views/BlogPost/Item.ascx            | 1 +
 .../Views/Shared/DisplayTemplates/Blog/Detail.ascx             | 2 +-
 .../Views/Shared/DisplayTemplates/Blog/DetailAdmin.ascx        | 1 +
 .../Views/Shared/DisplayTemplates/BlogPost/Detail.ascx         | 1 +
 .../Views/Shared/EditorTemplates/Blog/Detail.ascx              | 1 +
 .../Views/Shared/EditorTemplates/BlogPost/Detail.ascx          | 1 +
 src/Orchard/UI/PageTitle/PageTitleBuilder.cs                   | 3 ++-
 14 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx
index 00d379b5f..c2813810e 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx
@@ -1,6 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
+<% Html.Title("Add Blog"); %>
 <h2>Add Blog</h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx
index 829ab46ed..7cc6dbfe3 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx
@@ -1,6 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogEditViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
+<% Html.Title("Edit Blog"); %>
 <h2>Edit Blog</h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ItemForAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ItemForAdmin.ascx
index fed62d4e0..d39676dd9 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ItemForAdmin.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ItemForAdmin.ascx
@@ -1,4 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogForAdminViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
+<% Html.Title("Manage Blog"); %>
 <%=Html.DisplayForItem(m => m.Blog) %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx
index fddfbecc7..ec002a39d 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx
@@ -1,6 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogsViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
+<% Html.Title("Blogs"); %>
 <h1>Blogs</h1>
 <p>All of the blogs.</p><%
 if (Model.Blogs.Count() > 0) { %>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.ascx
index cf8e6342f..29de2767e 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.ascx
@@ -3,6 +3,7 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
+<% Html.Title("Manage Blogs"); %>
 <h2>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) { %>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx
index ee65304ee..5db2f99b8 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx
@@ -1,6 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogPostViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
+<% Html.Title("Add Post"); %>
 <h2>Add Post</h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx
index 6f54b9bac..db739db8d 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx
@@ -1,6 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPostEditViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
+<% Html.Title("Edit Post"); %>
 <h2>Edit Post</h2>
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx
index a889eb14b..2aa287df7 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx
@@ -1,4 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPostViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
+<% Html.Title(Model.Blog.Name); %>
 <%=Html.DisplayForItem(m=>m.BlogPost) %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Detail.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Detail.ascx
index adec33d22..7693a24a3 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Detail.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Detail.ascx
@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%@ Import Namespace="Orchard.Models.ViewModels"%>
-<% Html.AddTitleParts(Model.Item.Name); %>
+<% 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>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/DetailAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/DetailAdmin.ascx
index 43836feac..9414f70fb 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/DetailAdmin.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/DetailAdmin.ascx
@@ -3,6 +3,7 @@
 <%@ 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>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Detail.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Detail.ascx
index cd9b28cfb..37a35cbcf 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Detail.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Detail.ascx
@@ -3,6 +3,7 @@
 <%@ 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">
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Detail.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Detail.ascx
index 21dd49db8..02fee0216 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Detail.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Detail.ascx
@@ -2,5 +2,6 @@
 <%@ 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() %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/Detail.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/Detail.ascx
index 80876fcfc..b2160e377 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/Detail.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/Detail.ascx
@@ -2,6 +2,7 @@
 <%@ 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") %>
diff --git a/src/Orchard/UI/PageTitle/PageTitleBuilder.cs b/src/Orchard/UI/PageTitle/PageTitleBuilder.cs
index 8f4fbda1b..5e130e8f6 100644
--- a/src/Orchard/UI/PageTitle/PageTitleBuilder.cs
+++ b/src/Orchard/UI/PageTitle/PageTitleBuilder.cs
@@ -15,7 +15,8 @@ namespace Orchard.UI.PageTitle {
         public void AddTitleParts(params string[] titleParts) {
             if (titleParts != null)
                 foreach (string titlePart in titleParts)
-                    _titleParts.Add(titlePart);
+                    if (!string.IsNullOrEmpty(titlePart))
+                        _titleParts.Add(titlePart);
         }
 
         public string GenerateTitle() {