From 7210273340e6168deb4ba43ba7f5425912797ed8 Mon Sep 17 00:00:00 2001 From: skewed Date: Fri, 4 Dec 2009 22:27:54 +0000 Subject: [PATCH] More blog admin UI cleanup --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043231 --- src/Orchard.Web/Content/Admin/css/base.css | 5 ++++ .../Content/Admin/css/images/icons.png | Bin 6645 -> 7577 bytes .../Content/Admin/css/images/icons.psd | Bin 51329 -> 56233 bytes .../Extensions/HtmlHelperExtensions.cs | 14 +++++++--- .../Blog/DisplayTemplates/BlogForAdmin.ascx | 5 +++- .../Orchard.Blogs/Views/BlogPost/Item.aspx | 2 +- .../Views/Shared/BlogPostPreview.ascx | 2 +- .../BlogPostPreviewForAdmin.ascx | 3 ++- .../Models/DisplayTemplates/HasComments.ascx | 2 +- src/Orchard/Mvc/Html/HtmlHelperExtensions.cs | 24 ++++++++++++------ 10 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index d050c3ad6..126907459 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -493,6 +493,10 @@ a.ibutton.publish, a.ibutton.publish:link, a.ibutton.publish:visited { background-position:-100px -20px; } a.ibutton.publish:hover, a.ibutton.publish:active, a.ibutton.publish:focus { background-position:-100px 0; } +a.ibutton.blog, +a.ibutton.blog:link, +a.ibutton.blog:visited { background-position:-120px -20px; } +a.ibutton.blog:hover, a.ibutton.blog:active, a.ibutton.blog:focus { background-position:-120px 0; } /* todo: (heskew) needs attention */ @@ -566,6 +570,7 @@ ol.actions label { #main .contentItems li:hover a.ibutton.add.page { background-position:-60px 0; } #main .contentItems li:hover a.ibutton.edit { background-position:-80px 0; } #main .contentItems li:hover a.ibutton.publish { background-position:-100px 0; } +#main .contentItems li:hover a.ibutton.blog { background-position:-120px 0; } /* Tables ----------------------------------------------------------*/ diff --git a/src/Orchard.Web/Content/Admin/css/images/icons.png b/src/Orchard.Web/Content/Admin/css/images/icons.png index ae3c9fd57ecc56929d14f6cc81b3cae54cbfbf30..9db203a53add7170c00e39b94a95a0c588230e43 100644 GIT binary patch literal 7577 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 a_w3#)pj-_Ic;3xScCJ5DlH31(`T7sgt_Uyy delta 2731 zcmd^A>rb0i7(eYxrCJEvBA3;5ltmmS1c6>C1-7-&PLS)6t>aQwXzMV`bWAaPFb=UW#^vQQZew9M%5^F9hKBgX2u8n5n38=Mo<2{FW5&OLo}BYL&pFR| z&hMP(clx#uaScseqg+_t)^zAKVa8Z*&W7M6#oI{=tx~B~D(G=x`ZFefP1rA_7sWAr zl}H=J=SsE&vHIjpqspMqQf3(vRmxOja;n0Rl$l~o)ERYZqdGbLjSp(y(Urc zj?fiFD5ue9=LHFg{})Ajby0LyClQ2DpH3zSZ0sb-Bk@EWC~+j8 zl#?@T#>(1CVrH$Ku_z}cem|Oc^OI~bi6e#2MYH}-v;tDbR@>N)W){uD+G>WSJEFz4lML#Owg#pA%1E_$_0G=I0 z1*{HYj*5p+0SiNDXWl^t^xZ)PNQY4Y^}{Eg;jj1^gq3SVReYyoeI`VR3g$;6)nYjOHGZ2C8?mzhH(}T{1f8jO8|2f6bW& zn6Q-2J!W>@k`iz*fPV#0v#f&g`eilX=rZ~zEJ>-%6%Au=x^V8QD;;7kxsJkqGPgei z7I!3l-z{d9eGu4At!`wq>XXs^9%OUF_X@RnqG5HTM+;H+`XcD>o&(T#dZTE(R|@@N zZ!%!BR}q*)=6iifem-!vz2U diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs index cc4edf0cd..34c79c073 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs @@ -4,12 +4,18 @@ using Orchard.Mvc.Html; namespace Orchard.Blogs.Extensions { public static class HtmlHelperExtensions { - public static string Published(this HtmlHelper htmlHelper) { - return htmlHelper.Published(htmlHelper.ViewData.Model); + public static string PublishedState(this HtmlHelper htmlHelper) { + return htmlHelper.PublishedState(htmlHelper.ViewData.Model); + } + public static string PublishedState(this HtmlHelper htmlHelper, BlogPost blogPost) { + return htmlHelper.DateTime(blogPost.Published, "Draft"); } - public static string Published(this HtmlHelper htmlHelper, BlogPost blogPost) { - return htmlHelper.DateTime(blogPost.Published, "as a Draft"); + public static string PublishedWhen(this HtmlHelper htmlHelper) { + return htmlHelper.PublishedWhen(htmlHelper.ViewData.Model); + } + public static string PublishedWhen(this HtmlHelper htmlHelper, BlogPost blogPost) { + return htmlHelper.DateTimeRelative(blogPost.Published, "as a Draft"); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdmin.ascx index d8d9e586f..eff684d40 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdmin.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdmin.ascx @@ -4,12 +4,15 @@ <%@ Import Namespace="Orchard.Blogs.Models"%>

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

- <% var postCount = Model.PostCount; %><%=string.Format("{0} post{1}", postCount, postCount == 1 ? "" : "s") %>
+ <% var postCount = Model.PostCount; %><%=string.Format("{0} post{1}", postCount, postCount == 1 ? "" : "s") %> + | ?? comments + <%--

[list of authors] [modify blog access]

--%>

<%=Model.Description %>

<%-- todo: (heskew) make into a ul --%> + Manage Blog Edit Blog View Blog New Post diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx index c9f602e23..7d4f44c16 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx @@ -11,7 +11,7 @@

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

<%if (Model.Post.Creator != null) {%> -
Posted by <%=Html.Encode(Model.Post.Creator.UserName)%> <%=Html.Published(Model.Post)%>
+
Posted by <%=Html.Encode(Model.Post.Creator.UserName)%> <%=Html.PublishedWhen(Model.Post)%>
<%}%>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreview.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreview.ascx index 59c658ad1..d5d6d4862 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreview.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreview.ascx @@ -4,5 +4,5 @@ <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

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

-
<%=Html.Published() %>
+
<%=Html.PublishedWhen() %>
<%=Model.Body %>
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPostPreviewForAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPostPreviewForAdmin.ascx index 8db503cc6..fc797acc1 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPostPreviewForAdmin.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPostPreviewForAdmin.ascx @@ -5,7 +5,8 @@ <%@ Import Namespace="Orchard.Blogs.Models"%>

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

- <%=Html.Published() %> + <%=Html.PublishedState() %> + | ?? comments
<%=Model.Body ?? "

there's no content for this blog post

" %>

diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx index 13ad5262c..b50c868c5 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx @@ -8,7 +8,7 @@

<%--TODO: (erikpo) Need to clean the name and url so nothing dangerous goes out--%> <%=Html.LinkOrDefault(comment.UserName, comment.SiteName, new { rel = "nofollow" })%> - said
<%=Html.Link(Html.DateTime(comment.CommentDate), "#")%> + said
<%=Html.Link(Html.DateTimeRelative(comment.CommentDate), "#")%>

<%=comment.CommentText %>

diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs index b157b1aca..3ae4d392c 100644 --- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs +++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs @@ -87,30 +87,38 @@ namespace Orchard.Mvc.Html { #region Format Date/Time + public static string DateTimeRelative(this HtmlHelper htmlHelper, DateTime? value, string defaultIfNull) { + return value.HasValue ? htmlHelper.DateTimeRelative(value.Value) : defaultIfNull; + } + //TODO: (erikpo) This method needs localized - public static string DateTime(this HtmlHelper htmlHelper, DateTime value) - { + public static string DateTimeRelative(this HtmlHelper htmlHelper, DateTime value) { TimeSpan time = System.DateTime.UtcNow - value; if (time.TotalDays > 7) - //TODO: (erikpo) This format should come from a site setting - return "at " + value.ToString("MMM d yyyy h:mm tt"); + return "at " + htmlHelper.DateTime(value); if (time.TotalHours > 24) return string.Format("{0} day{1} ago", time.Days, time.Days == 1 ? "" : "s"); if (time.TotalMinutes > 60) return string.Format("{0} hour{1} ago", time.Hours, time.Hours == 1 ? "" : "s"); if (time.TotalSeconds > 60) return string.Format("{0} minute{1} ago", time.Minutes, time.Minutes == 1 ? "" : "s"); - else if (time.TotalSeconds > 10) + if (time.TotalSeconds > 10) return string.Format("{0} second{1} ago", time.Seconds, time.Seconds == 1 ? "" : "s"); - else - return "a moment ago"; + + return "a moment ago"; } - public static string DateTime(this HtmlHelper htmlHelper, DateTime? value, string defaultIfNull) { + public static string DateTime(this HtmlHelper htmlHelper, DateTime? value, string defaultIfNull) + { return value.HasValue ? htmlHelper.DateTime(value.Value) : defaultIfNull; } + //TODO: (erikpo) This format should come from a site setting + public static string DateTime(this HtmlHelper htmlHelper, DateTime value) { + return value.ToString("MMM d yyyy h:mm tt"); + } + #endregion #region Link