lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 11:44:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Some layout work and fixed a layout bug (extra closing div left in) in the user admin index page.

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4044428
This commit is contained in:
skewed
2009-12-22 00:22:04 +00:00
parent 99cf7c5bd1
commit 1e06318269
25 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Themes/Views/document.aspx
View File

@@ -5,7 +5,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title><%=Html.Title() %></title><% <title><%=Html.Title("site name") %></title><%
Html.Zone("head", ":metas :styles :scripts"); %> Html.Zone("head", ":metas :styles :scripts"); %>
</head> </head>
<body><% <body><%

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
<% Html.Title("Add Blog"); %> <% Html.AddTitleParts("Add Blog"); %>
<h2>Add Blog</h2> <h2>Add Blog</h2>
<% using (Html.BeginFormAntiForgeryPost()) { %> <% using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %> <%=Html.ValidationSummary() %>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogEditViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogEditViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
<% Html.Title("Edit Blog"); %> <% Html.AddTitleParts("Edit Blog"); %>
<h2>Edit Blog</h2> <h2>Edit Blog</h2>
<% using (Html.BeginFormAntiForgeryPost()) { %> <% using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %> <%=Html.ValidationSummary() %>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.ascx
View File

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

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/Item.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogForAdminViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogForAdminViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
<% Html.Title("Manage Blog"); %> <% Html.AddTitleParts("Manage Blog"); %>
<%=Html.DisplayForItem(m => m.Blog) %> <%=Html.DisplayForItem(m => m.Blog) %>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogAdmin/List.ascx
View File

@@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
<% Html.Title("Manage Blogs"); %> <% Html.AddTitleParts("Manage Blogs"); %>
<h2>Manage Blogs</h2> <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><% <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) { %> if (Model.Blogs.Count() > 0) { %>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogPostViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogPostViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
<% Html.Title("Add Post"); %> <% Html.AddTitleParts("Add Post"); %>
<h2>Add Post</h2> <h2>Add Post</h2>
<% using (Html.BeginFormAntiForgeryPost()) { %> <% using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %> <%=Html.ValidationSummary() %>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPostEditViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPostEditViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
<% Html.Title("Edit Post"); %> <% Html.AddTitleParts("Edit Post"); %>
<h2>Edit Post</h2> <h2>Edit Post</h2>
<% using (Html.BeginFormAntiForgeryPost()) { %> <% using (Html.BeginFormAntiForgeryPost()) { %>
<%=Html.ValidationSummary() %> <%=Html.ValidationSummary() %>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPostViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogPostViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
<% Html.Title(Model.Blog.Name); %> <% Html.AddTitleParts(Model.Blog.Name); %>
<%=Html.DisplayForItem(m=>m.BlogPost) %> <%=Html.DisplayForItem(m=>m.BlogPost) %>

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

@@ -3,7 +3,7 @@
<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ 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 :| --%> <%-- todo: (heskew) get what actions we can out of the h2 :| --%>
<h2 class="withActions"> <h2 class="withActions">
<a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Name) %></a> <a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.Encode(Model.Item.Name) %></a>

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

@@ -3,7 +3,7 @@
<%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>
<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
<% Html.Title(Model.Item.Name); %> <% Html.AddTitleParts(Model.Item.Name); %>
<div class="manage"><a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit">edit</a></div> <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.Encode(Model.Item.Name) %></h1>
<div><%=Html.Encode(Model.Item.Description) %></div> <div><%=Html.Encode(Model.Item.Description) %></div>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
View File

@@ -3,7 +3,7 @@
<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>
<% Html.Title(Model.Item.Title); %> <% 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> <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.Encode(Model.Item.Title)%></h1>
<div class="metadata"> <div class="metadata">

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.Blog.ascx
View File

@@ -2,6 +2,6 @@
<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>
<% Html.Title(Model.Item.Name); %> <% Html.AddTitleParts(Model.Item.Name); %>
<%=Html.EditorZone("primary") %> <%=Html.EditorZone("primary") %>
<%=Html.EditorZonesAny() %> <%=Html.EditorZonesAny() %>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/EditorTemplates/Items/Blogs.BlogPost.ascx
View File

@@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.ContentManagement.ViewModels"%> <%@ Import Namespace="Orchard.ContentManagement.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>
<% Html.Title(Model.Item.Title); %> <% Html.AddTitleParts(Model.Item.Title); %>
<div class="sections"> <div class="sections">
<div class="primary"> <div class="primary">
<%=Html.EditorZone("primary") %> <%=Html.EditorZone("primary") %>

1
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx
View File

@@ -39,5 +39,4 @@
</tr> </tr>
<%}%> <%}%>
</table> </table>
</div>
<% } %> <% } %>

5
src/Orchard.Web/Themes/Orange/Views/layout.ascx
View File

@@ -1,10 +1,11 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %><% <%@ Import Namespace="Orchard.Mvc.Html" %><%
Html.RegisterStyle("site.css"); %> Html.RegisterStyle("site.css");
%>
<div class="page"> <div class="page">
<div id="header"> <div id="header">
<div id="title"><h1>My (orange) MVC Application</h1></div><% <div id="title"><h1><%//Html.SiteName(); %></h1></div><%
Html.Zone("header"); Html.Zone("header");
Html.Zone("menu"); %> Html.Zone("menu"); %>
<%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%> <%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>

2
src/Orchard.Web/Views/Account/ChangePassword.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<% Html.Title("Change Password"); %> <% Html.AddTitleParts("Change Password"); %>
<h2>Change Password</h2> <h2>Change Password</h2>
<p>Use the form below to change your password. </p> <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> <p>New passwords are required to be a minimum of <%=Html.Encode(ViewData["PasswordLength"])%> characters in length.</p>

2
src/Orchard.Web/Views/Account/ChangePasswordSuccess.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<% Html.Title("Change Password"); %> <% Html.AddTitleParts("Change Password"); %>
<h2>Change Password</h2> <h2>Change Password</h2>
<p>Your password has been changed successfully.</p> <p>Your password has been changed successfully.</p>

2
src/Orchard.Web/Views/Account/LogOn.ascx
View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<% Html.Title("Log On"); %> <% Html.AddTitleParts("Log On"); %>
<h2>Log On</h2> <h2>Log On</h2>
<p> <p>
Please enter your username and password. <%= Html.ActionLink("Register", "Register") %> if you don't have an account. Please enter your username and password. <%= Html.ActionLink("Register", "Register") %> if you don't have an account.

2
src/Orchard.Web/Views/Account/Register.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<% Html.Title("Register"); %> <% Html.AddTitleParts("Register"); %>
<h2>Create a New Account</h2> <h2>Create a New Account</h2>
<p> <p>
Use the form below to create a new account. Use the form below to create a new account.

2
src/Orchard.Web/Views/Home/About.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<% Html.Title("About Us"); %> <% Html.AddTitleParts("About Us"); %>
<h2> About</h2> <h2> About</h2>
<p>Put content here.</p> <p>Put content here.</p>

2
src/Orchard.Web/Views/Home/Index.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<% Html.Title("Home Page"); %> <% Html.AddTitleParts("Home Page"); %>
<h2><%= Html.Encode(ViewData["Message"]) %></h2> <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> <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>

2
src/Orchard/Mvc/Html/LayoutExtensions.cs
View File

@@ -29,7 +29,7 @@ namespace Orchard.Mvc.Html {
public static MvcHtmlString Title(this HtmlHelper html, params string[] titleParts) { public static MvcHtmlString Title(this HtmlHelper html, params string[] titleParts) {
IPageTitleBuilder pageTitleBuilder = html.Resolve<IPageTitleBuilder>(); IPageTitleBuilder pageTitleBuilder = html.Resolve<IPageTitleBuilder>();
pageTitleBuilder.AddTitleParts(titleParts); html.Resolve<IPageTitleBuilder>().AppendTitleParts(titleParts);
return MvcHtmlString.Create(html.Encode(pageTitleBuilder.GenerateTitle())); return MvcHtmlString.Create(html.Encode(pageTitleBuilder.GenerateTitle()));
} }

1
src/Orchard/UI/PageTitle/IPageTitleBuilder.cs
View File

@@ -1,6 +1,7 @@
namespace Orchard.UI.PageTitle { namespace Orchard.UI.PageTitle {
public interface IPageTitleBuilder : IDependency { public interface IPageTitleBuilder : IDependency {
void AddTitleParts(params string[] titleParts); void AddTitleParts(params string[] titleParts);
void AppendTitleParts(params string[] titleParts);
string GenerateTitle(); string GenerateTitle();
} }
} }

11
src/Orchard/UI/PageTitle/PageTitleBuilder.cs
View File

@@ -12,13 +12,22 @@ namespace Orchard.UI.PageTitle {
_titleSeparator = " - "; _titleSeparator = " - ";
} }
public void AddTitleParts(params string[] titleParts) { public void AddTitleParts(params string[] titleParts)
{
if (titleParts != null) if (titleParts != null)
foreach (string titlePart in titleParts) foreach (string titlePart in titleParts)
if (!string.IsNullOrEmpty(titlePart)) if (!string.IsNullOrEmpty(titlePart))
_titleParts.Add(titlePart); _titleParts.Add(titlePart);
} }
public void AppendTitleParts(params string[] titleParts)
{
if (titleParts != null)
foreach (string titlePart in titleParts)
if (!string.IsNullOrEmpty(titlePart))
_titleParts.Insert(0, titlePart);
}
public string GenerateTitle() { public string GenerateTitle() {
return string.Join(_titleSeparator, _titleParts.AsEnumerable().Reverse().ToArray()); return string.Join(_titleSeparator, _titleParts.AsEnumerable().Reverse().ToArray());
} }