From cde32d7a9f797b1ed19a6bfed2943df194a6b0b3 Mon Sep 17 00:00:00 2001 From: skewed Date: Thu, 3 Dec 2009 23:56:39 +0000 Subject: [PATCH] Added some info messages to /admin/blogs and /admin/blogs/ for when there are no items --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043129 --- src/Orchard.Web/Content/Admin/css/base.css | 22 ++++++++----------- .../Blog/DisplayTemplates/BlogForAdmin.ascx | 2 +- .../BlogForAdminViewModel.ascx | 8 ++++--- .../BlogsForAdminViewModel.ascx | 7 ++++-- .../EditorTemplates/BlogEditViewModel.ascx | 4 ++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index 9c18d8977..6aae18937 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -281,6 +281,9 @@ span.message { display:block; margin:4px 0 4px 4px; } +.message a { + font-weight:bold; +} .confirmation.message { background:#e6f1c9; @@ -296,9 +299,8 @@ span.message { color:#fff; } .info.message { - background:#f8f8ff; /* GhostWhite :P */ - border-color:#ccc; - border-style:dashed; + background:#fff; + border:1px dashed #D2D6C6; } /* Forms @@ -328,7 +330,7 @@ select, textarea, input.text, input.text-box, #PublishLaterDate { border:1px solid #d2d6c6; color:#5a5b32; } -input.text { +input.text, input.text-box { line-height:1.2em; } select:focus, textarea:focus, input.text:focus, input.text-box:focus, #PublishLaterDate:focus { @@ -508,7 +510,6 @@ ul.contentItems li.last { #main ul.contentItems li h3 { margin:0 0 .1em; } -/* todo: (heskew) clean up since this is a bit of a hack specific to a single page */ #main ul.contentItems li .actions { color:#EAE9D9; height:auto; @@ -638,15 +639,10 @@ todo: (heskew) pull out into relevant modules where appropriate .topSpacer{margin-top: 20px;} .bottomSpacer{margin-bottom: 20px;} .displayText {display:none;} -/* -.separator {border-bottom:1px dashed #E4E7DC; margin-bottom:8px; padding-bottom:2px;} -*/ -/* todo: (heskew) remove roundCorners class and anything else that shouldn't be used (inputText*, linkButton, ..message -> .message */ -#content, #navigation li, -table, textarea, .button, input.text, ul.contentItems, -input.text-box, .inputTextLarge, .inputTextPermalink, .linkButton, .confirmation.message, -.warning.message, .critical.message, .roundCorners { +#content, #navigation li, button, .button, +table, textarea, input.text, input.text-box, +ul.contentItems, .message { -moz-border-radius:4px; -webkit-border-radius:4px; border-radius:4px; 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 9a4177d6f..2ad02e762 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 @@ -14,7 +14,7 @@ Edit Blog View Blog - Add Post + New Post Remove Blog

\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdminViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdminViewModel.ascx index 0c771b741..106b05886 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdminViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogForAdminViewModel.ascx @@ -8,9 +8,11 @@ Edit Blog Remove Blog -

<%=Model.Blog.Description %>

-
Add Post
<% +

<%=Model.Blog.Description %>

<% if (Model.Posts.Count() > 0) { %> +
New Post
<%=Html.UnorderedList(Model.Posts, (p, i) => Html.DisplayFor(blog => p, "BlogPostPreviewForAdmin").ToHtmlString(), "contentItems")%> -
Add Post
<% +
New Post
<% +} else { %> +
This blog is sad as it has no posts. But don't fret, you can add a new post right here!
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogsForAdminViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogsForAdminViewModel.ascx index 2e3c492cb..dfc6ee40f 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogsForAdminViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/BlogsForAdminViewModel.ascx @@ -3,8 +3,11 @@ <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Blogs.ViewModels" -%>
Add Blog
<% +%><% if (Model.Blogs.Count() > 0) { %> +
New Blog
<%=Html.UnorderedList(Model.Blogs, (b, i) => Html.DisplayFor(blog => b, "BlogForAdmin").ToHtmlString(), "contentItems") %> -
Add Blog
<% +
New Blog
<% +} else { %> +
There are no blogs for you to see. Want to add one?
<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx index 02ca0e878..f3a44963f 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx @@ -1,11 +1,11 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
- + <%=Html.EditorFor(m => m.Name) %>
<%=Html.EditorFor(m => m.Slug, "BlogPermalink") %>
- + <%=Html.TextAreaFor(m => m.Description, 5, 60, null) %>
\ No newline at end of file