From 1e06318269b481028d69b38a79b43b2a20318bf4 Mon Sep 17 00:00:00 2001 From: skewed Date: Tue, 22 Dec 2009 00:22:04 +0000 Subject: [PATCH] Some layout work and fixed a layout bug (extra closing div left in) in the user admin index page. --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044428 --- src/Orchard.Web/Core/Themes/Views/document.aspx | 2 +- .../Packages/Orchard.Blogs/Views/Blog/Create.ascx | 2 +- .../Packages/Orchard.Blogs/Views/Blog/Edit.ascx | 2 +- .../Packages/Orchard.Blogs/Views/Blog/List.ascx | 2 +- .../Packages/Orchard.Blogs/Views/BlogAdmin/Item.ascx | 2 +- .../Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx | 2 +- .../Packages/Orchard.Blogs/Views/BlogPost/Create.ascx | 2 +- .../Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx | 2 +- .../Packages/Orchard.Blogs/Views/BlogPost/Item.ascx | 2 +- .../Items/Blogs.Blog.DetailAdmin.ascx | 2 +- .../Views/DisplayTemplates/Items/Blogs.Blog.ascx | 2 +- .../Views/DisplayTemplates/Items/Blogs.BlogPost.ascx | 2 +- .../Views/EditorTemplates/Items/Blogs.Blog.ascx | 2 +- .../Views/EditorTemplates/Items/Blogs.BlogPost.ascx | 2 +- .../Packages/Orchard.Users/Views/Admin/Index.aspx | 1 - src/Orchard.Web/Themes/Orange/Views/layout.ascx | 5 +++-- src/Orchard.Web/Views/Account/ChangePassword.ascx | 2 +- .../Views/Account/ChangePasswordSuccess.ascx | 2 +- src/Orchard.Web/Views/Account/LogOn.ascx | 2 +- src/Orchard.Web/Views/Account/Register.ascx | 2 +- src/Orchard.Web/Views/Home/About.ascx | 2 +- src/Orchard.Web/Views/Home/Index.ascx | 2 +- src/Orchard/Mvc/Html/LayoutExtensions.cs | 2 +- src/Orchard/UI/PageTitle/IPageTitleBuilder.cs | 1 + src/Orchard/UI/PageTitle/PageTitleBuilder.cs | 11 ++++++++++- 25 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/Orchard.Web/Core/Themes/Views/document.aspx b/src/Orchard.Web/Core/Themes/Views/document.aspx index 965ab7c1d..9cd829194 100644 --- a/src/Orchard.Web/Core/Themes/Views/document.aspx +++ b/src/Orchard.Web/Core/Themes/Views/document.aspx @@ -5,7 +5,7 @@ - <%=Html.Title() %><% + <%=Html.Title("site name") %><% Html.Zone("head", ":metas :styles :scripts"); %> <% 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 c2813810e..a5ec83433 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<% Html.Title("Add Blog"); %> +<% Html.AddTitleParts("Add Blog"); %>

Add Blog

<% 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 7cc6dbfe3..b71a9a1f9 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<% Html.Title("Edit Blog"); %> +<% Html.AddTitleParts("Edit Blog"); %>

Edit Blog

<% using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary() %> 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 ec002a39d..573c4f6dc 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<% Html.Title("Blogs"); %> +<% Html.AddTitleParts("Blogs"); %>

Blogs

All of the blogs.

<% if (Model.Blogs.Count() > 0) { %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/Item.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/Item.ascx index d39676dd9..4505e6d33 100644 --- 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,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<% Html.Title("Manage Blog"); %> +<% Html.AddTitleParts("Manage Blog"); %> <%=Html.DisplayForItem(m => m.Blog) %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx index a9e217802..8bb6dbdec 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx @@ -2,7 +2,7 @@ <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<% Html.Title("Manage Blogs"); %> +<% Html.AddTitleParts("Manage Blogs"); %>

Manage Blogs

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.

<% 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 5db2f99b8..f62ea73ff 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<% Html.Title("Add Post"); %> +<% Html.AddTitleParts("Add Post"); %>

Add Post

<% 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 db739db8d..6701cc358 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<% Html.Title("Edit Post"); %> +<% Html.AddTitleParts("Edit Post"); %>

Edit Post

<% 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 2aa287df7..25dd022a0 100644 --- 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,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -<% Html.Title(Model.Blog.Name); %> +<% Html.AddTitleParts(Model.Blog.Name); %> <%=Html.DisplayForItem(m=>m.BlogPost) %> \ No newline at end of file diff --git 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 index de23b58da..37cf9a75e 100644 --- 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 @@ -3,7 +3,7 @@ <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -<% Html.Title(Model.Item.Name); %> +<% Html.AddTitleParts(Model.Item.Name); %> <%-- todo: (heskew) get what actions we can out of the h2 :| --%>

<%=Html.Encode(Model.Item.Name) %> diff --git 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 index e11c75d63..48431755f 100644 --- 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 @@ -3,7 +3,7 @@ <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> -<% Html.Title(Model.Item.Name); %> +<% Html.AddTitleParts(Model.Item.Name); %>
edit

<%=Html.Encode(Model.Item.Name) %>

<%=Html.Encode(Model.Item.Description) %>
diff --git 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 index cdca463e1..54a937991 100644 --- 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 @@ -3,7 +3,7 @@ <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -<% Html.Title(Model.Item.Title); %> +<% Html.AddTitleParts(Model.Item.Title); %>
edit

<%=Html.Encode(Model.Item.Title)%>

diff --git 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 index a4a70c1ef..3e4df885a 100644 --- 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 @@ -2,6 +2,6 @@ <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -<% Html.Title(Model.Item.Name); %> +<% Html.AddTitleParts(Model.Item.Name); %> <%=Html.EditorZone("primary") %> <%=Html.EditorZonesAny() %> \ No newline at end of file diff --git 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 index 7af3b2bf5..8dc8ced14 100644 --- 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 @@ -2,7 +2,7 @@ <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -<% Html.Title(Model.Item.Title); %> +<% Html.AddTitleParts(Model.Item.Title); %>
<%=Html.EditorZone("primary") %> diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx index a55b6a84b..2b36b032f 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx @@ -39,5 +39,4 @@ <%}%> -
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Orange/Views/layout.ascx b/src/Orchard.Web/Themes/Orange/Views/layout.ascx index 13ec551ee..0da80a811 100644 --- a/src/Orchard.Web/Themes/Orange/Views/layout.ascx +++ b/src/Orchard.Web/Themes/Orange/Views/layout.ascx @@ -1,10 +1,11 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %><% -Html.RegisterStyle("site.css"); %> +Html.RegisterStyle("site.css"); + %>