diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index 50bb34db0..7eb72dc11 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -260,7 +260,7 @@ a:hover, a:active, a:focus { } #main .meta { font-style:italic; - margin:0 0 .75em; + margin:0 0 .4em; } #main form { margin:.345em 0 1.5em; @@ -547,7 +547,7 @@ ul.blogs, ul.posts { ul.blogs li, ul.posts li { margin:0; overflow:hidden; - padding:0 0 .4em; + padding:0 0 1.4em; } #main ul.blogs li h3, #main ul.posts li h3 { margin:0 0 .5em; @@ -555,7 +555,7 @@ ul.blogs li, ul.posts li { /* todo: (heskew) clean up since this is a bit of a hack specific to a single page */ #main ul.blogs li .actions, #main ul.posts li .actions { height:auto; - margin:-1.5em 0 0; + margin:-1.3em 0 0; padding:0 0 .1em; visibility:hidden; } diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs index 95cfa5be7..deb71f4f2 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Blogs { builder.Add("Blogs", "2", menu => menu .Add("Manage Blogs", "1.0", item => item.Action("ListForAdmin", "Blog", new { area = "Orchard.Blogs" })) - .Add("Create New Blog", "1.1", item => item.Action("Create", "Blog", new { area = "Orchard.Blogs" }))); + .Add("Create a Blog", "1.1", item => item.Action("Create", "Blog", new { area = "Orchard.Blogs" }))); } } } diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx index f87aa2638..0141bce64 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx @@ -3,8 +3,8 @@ <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> -

Create New Blog

-

Manage Blogs > Create Blog

+

Create a Blog

+

Manage Blogs > Create a Blog

<% using (Html.BeginForm()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForModel() %> 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 cfe6c583e..5994b16ec 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 @@ -8,10 +8,10 @@

<%-- todo: (heskew) make into a ul --%> - manage posts - | edit - | view - | create post + All Posts + | Edit + | View + | Create a Blog Post - delete + Delete 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 d823bf2cd..a7e8cdd09 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 @@ -3,7 +3,11 @@ <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

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

-
Edit
+
+ Edit Blog + Add a Post +
+

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

<%=Model.Blog.Description %>

<% //TODO: (erikpo) Move this into a helper if (Model.Posts.Count() > 0) { %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx index 96e1d0b89..f2d5b7e76 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx @@ -4,8 +4,8 @@ <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> -

Create a New Blog Post

-

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

+

Create a Blog Post

+

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

<%using (Html.BeginForm()) { %> <%= Html.ValidationSummary() %> <%= Html.EditorForModel() %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx index 6b4df4cef..396ad5d93 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx @@ -13,8 +13,8 @@ <%=Html.TextBoxFor(m => m.Slug, new { id = "permalink", @class = "text" })%> « How to write a permalink. »
- - [still needed] + <%-- + [still needed]--%> <%=Html.TextAreaFor(m => m.Body, new { id = "body", @class = "html" })%>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreviewForAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreviewForAdmin.ascx index 702b7bb40..521b52273 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreviewForAdmin.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/BlogPostPreviewForAdmin.ascx @@ -9,8 +9,11 @@

<%-- todo: (heskew) make into a ul --%> - edit - | view + Edit + | View<% + if (Model.Published == null) { // todo: (heskew) be smart about this and maybe have other contextual actions %> + | Publish + <% } %> - delete + Delete Blog Post

\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs index dd4456b57..8f912554b 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs +++ b/src/Orchard.Web/Packages/Orchard.Users/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Users { builder.Add("Users", "5", menu => menu .Add("Manage Users", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Users" })) - .Add("Create New User", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.Users" }))); + .Add("Create a User", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.Users" }))); } } }