diff --git a/css/cms.css b/css/cms.css index a97b476..beb7395 100755 --- a/css/cms.css +++ b/css/cms.css @@ -7,9 +7,6 @@ /* * Sprite maps & Icons */ -.gridfield-icon.blog-icon-timer { - background: url("../images/blog-icon/timer.png") center no-repeat; } - #FeaturedImage .middleColumn { clear: none; float: left; } diff --git a/images/blog-icon/timer.png b/images/blog-icon/timer.png deleted file mode 100755 index 9a668f6..0000000 Binary files a/images/blog-icon/timer.png and /dev/null differ diff --git a/scss/cms.scss b/scss/cms.scss index 3b2ee79..478c037 100755 --- a/scss/cms.scss +++ b/scss/cms.scss @@ -12,10 +12,6 @@ // @import "blog-icon/*.png"; // buttons -.gridfield-icon.blog-icon-timer { - background: url('../images/blog-icon/timer.png') center no-repeat; -} - #FeaturedImage .middleColumn { clear: none; float: left; diff --git a/src/Forms/GridField/GridFieldBlogPostState.php b/src/Forms/GridField/GridFieldBlogPostState.php index 58b8e95..4b5a4de 100644 --- a/src/Forms/GridField/GridFieldBlogPostState.php +++ b/src/Forms/GridField/GridFieldBlogPostState.php @@ -5,6 +5,7 @@ namespace SilverStripe\Blog\Forms\GridField; use SilverStripe\Blog\Model\BlogPost; use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState; +use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\View\Requirements; /** @@ -20,7 +21,7 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState public function getColumnContent($gridField, $record, $columnName) { if ($columnName == 'State') { - Requirements::css(ModuleLoader::getModule('silverstripe/blog')->getRelativeResourcePath('css/cms.css')); + Requirements::css('silverstripe/blog:css/cms.css'); if ($record instanceof BlogPost) { $modifiedLabel = ''; @@ -30,11 +31,11 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState if (!$record->isPublished()) { /** - * @var SS_Datetime $lastEdited + * @var DBDatetime $lastEdited */ $lastEdited = $record->dbObject('LastEdited'); - return ' ' . _t( + return ' ' . _t( __CLASS__ . '.Draft', 'Saved as Draft on {date}', 'State for when a post is saved.', @@ -45,12 +46,12 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState } /** - * @var SS_Datetime $publishDate + * @var DBDatetime $publishDate */ $publishDate = $record->dbObject('PublishDate'); if (strtotime($record->PublishDate) > time()) { - return ' ' . _t( + return ' ' . _t( __CLASS__ . '.Timer', 'Publish at {date}', 'State for when a post is published.', @@ -60,7 +61,7 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState ) . $modifiedLabel; } - return ' ' . _t( + return ' ' . _t( __CLASS__ . '.Published', 'Published on {date}', 'State for when a post is published.', diff --git a/src/Model/BlogMemberExtension.php b/src/Model/BlogMemberExtension.php index 0b9ce60..45da9e7 100644 --- a/src/Model/BlogMemberExtension.php +++ b/src/Model/BlogMemberExtension.php @@ -59,6 +59,11 @@ class BlogMemberExtension extends DataExtension $this->owner->URLSegment = preg_replace('/-[0-9]+$/', null, $this->owner->URLSegment) . '-' . $count; $count++; } + + // Auto publish profile images + if ($this->owner->BlogProfileImage() && $this->owner->BlogProfileImage()->exists()) { + $this->owner->BlogProfileImage()->publishSingle(); + } } /**