diff --git a/cache/timer.yaml b/cache/timer.yaml index 12ddd8b..2b37e44 100644 --- a/cache/timer.yaml +++ b/cache/timer.yaml @@ -1 +1 @@ -licenseupdate: 1739702338 +licenseupdate: 1739705963 diff --git a/system/typemill/Controllers/ControllerWebFrontend.php b/system/typemill/Controllers/ControllerWebFrontend.php index 17549d6..aaa7e08 100644 --- a/system/typemill/Controllers/ControllerWebFrontend.php +++ b/system/typemill/Controllers/ControllerWebFrontend.php @@ -42,6 +42,16 @@ class ControllerWebFrontend extends Controller } $fullUrl = $urlinfo['baseurl'] . $url; + $pagedata = [ + 'home' => $home, + 'title' => 'Page not found', + 'description' => 'Sorry, but we did not find the page you where looking for.', + 'settings' => $this->settings, + 'base_url' => $urlinfo['baseurl'], + 'logo' => false, + 'favicon' => false, + ]; + # FIND THE PAGE/ITEM IN NAVIGATION if($url == '/') @@ -56,10 +66,7 @@ class ControllerWebFrontend extends Controller if(!$pageinfo) { - return $this->c->get('view')->render($response->withStatus(404), '404.twig', [ - 'title' => 'Page not found', - 'description' => 'We did not find the page you where looking for.' - ]); + return $this->c->get('view')->render($response->withStatus(404), '404.twig', $pagedata); } $keyPathArray = explode(".", $pageinfo['keyPath']); @@ -68,10 +75,7 @@ class ControllerWebFrontend extends Controller if(!$item) { - return $this->c->get('view')->render($response->withStatus(404), '404.twig', [ - 'title' => 'Page not found', - 'description' => 'We did not find the page you where looking for.' - ]); + return $this->c->get('view')->render($response->withStatus(404), '404.twig', $pagedata); } } @@ -86,10 +90,7 @@ class ControllerWebFrontend extends Controller { if($page->status == 'unpublished') { - return $this->c->get('view')->render($response->withStatus(404), '404.twig', [ - 'title' => 'Page not found', - 'description' => 'We did not find the page you where looking for.' - ]); + return $this->c->get('view')->render($response->withStatus(404), '404.twig', $pagedata); } } } @@ -159,10 +160,7 @@ class ControllerWebFrontend extends Controller $refpageinfo = $navigation->getPageInfoForUrl($metadata['meta']['reference'], $urlinfo, $langattr); if(!$refpageinfo) { - return $this->c->get('view')->render($response->withStatus(404), '404.twig', [ - 'title' => 'Referenced page not found', - 'description' => 'We did not find the page that has been referenced. Please inform the website owner to fix it in meta reference.' - ]); + return $this->c->get('view')->render($response->withStatus(404), '404.twig', $pagedata); } $refKeyPathArray = explode(".", $refpageinfo['keyPath']); diff --git a/system/typemill/system.php b/system/typemill/system.php index 182be3b..fda3e99 100644 --- a/system/typemill/system.php +++ b/system/typemill/system.php @@ -392,11 +392,11 @@ $errorMiddleware = new ErrorMiddleware( ); # Set the Not Found Handler -$errorMiddleware->setErrorHandler(HttpNotFoundException::class, function ($request, $exception) use ($container) { - - $response = new NewResponse(); +$errorMiddleware->setErrorHandler(HttpNotFoundException::class, function ($request, $exception) use ($container) { - return $container->get('view')->render($response->withStatus(404), '404.twig'); + $response = new NewResponse(); + + return $container->get('view')->render($response->withStatus(404), '404.twig', $pagedata); }); diff --git a/themes/cyanine/404.twig b/themes/cyanine/404.twig index eaa2431..d486305 100644 --- a/themes/cyanine/404.twig +++ b/themes/cyanine/404.twig @@ -4,21 +4,32 @@ {% block content %} -
+
-
-
-

Not Found

-
+
+ +
+ +
+ +
+

{{title}}

+
+ +
+ +

{{description}}

+ + Return to the homepage + +
+ +
-
-

Sorry, but we did not find the page that you are looking for.

- Home - -
+
- + {% endblock %} \ No newline at end of file diff --git a/themes/cyanine/layout.twig b/themes/cyanine/layout.twig index 669c621..c85bc32 100644 --- a/themes/cyanine/layout.twig +++ b/themes/cyanine/layout.twig @@ -214,9 +214,6 @@ {% block javascripts %} {{ assets.renderCSS() }} - - - {% if settings.themes.cyanine.collapseNav %}