Merge branch 'template_support' into doucovanineratovice.cz

This commit is contained in:
Michal Kváček
2016-09-25 02:01:43 +02:00
2 changed files with 13 additions and 2 deletions
+4
View File
@@ -24,3 +24,7 @@ function e($value)
function setting($key, $default = null) { function setting($key, $default = null) {
return \App\Helpers\Settings::get($key, $default); return \App\Helpers\Settings::get($key, $default);
} }
function asset_path($path) {
return env('SITE_URL').'/assets/'.$path;
}
@@ -4,6 +4,7 @@ namespace Templates\Base\OnePage\Handlers;
use App\Handlers\Contracts\TemplateHandler; use App\Handlers\Contracts\TemplateHandler;
use App\Helpers\PageRenderer; use App\Helpers\PageRenderer;
use App\Helpers\Settings; use App\Helpers\Settings;
use App\Helpers\Template;
use App\Models\ActionLogType; use App\Models\ActionLogType;
use App\Models\Content; use App\Models\Content;
use App\Models\Module; use App\Models\Module;
@@ -76,8 +77,14 @@ abstract class OnePage implements TemplateHandler
$pagesRaw[$page->url] = $page; $pagesRaw[$page->url] = $page;
// save rendered pages // save rendered pages
try {
$pagesInTemplates[$page->url] = PageRenderer::render($page) $pagesInTemplates[$page->url] = PageRenderer::render($page)
->render(); ->render();
} catch (\Exception $e) {
if (Auth::user()) {
$pagesInTemplates[$page->url] = view(Template::name('errors.cannotRender'), ['page' => $page])->render();
}
}
} }
// return pages into template // return pages into template