diff --git a/css/blog.css b/css/blog.css index 23be840..ed5df79 100755 --- a/css/blog.css +++ b/css/blog.css @@ -1,11 +1,18 @@ -.blog-sidebar { - margin-top: 12px; +.no-sidebar .content-container.size3of4 { + width: 75%; } -.blog-sidebar .secondary { - margin-bottom: 35px; +.blog-entry .post-image img { + width: 98.75%; } +.blog-sidebar .WidgetHolder ul { + margin-left: 0; +} + .blog-sidebar .WidgetHolder ul li { + list-style-type: none; + } + #Form_CommentsForm + h4 { clear: both; padding-top: 35px; @@ -33,11 +40,4 @@ .commenting-rss-feed { clear: both; -} - -@media only screen and (max-width: 640px) { - .blog-sidebar { - width: 100%; /* sidenav is now shown above the page content */ - margin-bottom: 30px; - } -} \ No newline at end of file +} diff --git a/lang/en.yml b/lang/en.yml index fa656fa..262266b 100755 --- a/lang/en.yml +++ b/lang/en.yml @@ -1,38 +1,65 @@ en: + Blog: + Archive: Archive + Categories: Categories + Category: Category + Comments: Comments + DESCRIPTION: 'Adds a blog to your website.' + LumberjackTitle: 'Blog Posts' + NoPosts: 'There are no posts' + PLURALNAME: Blogs + Posted: Posted + PostedIn: 'Posted in' + PostsPerPage: 'Posts Per Page' + ReadMoreAbout: 'Read more about ''{title}''...' + SINGULARNAME: Blog + Tag: Tag + Tagged: Tagged + Tags: Tags + BlogArchiveWidget: + Blog: Blog + NumberToDisplay: 'No. to Display' + PLURALNAME: 'Blog Archive Widgets' + SINGULARNAME: 'Blog Archive Widget' + Type: Type + BlogCategoriesWidget: + Blog: Blog + PLURALNAME: 'Blog Categories Widgets' + SINGULARNAME: 'Blog Categories Widget' + BlogCategory: + PLURALNAME: 'Blog Categories' + SINGULARNAME: 'Blog Category' + Title: Title + BlogPost: + Categories: Categories + DESCRIPTION: 'Generic content page' + FeaturedImage: 'Featured Image' + PLURALNAME: 'Blog Posts' + PageTitleLabel: 'Post Title' + PublishDate: 'Publish Date' + SINGULARNAME: 'Blog Post' + Tags: Tags + BlogRecentPostsWidget: + Blog: Blog + NumberOfPosts: 'Number of Posts' + PLURALNAME: 'Blog Recent Posts Widgets' + SINGULARNAME: 'Blog Recent Posts Widget' + BlogTag: + PLURALNAME: 'Blog Tags' + SINGULARNAME: 'Blog Tag' + Title: Title + BlogTagsWidget: + Blog: Blog + PLURALNAME: 'Blog Tags Widgets' + SINGULARNAME: 'Blog Tags Widget' GridFieldAddByDBField: + Add: 'Add {name}' AddFail: 'Unable to save {class} to the database.' PermissionFail: 'You don''t have permission to create a {class}.' - Add: 'Add {name}' GridFieldBlogPostState: - StateTitle: 'State' - Draft: ' Saved as Draft on {date}' - Published: ' Published on {date}' - Timer: ' Publish at {date}' - Modified: 'Modified' - BlogPost: - PublishDate: 'Publish Date' - Categories: 'Categories' - Tags: 'Tags' - FeaturedImage: 'Featured Image' - PageTitleLabel: 'Post Title' - Blog: - BlogPosts: 'Blog Posts' - Categories: 'Categories' - Tags: 'Tags' - PostsPerPage: 'Posts Per Page' - BlogTag: - Title: 'Title' - BlogCategory: - Title: 'Title' - BlogRecentPostsWidget: - Blog: 'Blog' - NumberOfPosts: 'Number of Posts' - BlogCategoriesWidget: - Blog: 'Blog' - BlogArchiveWidget: - Blog: 'Blog' - Monthly: 'Monthly' - Yearly: 'Yearly' - NumberToDisplay: 'Number to Display' - BlogTagsWidget: - Blog: 'Blog' \ No newline at end of file + Draft: ' Saved as Draft on {date}' + Published: ' Published on {date}' + Timer: ' Publish at {date}' + SiteTree: + PLURALNAME: Pages + SINGULARNAME: Page diff --git a/templates/Includes/BlogSideBar.ss b/templates/Includes/BlogSideBar.ss index 97d3a0b..840df55 100644 --- a/templates/Includes/BlogSideBar.ss +++ b/templates/Includes/BlogSideBar.ss @@ -1,3 +1,5 @@ - \ No newline at end of file +<% if $SideBarView %> +
+ $SideBarView +
+<% end_if %> diff --git a/templates/Includes/EntryMeta.ss b/templates/Includes/EntryMeta.ss index 474fc4f..224a45b 100644 --- a/templates/Includes/EntryMeta.ss +++ b/templates/Includes/EntryMeta.ss @@ -1,17 +1,25 @@ -

- This entry was - <% if Categories %> - posted in +

+ <% if $Categories.exists %> + <%t Blog.PostedIn "Posted in" %> <% loop Categories %> - $Title<% if not Last %>, <% else_if Up.Tags %>, <% else %> and<% end_if %> + $Title<% if not Last %>, <% else %>;<% end_if %> <% end_loop %> <% end_if %> - <% if Tags %> - tagged + + <% if $Tags.exists %> + <%t Blog.Tagged "Tagged" %> <% loop Tags %> - $Title<% if not Last %>, <% end_if %> + $Title<% if not Last %>, <% else %>;<% end_if %> <% end_loop %> - and <% end_if %> - posted on $PublishDate.format("F j, Y") -

\ No newline at end of file + + <% if $Comments.exists %> + + <%t Blog.Comments "Comments" %> + $Comments.count + ; + <% end_if %> + + <%t Blog.Posted "Posted" %> + $PublishDate.ago +

diff --git a/templates/Includes/Pagination.ss b/templates/Includes/Pagination.ss new file mode 100644 index 0000000..1a20c7e --- /dev/null +++ b/templates/Includes/Pagination.ss @@ -0,0 +1,25 @@ +<%-- NOTE: Before including this, you will need to wrap the include in a with block --%> + +<% if $MoreThanOnePage %> +

+ <% if $NotFirstPage %> + + <% end_if %> + + <% loop $Pages %> + <% if $CurrentBool %> + $PageNum + <% else %> + <% if $Link %> + $PageNum + <% else %> + ... + <% end_if %> + <% end_if %> + <% end_loop %> + + <% if $NotLastPage %> + + <% end_if %> +

+<% end_if %> diff --git a/templates/Layout/Blog.ss b/templates/Layout/Blog.ss index e190eaa..e6690aa 100644 --- a/templates/Layout/Blog.ss +++ b/templates/Layout/Blog.ss @@ -1,64 +1,72 @@ -<% require css(themes/simple_blog/css/blog.css) %> - -<% include BlogSideBar %> -
-

- <% if ArchiveYear %> - Archive: <% if ArchiveDay %>$ArchiveDate.Nice<% else_if ArchiveMonth %>$ArchiveDate.format("F, Y")<% else %>$ArchiveDate.format(Y)<% end_if %> - <% else_if CurrentTag %> - Tag: $CurrentTag.Title - <% else_if CurrentCategory %> - Category: $CurrentCategory.Title - <% else %> - $Title - <% end_if %> -

- - <% if PaginatedList %> - - <% else %> -

No Posts

- <% end_if %> - - <% if PaginatedList.MoreThanOnePage %> -
- -

Page $PaginatedList.CurrentPage of $PaginatedList.TotalPages

-
- <% end_if %> +<% require css(blog/css/blog.css) %> + +
+ +
+

+ <% if ArchiveYear %> + <%t Blog.Archive "Archive" %>: + <% if ArchiveDay %> + $ArchiveDate.Nice + <% else_if ArchiveMonth %> + $ArchiveDate.format("F, Y") + <% else %> + $ArchiveDate.format(Y) + <% end_if %> + <% else_if CurrentTag %> + <%t Blog.Tag "Tag" %>: $CurrentTag.Title + <% else_if CurrentCategory %> + <%t Blog.Category "Category" %>: $CurrentCategory.Title + <% else %> + $Title + <% end_if %> +

+ +
$Content
+ + <% if $PaginatedList.Exists %> + <% loop $PaginatedList %> +
+

+ "> + <% if $MenuTitle %>$MenuTitle + <% else %>$Title<% end_if %> + +

+ +

+ > + $FeaturedImage.setWidth(795) + +

+ + <% if $Excerpt %> +

+ $Excerpt + + <%t Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %> + +

+ <% else %> +

+ <%t Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %> +

+ <% end_if %> + + <% include EntryMeta %> +
+ <% end_loop %> + <% else %> +

<%t Blog.NoPosts "There are no posts" %>

+ <% end_if %> +
+ + $Form + $PageComments + + <% with $PaginatedList %> + <% include Pagination %> + <% end_with %>
+ +<% include BlogSideBar %> diff --git a/templates/Layout/BlogPost.ss b/templates/Layout/BlogPost.ss index 69f10d4..2c6df00 100644 --- a/templates/Layout/BlogPost.ss +++ b/templates/Layout/BlogPost.ss @@ -1,17 +1,20 @@ -<% require css(themes/simple_blog/css/blog.css) %> +<% require css(blog/css/blog.css) %> -<% include BlogSideBar %> -
+
-

$Title

- - <% if FeaturedImage %> - $FeaturedImage.Title - <% end_if %> - +

$Title

+ + <% if $FeaturedImage %> +

$FeaturedImage.setWidth(795)

+ <% end_if %> +
$Content
<% include EntryMeta %> -
+ + + $Form $PageComments -
\ No newline at end of file +
+ +<% include BlogSideBar %>