tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.0' into 4

Browse Source
This commit is contained in:
Damian Mooyman 2017-11-27 16:02:40 +13:00
commit 36872c5ea4
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/en/04_Changelogs/4.0.0.md
View File

@ -410,13 +410,13 @@ Usage with custom logic:
+use SilverStripe\View\ThemeResourceLoader; +use SilverStripe\View\ThemeResourceLoader;
-$moduleFilePath = FRAMEWORK_DIR . '/MyFile.php'; -$moduleFilePath = FRAMEWORK_DIR . '/MyFile.php';
+$moduleFilePath = ModuleLoader::getModule('silverstripe/framework')->getRelativeResourcePath('MyFile.php'); +$moduleFilePath = ModuleLoader::getModule('silverstripe/framework')->getResource('MyFile.php')->getRelativePath();
-$baseFilePath = BASE_PATH . '/composer.json'; -$baseFilePath = BASE_PATH . '/composer.json';
+$baseFilePath = Director::baseFolder() . '/composer.json'; +$baseFilePath = Director::baseFolder() . '/composer.json';
-$mysiteFilePath = 'mysite/css/styles.css'; -$mysiteFilePath = 'mysite/css/styles.css';
+$mysiteFilePath = ModuleLoader::getModule('mysite')->getRelativeResourcePath('css/styles.css'); +$mysiteFilePath = ModuleLoader::getModule('mysite')->getResource('css/styles.css')->getRelativePath();
-$themesFilePath = SSViewer::get_theme_folder() . '/css/styles.css'; -$themesFilePath = SSViewer::get_theme_folder() . '/css/styles.css';
+$themesFilePath = ThemeResourceLoader::inst()->findThemedResource('css/styles.css'); +$themesFilePath = ThemeResourceLoader::inst()->findThemedResource('css/styles.css');
@ -428,13 +428,15 @@ Usage with custom logic:
Usage for Page and ModelAdmin: Usage for Page and ModelAdmin:
```php ```php
class ListingPage extends \Page { class ListingPage extends \Page
{
private static $icon = 'mycompany/silverstripe-mymodule: client/images/sitetree_icon.png'; private static $icon = 'mycompany/silverstripe-mymodule: client/images/sitetree_icon.png';
} }
``` ```
```php ```php
class MyCustomModelAdmin extends \SilverStripe\Admin\ModelAdmin { class MyCustomModelAdmin extends \SilverStripe\Admin\ModelAdmin
{
private static $menu_icon = 'mycompany/silverstripe-mymodule: client/images/modeladmin_icon.png'; private static $menu_icon = 'mycompany/silverstripe-mymodule: client/images/modeladmin_icon.png';
} }
``` ```