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

Merge pull request #10755 from creative-commoners/pulls/5.0/themed-resource-url

Browse Source
This commit is contained in:
Michal Kleiner 2023-04-13 00:01:13 +12:00 committed by GitHub
commit b085e2df31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Manifest/ModuleResourceLoader.php
View File

@ -15,7 +15,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
use Injectable;
/**
* Convert a file of the form "vendor/package:resource" into a BASE_PATH-relative file
* Convert a file of the form "vendor/package:resource" into a BASE_PATH-relative file or folder
* For other files, return original value
*
* @param string $resource
@ -91,7 +91,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
* Returns the original resource otherwise.
*
* @param string $resource
* @return ModuleResource|string The resource, or input string if not a module resource
* @return ModuleResource|string The resource (or directory), or input string if not a module resource
*/
public function resolveResource($resource)
{

29
src/View/ThemeResourceLoader.php
View File

@ -7,12 +7,13 @@ use Psr\SimpleCache\CacheInterface;
use SilverStripe\Core\Flushable;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Manifest\ModuleLoader;
use SilverStripe\Core\Manifest\ModuleResourceLoader;
use SilverStripe\Core\Path;
/**
* Handles finding templates from a stack of template manifest objects.
*/
class ThemeResourceLoader implements Flushable
class ThemeResourceLoader implements Flushable, TemplateGlobalProvider
{
/**
@ -308,9 +309,9 @@ class ThemeResourceLoader implements Flushable
}
/**
* Resolve a themed resource
* Resolve a themed resource or directory
*
* A themed resource and be any file that resides in a theme folder.
* A themed resource can be any file that resides in a theme folder.
*
* @param string $resource A file path relative to the root folder of a theme
* @param array $themes An order listed of themes to search, Defaults to {@see SSViewer::get_themes()}
@ -336,6 +337,28 @@ class ThemeResourceLoader implements Flushable
return null;
}
/**
* Return the URL for a given themed resource or directory within the project.
*
* A themed resource can be any file that resides in a theme folder.
*/
public static function themedResourceURL(string $resource): ?string
{
$filePath = static::inst()->findThemedResource($resource);
if (!$filePath) {
return '';
}
return ModuleResourceLoader::singleton()->resolveURL($filePath);
}
public static function get_template_global_variables()
{
return [
'themedResourceURL',
];
}
/**
* Resolve all themes to the list of root folders relative to site root
*