diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 93aeb3234..79f2faf3d 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -231,6 +231,7 @@
-
- ">
-
-
- <% using (Html.BeginFormAntiForgeryPost(Url.BlogDelete(Model.Item.Slug), FormMethod.Post, new { @class = "inline" })) { %>
-
- "><%=_Encoded("Remove Blog") %>
- <%
- } %>
-
-
-<%=Html.Encode(Model.Item.Description) %>
+
+<%----%>
+
+
<% Html.Zone("primary");
Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx
index 55fdb5dcb..1db41f14c 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx
@@ -6,26 +6,69 @@
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>
-<%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Id)) %>
-<%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%>
-<%=Model.Item.As
().Text ?? string.Format("{0}
", _Encoded("there's no content for this blog post"))%>
-
- "><%=_Encoded("Edit Post")%>
- "><%=_Encoded("View Post")%> <%
- if (Model.Item.ContentItem.VersionRecord.Published == false) { // todo: (heskew) be smart about this and maybe have other contextual actions - including view/preview for view up there ^^
- using (Html.BeginFormAntiForgeryPost(Url.BlogPostPublish(Model.Item.Blog.Slug, Model.Item.Id), FormMethod.Post, new { @class = "inline" })) { %>
-
- "><%=_Encoded("Publish Post Now")%>
- <%
- }
- } %>
+
+
+
+ <%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Id))%>
+
+
+
+ <%if (Model.IsPublished)
+ { %>
+
+
+
+ <% if (Model.IsDraft) { %>
+
+
+ <%--This should show publised date, last modified, or scheduled.
+
+ --%>
+
+
+ <%=_Encoded("By {0}", Model.Item.Creator.UserName)%>
+
+
-
+
+
+
+ <%if (Model.IsPublished){ %>
+ "><%=_Encoded("View")%> <%=_Encoded(" | ")%>
+ <% } %>
+
+ "><%=_Encoded("Edit")%> <%=_Encoded(" | ")%>
+
+ <%if (Model.Item.ContentItem.VersionRecord.Published == false) { // todo: (heskew) be smart about this and maybe have other contextual actions - including view/preview for view up there ^^
+ using (Html.BeginFormAntiForgeryPost(Url.BlogPostPublish(Model.Item.Blog.Slug, Model.Item.Id), FormMethod.Post, new { @class = "inline" })) { %>
+
+ "><%=_Encoded("Publish")%> <%=_Encoded(" | ")%><%
+ }
+ } %>
+
<% using (Html.BeginFormAntiForgeryPost(Url.BlogPostDelete(Model.Item.Blog.Slug, Model.Item.Id), FormMethod.Post, new { @class = "inline" })) { %>
-
- "><%=_Encoded("Remove Post") %>
- <%
- } %>
+ "><%=_Encoded("Delete") %>
+ <%
+ } %>
+
+
+
+
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/draft.gif b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/draft.gif
index 9f642088c..a572f4589 100644
Binary files a/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/draft.gif and b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/draft.gif differ
diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/scheduled.gif b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/scheduled.gif
index cb8811641..827afcade 100644
Binary files a/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/scheduled.gif and b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/scheduled.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/backgroundGradient.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/backgroundGradient.gif
new file mode 100644
index 000000000..0efd914c1
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/backgroundGradient.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index d06d78bce..e553432dc 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -567,19 +567,18 @@ button.ibutton {
----------------------------------------------------------*/
.contentItems {
background:#FFF;
- border:1px solid #B0B083;
margin:1.4em 0;
padding:2px;
}
.contentItems li {
background:#FFF;
- border-bottom:1px solid #EAE9D9;
+ border-bottom:1px solid #eaeaea;
margin:0;
overflow:hidden;
- padding:.7em 1.4em;
+ padding:.4em 1.4em;
}
-.contentItems li.last {
- border-bottom:0;
+.contentItems li.first {
+ background:#fff url(images/backgroundGradient.gif) repeat-x top left;
}
#main .contentItems li h3 {
border-bottom:0;
@@ -598,7 +597,7 @@ button.ibutton {
margin-left:8px;
margin-right:0;
}
-#main .contentItems li:hover { background:#fafbed; }
+#main .contentItems li:hover { background:#f8f8f8; }
#main .contentItems li:hover .ibutton { background-position:0 0; }
#main .contentItems li:hover .ibutton.remove { background-position:-20px 0; }
#main .contentItems li:hover .ibutton.view { background-position:-40px 0; }
@@ -696,4 +695,61 @@ table.items, textarea, input.text, input.text-box,
-moz-border-radius:3px 3px 0 0;
-webkit-border-radius:3px 3px 0 0;
border-radius:3px 3px 0 0;
-}*/
\ No newline at end of file
+}*/
+
+
+
+/* Added classes for new blog list layout
+---------------------------------------------------------- */
+.actions {
+ height:auto;
+ overflow:visible;
+ padding:0;
+ text-align:right;
+}
+.contentItems {
+ padding:0;
+}
+.contentItems li ul li {
+ border:0;
+ background:inherit;
+}
+li.properties {
+ float:left;
+}
+#main .contentItems li.properties h3 {
+ border-bottom:none;
+ margin:0;
+ padding:0;
+}
+li.related{
+ font-size:1.4em;
+ float:right;
+ padding:.4em 0;
+ text-align:right;
+}
+li.related .commentcount{
+ line-height:2em;
+}
+li.properties ul li{
+ border:0;
+ float:left;
+ padding:.8em 0;
+ font-size:1.4em;
+ background:inherit;
+}
+.icon {
+ margin:0 0 -2px 4px;
+ margin:0 .2em -.2em .2em;
+}
+.linkButton {
+ border:none;
+ padding:0;
+ background:none;
+ color:#1E5D7D;
+ }
+.linkButton:hover {
+ background-color:Transparent;
+ text-decoration:underline;
+ color:#1E5D7D;
+ }
\ No newline at end of file
" alt="<%=_Encoded("Online") %>" title="<%=_Encoded("The page is currently online") %>" /><%=_Encoded(" Published")%> + <% } + else + { %> +