diff --git a/_config.php b/_config.php index aded448..b3d9bbc 100755 --- a/_config.php +++ b/_config.php @@ -1,8 +1 @@ getRelativeResourcePath('js/gridfieldaddbydbfield.js')); /** * @var DataList $dataList diff --git a/src/Forms/GridField/GridFieldBlogPostState.php b/src/Forms/GridField/GridFieldBlogPostState.php index ce49e0b..069de60 100644 --- a/src/Forms/GridField/GridFieldBlogPostState.php +++ b/src/Forms/GridField/GridFieldBlogPostState.php @@ -3,6 +3,7 @@ namespace SilverStripe\Blog\Forms\GridField; use SilverStripe\Blog\Model\BlogPost; +use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Lumberjack\Forms\GridFieldSiteTreeState; use SilverStripe\View\Requirements; @@ -19,7 +20,7 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState public function getColumnContent($gridField, $record, $columnName) { if ($columnName == 'State') { - Requirements::css(BLOGGER_DIR . '/css/cms.css'); + Requirements::css(ModuleLoader::getModule('silverstripe/blog')->getRelativeResourcePath('css/cms.css')); if ($record instanceof BlogPost) { $modifiedLabel = ''; diff --git a/src/Model/Blog.php b/src/Model/Blog.php index 104ec1f..98899e9 100644 --- a/src/Model/Blog.php +++ b/src/Model/Blog.php @@ -14,6 +14,7 @@ use SilverStripe\CMS\Controllers\RootURLController; use SilverStripe\Control\Controller; use SilverStripe\Control\RSS\RSSFeed; use SilverStripe\Core\Convert; +use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\ListboxField; use SilverStripe\Forms\NumericField; @@ -141,8 +142,9 @@ class Blog extends Page implements PermissionProvider */ public function getCMSFields() { - Requirements::css(BLOGGER_DIR . '/css/cms.css'); - Requirements::javascript(BLOGGER_DIR . '/js/cms.js'); + $module = ModuleLoader::getModule('silverstripe/blog'); + Requirements::css($module->getRelativeResourcePath('css/cms.css')); + Requirements::javascript($module->getRelativeResourcePath('js/cms.js')); $this->beforeUpdateCMSFields(function ($fields) { if (!$this->canEdit()) { diff --git a/src/Model/BlogMemberExtension.php b/src/Model/BlogMemberExtension.php index 8f64148..9b81fc6 100644 --- a/src/Model/BlogMemberExtension.php +++ b/src/Model/BlogMemberExtension.php @@ -5,6 +5,7 @@ namespace SilverStripe\Blog\Model; use SilverStripe\Assets\Image; use SilverStripe\Blog\Forms\GridField\GridFieldConfig_BlogPost; use SilverStripe\Blog\Model\BlogPost; +use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\Tab; @@ -107,9 +108,9 @@ class BlogMemberExtension extends DataExtension $fields->removeFieldFromTab('Root', 'BlogPosts'); // Construct a better posts tab. - - Requirements::css(BLOGGER_DIR . '/css/cms.css'); - Requirements::javascript(BLOGGER_DIR . '/js/cms.js'); + $module = ModuleLoader::getModule('silverstripe/blog'); + Requirements::css($module->getRelativeResourcePath('css/cms.css')); + Requirements::javascript($module->getRelativeResourcePath('js/cms.js')); $tab = Tab::create('BlogPosts', _t(__CLASS__ . '.TABBLOGPOSTS', 'Blog Posts')); diff --git a/src/Model/BlogPost.php b/src/Model/BlogPost.php index 925808a..2556df7 100644 --- a/src/Model/BlogPost.php +++ b/src/Model/BlogPost.php @@ -9,6 +9,7 @@ use SilverStripe\Blog\Model\BlogCategory; use SilverStripe\Blog\Model\BlogPostFilter; use SilverStripe\Blog\Model\BlogTag; use SilverStripe\Control\Controller; +use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Forms\DatetimeField; use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\HTMLEditor\HTMLEditorField; @@ -208,8 +209,9 @@ class BlogPost extends Page */ public function getCMSFields() { - Requirements::css(BLOGGER_DIR . '/css/cms.css'); - Requirements::javascript(BLOGGER_DIR . '/js/cms.js'); + $module = ModuleLoader::getModule('silverstripe/blog'); + Requirements::css($module->getRelativeResourcePath('css/cms.css')); + Requirements::javascript($module->getRelativeResourcePath('js/cms.js')); $this->beforeUpdateCMSFields(function ($fields) { $uploadField = UploadField::create('FeaturedImage', _t(__CLASS__ . '.FeaturedImage', 'Featured Image'));