Add TplCore Smarty templates ressource to make core templates easily overloadable

This commit is contained in:
Benjamin Renard 2023-03-08 13:06:04 +01:00
parent 01e7d9de6f
commit c0c5deedda
Signed by: bn8
GPG key ID: 3E2E1CE1907115BC
3 changed files with 35 additions and 12 deletions

View file

@ -0,0 +1,10 @@
{extends file='TplCore:empty.tpl'}
{block name="navbar-extra-content"}
<form class="d-flex" role="search" action='item'>
<div class="input-group input-group-sm me-2">
<input class="form-control" type="search" name="pattern"
placeholder="{t}Search{/t}" aria-label="{t}Search{/t}">
<span class="input-group-text"><i class="fa fa-search" aria-hidden="true"></i></span>
</div>
</form>
{/block}

View file

@ -160,6 +160,7 @@ class Tpl {
self :: $smarty->setTemplateDir(self :: $core_templates_directory); self :: $smarty->setTemplateDir(self :: $core_templates_directory);
self :: $smarty->setCompileDir($templates_c_dir); self :: $smarty->setCompileDir($templates_c_dir);
self :: $smarty->registerResource('Tpl', new TplSmartyResource()); self :: $smarty->registerResource('Tpl', new TplSmartyResource());
self :: $smarty->registerResource('TplCore', new TplSmartyResource(true));
$debug_ajax = App::get('templates.debug_ajax', null, 'bool'); $debug_ajax = App::get('templates.debug_ajax', null, 'bool');
self :: $_debug_ajax = boolval($debug_ajax); self :: $_debug_ajax = boolval($debug_ajax);
Log :: register_fatal_error_handler(array('\\EesyPHP\\Tpl', 'fatal_error')); Log :: register_fatal_error_handler(array('\\EesyPHP\\Tpl', 'fatal_error'));
@ -617,10 +618,13 @@ class Tpl {
/** /**
* Resolve templates path against registered templates directories * Resolve templates path against registered templates directories
* @param string $path * @param string $path
* @param bool $core_only Core only mode (optional, default: false)
* @return string|false * @return string|false
*/ */
public static function resolve_templates_path($path) { public static function resolve_templates_path($path, $core_only=false) {
foreach(array_keys(self :: $templates_directories) as $dir) { foreach(array_keys(self :: $templates_directories) as $dir) {
if ($core_only && $dir != self :: $core_templates_directory)
continue;
$fullpath = "$dir/$path"; $fullpath = "$dir/$path";
if (file_exists($fullpath)) { if (file_exists($fullpath)) {
Log::trace('Templates file "%s" resolved as "%s"', $path, $fullpath); Log::trace('Templates file "%s" resolved as "%s"', $path, $fullpath);
@ -635,11 +639,12 @@ class Tpl {
* Return the content of a Smarty template file. * Return the content of a Smarty template file.
* *
* @param string $template The template name (eg: base.tpl) * @param string $template The template name (eg: base.tpl)
* @param bool $core_only Core only mode (optional, default: false)
* *
* @return string The content of the Smarty template file * @return string The content of the Smarty template file
**/ **/
public static function get_template_source($template) { public static function get_template_source($template, $core_only=false) {
$path = self :: resolve_templates_path($template); $path = self :: resolve_templates_path($template, $core_only);
if (!is_readable($path)) { if (!is_readable($path)) {
// No error return with Smarty3 and highter because it's call // No error return with Smarty3 and highter because it's call
// template name in lower first systematically // template name in lower first systematically
@ -653,11 +658,12 @@ class Tpl {
* template file. * template file.
* *
* @param string $template The template name (eg: empty.tpl) * @param string $template The template name (eg: empty.tpl)
* @param bool $core_only Core only mode (optional, default: false)
* *
* @return int|null The timestamp of the last change of the Smarty template file * @return int|null The timestamp of the last change of the Smarty template file
**/ **/
public static function get_template_timestamp($template) { public static function get_template_timestamp($template, $core_only=false) {
$path = self :: resolve_templates_path($template); $path = self :: resolve_templates_path($template, $core_only);
if (is_file($path)) { if (is_file($path)) {
$time = filemtime($path); $time = filemtime($path);
if ($time) if ($time)

View file

@ -11,10 +11,17 @@ use Smarty_Resource_Custom;
*/ */
class TplSmartyResource extends Smarty_Resource_Custom { class TplSmartyResource extends Smarty_Resource_Custom {
// prepared fetch() statement // Core only templates
protected $fetch; protected $core_only;
// prepared fetchTimestamp() statement
protected $mtime; /**
* Constructor
* @param bool $core_only Core only mode (optional, default: false)
* @return void
*/
public function __construct($core_only=false) {
$this -> core_only = $core_only;
}
/** /**
* Fetch a template and its modification time * Fetch a template and its modification time
@ -25,8 +32,8 @@ class TplSmartyResource extends Smarty_Resource_Custom {
* @return void * @return void
*/ */
protected function fetch($name, &$source, &$mtime) { protected function fetch($name, &$source, &$mtime) {
$source = Tpl :: get_template_source($name); $source = Tpl :: get_template_source($name, $this -> core_only);
$mtime = Tpl :: get_template_timestamp($name); $mtime = Tpl :: get_template_timestamp($name, $this -> core_only);
} }
/** /**
@ -39,6 +46,6 @@ class TplSmartyResource extends Smarty_Resource_Custom {
* @return integer timestamp (epoch) the template was modified * @return integer timestamp (epoch) the template was modified
*/ */
protected function fetchTimestamp($name) { protected function fetchTimestamp($name) {
return Tpl :: get_template_timestamp($name); return Tpl :: get_template_timestamp($name, $this -> core_only);
} }
} }