github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-02 14:58:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Flarum\Frontend: Fix view paths after renaming namespace

Browse Source
This commit is contained in:
Franz Liedke 2017-06-24 12:16:00 +02:00
parent ea484732ed
commit a12686ac80
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Frontend/AbstractFrontend.php
View File

@ -86,7 +86,7 @@ abstract class AbstractFrontend
*/ */
protected function getLayout() protected function getLayout()
{ {
return __DIR__.'/../../../views/'.$this->getName().'.blade.php'; return __DIR__.'/../../views/'.$this->getName().'.blade.php';
} }
/** /**
@ -104,7 +104,7 @@ abstract class AbstractFrontend
*/ */
private function addDefaultAssets(FrontendView $view) private function addDefaultAssets(FrontendView $view)
{ {
$root = __DIR__.'/../../..'; $root = __DIR__.'/../..';
$name = $this->getName(); $name = $this->getName();
$view->getJs()->addFile("$root/js/$name/dist/app.js"); $view->getJs()->addFile("$root/js/$name/dist/app.js");

4
framework/core/src/Frontend/FrontendView.php
View File

@ -287,7 +287,7 @@ class FrontendView
$this->view->share('forum', array_get($forum, 'data')); $this->view->share('forum', array_get($forum, 'data'));
$this->view->share('debug', $this->app->inDebugMode()); $this->view->share('debug', $this->app->inDebugMode());
$view = $this->view->file(__DIR__.'/../../../views/app.blade.php'); $view = $this->view->file(__DIR__.'/../../views/app.blade.php');
$view->title = $this->buildTitle(array_get($forum, 'data.attributes.title')); $view->title = $this->buildTitle(array_get($forum, 'data.attributes.title'));
$view->description = $this->description ?: array_get($forum, 'data.attributes.description'); $view->description = $this->description ?: array_get($forum, 'data.attributes.description');
@ -345,7 +345,7 @@ class FrontendView
protected function buildContent() protected function buildContent()
{ {
$view = $this->view->file(__DIR__.'/../../../views/content.blade.php'); $view = $this->view->file(__DIR__.'/../../views/content.blade.php');
$view->content = $this->content; $view->content = $this->content;