Merge pull request #33 from jbridson/master

added a couple of styling fixes to blog css and template and added css requirements to php to detect subtheme css
This commit is contained in:
carlos barberis 2012-07-08 17:22:27 -07:00
commit 6c7212e814
4 changed files with 8 additions and 3 deletions

View File

@ -236,7 +236,7 @@ class BlogEntry_Controller extends Page_Controller {
function init() {
parent::init();
Requirements::themedCSS('blog');
Requirements::themedCSS("blog","blog");
}
/**

View File

@ -234,7 +234,7 @@ class BlogTree_Controller extends Page_Controller {
$this->IncludeBlogRSS();
Requirements::themedCSS("blog");
Requirements::themedCSS("blog","blog");
}
function BlogEntries($limit = null) {

View File

@ -8,4 +8,9 @@
background-color: #f77;
padding: 7px;
font-weight:bold;
}
.edit-post {
clear:both;
padding-top:10px;
}

View File

@ -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 %>