diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index fc9018b33..9c18d8977 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -258,6 +258,9 @@ a:hover, a:active, a:focus { #main p { margin:0 0 1.5em; } +#main .main.actions { + margin:0 0 1.4em; +} #main .meta { margin:0 0 .4em; } @@ -283,17 +286,20 @@ span.message { background:#e6f1c9; border:1px solid #cfe493; } - .warning.message { background:#fdf5bc; border:1px solid #ffea9b; } - .critical.message { background:#e68585; border:1px solid #990808; color:#fff; } +.info.message { + background:#f8f8ff; /* GhostWhite :P */ + border-color:#ccc; + border-style:dashed; +} /* Forms ----------------------------------------------------------*/ @@ -364,6 +370,12 @@ button, .button, .button:link, .button:visited { padding:0 8px; text-align:center; } +button.remove, .remove.button, .remove.button:link, .remove.button:visited { + background-color:#DECCCA; + background-image:url(images/tableHeaderBackgroundRed.gif); + border-color:#d6c9c7; + color:#5c3732; +} a.button, a.button:link, a.button:visited { line-height:1em; padding:.2em .6em; @@ -375,6 +387,12 @@ button:focus, .button:focus { color:#f6faea; text-decoration:none; } +button.remove:hover, .remove.button:hover, +button.remove:focus, .remove.button:focus { + background:#8f7c79; + border-color:#6e5551; + color:#faedeb; +} .button { line-height:26px; } diff --git a/src/Orchard.Web/Content/Admin/css/images/tableHeaderBackgroundRed.gif b/src/Orchard.Web/Content/Admin/css/images/tableHeaderBackgroundRed.gif new file mode 100644 index 000000000..b5330cbfd Binary files /dev/null and b/src/Orchard.Web/Content/Admin/css/images/tableHeaderBackgroundRed.gif differ 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 716301322..0c771b741 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 @@ -4,12 +4,13 @@ <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

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

-
- Edit Blog - Add Post +
+ Edit Blog + Remove Blog
-<%--

Manage Blogs > <%=Html.Encode(Model.Blog.Name) %>

--%> -

<%=Model.Blog.Description %>

<% +

<%=Model.Blog.Description %>

+
Add Post
<% if (Model.Posts.Count() > 0) { %> -<%=Html.UnorderedList(Model.Posts, (p, i) => Html.DisplayFor(blog => p, "BlogPostPreviewForAdmin").ToHtmlString(), "contentItems")%><% +<%=Html.UnorderedList(Model.Posts, (p, i) => Html.DisplayFor(blog => p, "BlogPostPreviewForAdmin").ToHtmlString(), "contentItems")%> +
Add Post
<% } %> \ 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 b1c248932..45a4ca292 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 @@ -1,10 +1,14 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Comments.Models"%> <%@ Import Namespace="Orchard.Models"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

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

-
<%=Html.Published() %>
+
+ <%=Html.Published() %> + | <%var commentCount = Model.As().Comments.Count(); %><%=string.Format("{0} comment{1}", commentCount, commentCount == 1 ? "" : "s") %> +
<%=Model.Body ?? "

there's no content for this blog post

" %>

<%-- todo: (heskew) make into a ul --%>