diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index 2727147a9..b997ffd33 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -140,7 +140,7 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14 /* Headings and defaults ----------------------------------------------------------*/ -h1, h2, h3, h4, h5, h6, legend { +h1, h2, h3, h4, h5, legend { padding:.4em 0; font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif; font-style: normal; @@ -153,7 +153,7 @@ h3 { font-size:2.1em; } /* 21px */ h4 { font-size:1.8em; } /* 18px */ h5 { font-size:1.6em; } /* 16px */ h6, p, label, input, select, .button, .cancel /* todo: (heskew) need to do something better with cancel */, -.message, th, td { font-size:1.5em; } /* 15px */ +.message, th, td { font-size:1.5em; line-height:1.5em; } /* 15px */ p .button { font-size:inherit; } h3 span { font-size:.57em; } @@ -254,6 +254,9 @@ a:hover, a:active, a:focus { #main h2, #main h3, #main h4, #main p { margin:.23em 0 1em; } +#main p { + margin:0 0 1.5em; +} #main form { margin:.345em 0 1.5em; } diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs index 2d695bb28..1d9dbfd00 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs @@ -74,7 +74,7 @@ namespace Orchard.Blogs.Controllers { var session = _sessionLocator.For(typeof(BlogPostRecord)); session.Flush(); - return Redirect(Url.BlogPostEdit(blogSlug, blogPost.As().Slug)); + return Redirect(Url.BlogPost(blogSlug, blogPost.As().Slug)); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/Blog.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/Blog.ascx index 71e979d63..9f7ae8226 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/Blog.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/DisplayTemplates/Blog.ascx @@ -1,6 +1,10 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> -

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

+

+ <%=Html.Encode(Model.Name) %> + (view) + (create post) +

[list of authors] [modify blog access]

<%=Model.Description %>

diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.aspx index b7553c9d1..56b7cf2e3 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Models"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> @@ -6,17 +6,16 @@ <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<% Html.Include("Header"); %> -
-

Blog

-
<%=Html.Encode(Model.Blog.Name) %>
<% - //TODO: (erikpo) Move this into a helper - if (Model.Posts.Count() > 0) { %> - <% +<%-- todo: (heskew) make master-less when we get into theming --%> + +

Blog

+
<%=Html.Encode(Model.Blog.Name) %>
<% + //TODO: (erikpo) Move this into a helper + if (Model.Posts.Count() > 0) { %> +
-<% Html.Include("Footer"); %> \ No newline at end of file + <% + } %> + \ No newline at end of file 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 ad7d86db9..6b4df4cef 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,6 +13,8 @@ <%=Html.TextBoxFor(m => m.Slug, new { id = "permalink", @class = "text" })%> « How to write a permalink. »
+ + [still needed] <%=Html.TextAreaFor(m => m.Body, new { id = "body", @class = "html" })%>
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 549fcce82..ea60c862a 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Models"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> @@ -6,10 +6,9 @@ <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<% Html.Include("Header"); %> -
-

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

-
Posted by <%=Html.Encode(Model.Post.Creator.UserName) %> on {M d yyyy h:mm tt}
- <%=Model.Post.Body %> -
-<% Html.Include("Footer"); %> \ No newline at end of file +<%-- todo: (heskew) make master-less when we get into theming --%> + +

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

+
Posted by <%=Html.Encode(Model.Post.Creator.UserName) %> on {M d yyyy h:mm tt}
+ <%=Model.Post.Body %> +
\ No newline at end of file