Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

New basePath: fix officiel plugin paths and vintage template

Browse source
This commit is contained in:
ArthurHoaro 2020-07-26 14:43:10 +02:00
parent bc583903ad
commit 9fbc42294e
39 changed files with 169 additions and 244 deletions
application/render
PageBuilder.php

32
application/render/PageBuilder.php
View file

@ -3,6 +3,7 @@
namespace Shaarli\Render;
use Exception;
use exceptions\MissingBasePathException;
use RainTPL;
use Shaarli\ApplicationUtils;
use Shaarli\Bookmark\BookmarkServiceInterface;
@ -156,7 +157,7 @@ class PageBuilder
* Affect variable after controller processing.
* Used for alert messages.
*/
protected function finalize(): void
protected function finalize(string $basePath): void
{
// TODO: use the SessionManager
$messageKeys = [
@ -170,6 +171,14 @@ class PageBuilder
unset($_SESSION[$messageKey]);
}
}
$this->assign('base_path', $basePath);
$this->assign(
'asset_path',
$basePath . '/' .
rtrim($this->conf->get('resource.raintpl_tpl', 'tpl'), '/') . '/' .
$this->conf->get('resource.theme', 'default')
);
}
/**
@ -209,23 +218,6 @@ class PageBuilder
return true;
}
/**
* Render a specific page (using a template file).
* e.g. $pb->renderPage('picwall');
*
* @param string $page Template filename (without extension).
*/
public function renderPage($page)
{
if ($this->tpl === false) {
$this->initialize();
}
$this->finalize();
$this->tpl->draw($page);
}
/**
* Render a specific page as string (using a template file).
* e.g. $pb->render('picwall');
@ -234,13 +226,13 @@ class PageBuilder
*
* @return string Processed template content
*/
public function render(string $page): string
public function render(string $page, string $basePath): string
{
if ($this->tpl === false) {
$this->initialize();
}
$this->finalize();
$this->finalize($basePath);
return $this->tpl->draw($page, true);
}