From 248fef442445a523351afdfc73ea2b9222fbdf5c Mon Sep 17 00:00:00 2001
From: Jeremy Bridson <jeremy@silverstripe.com>
Date: Mon, 9 Jul 2012 12:05:53 +1200
Subject: [PATCH] ENHANCEMENT:added a clearfix to blogEntry.ss for the editpost
 links. added css requirements to php to detect subthemes css

---
 code/BlogEntry.php            | 2 +-
 code/BlogTree.php             | 2 +-
 css/blog.css                  | 5 +++++
 templates/Layout/BlogEntry.ss | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/BlogEntry.php b/code/BlogEntry.php
index 4b5a15e..2fe2157 100644
--- a/code/BlogEntry.php
+++ b/code/BlogEntry.php
@@ -236,7 +236,7 @@ class BlogEntry_Controller extends Page_Controller {
 	function init() {
 		parent::init();
 		
-		Requirements::themedCSS('blog');
+		Requirements::themedCSS("blog","blog");
 	}
 	
 	/**
diff --git a/code/BlogTree.php b/code/BlogTree.php
index 9937613..85f842a 100644
--- a/code/BlogTree.php
+++ b/code/BlogTree.php
@@ -234,7 +234,7 @@ class BlogTree_Controller extends Page_Controller {
 		
 		$this->IncludeBlogRSS();
 		
-		Requirements::themedCSS("blog");
+		Requirements::themedCSS("blog","blog");
 	}
 
 	function BlogEntries($limit = null) {
diff --git a/css/blog.css b/css/blog.css
index 691205f..2f312cb 100644
--- a/css/blog.css
+++ b/css/blog.css
@@ -8,4 +8,9 @@
 	background-color:	#f77;
 	padding: 7px;
 	font-weight:bold;
+}
+
+.edit-post {
+	clear:both;
+	padding-top:10px;
 }
\ No newline at end of file
diff --git a/templates/Layout/BlogEntry.ss b/templates/Layout/BlogEntry.ss
index 5b116c5..67f36b8 100644
--- a/templates/Layout/BlogEntry.ss
+++ b/templates/Layout/BlogEntry.ss
@@ -18,7 +18,7 @@
 		
 	</div>
 	
-	<% if IsOwner %><p><a href="$EditURL" id="editpost" title="<% _t('EDITTHIS', 'Edit this post') %>"><% _t('EDITTHIS', 'Edit this post') %></a> | <a href="$Link(unpublishPost)" id="unpublishpost"><% _t('UNPUBLISHTHIS', 'Unpublish this post') %></a></p><% end_if %>
+	<% if IsOwner %><p class="edit-post"><a href="$EditURL" id="editpost" title="<% _t('EDITTHIS', 'Edit this post') %>"><% _t('EDITTHIS', 'Edit this post') %></a> | <a href="$Link(unpublishPost)" id="unpublishpost"><% _t('UNPUBLISHTHIS', 'Unpublish this post') %></a></p><% end_if %>
 	
 	<% if TrackBacksEnabled %>
 		<% include TrackBacks %>