Merge pull request #2829 from WPO-Foundation/404

Blade 404, fix white-on-white header text
catchpoint · Apr 18, 2023 · 46f46ee · 46f46ee
2 parents 163af46 + 5a42558
commit 46f46ee
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/www/404.php b/www/404.php
@@ -3,31 +3,12 @@
 // Copyright 2020 Catchpoint Systems Inc.
 // Use of this source code is governed by the Polyform Shield 1.0.0 license that can be
 // found in the LICENSE.md file.
-include 'common.inc';
+
 $page_keywords = array('Missing');
 $page_description = "Page Not Found.";
-?>
-<!DOCTYPE html>
-<html lang="en-us">
-    <head>
-        <title>WebPageTest - Page Not Found</title>
-        <meta http-equiv="charset" content="iso-8859-1">
-
-        <?php include('head.inc'); ?>
-    </head>
-    <body class="not-found">
-            <?php
-            $tab = '404';
-            include 'header.inc';
-            ?>
-            <div class="about">
-            <h1>Page Not Found</h1>
-            <div class="box">
-                <p><strong>Sorry!</strong> That page doesn't appear to exist. If you think you have the right link, perhaps try logging in to see if anything changes.</p>
 
-            </div>
-            </div>
-            <?php include('footer.inc'); ?>
-        </div>
-    </body>
-</html>
+require_once __DIR__ . '/common.inc';
+echo view('pages.404', [
+    'page_title' => 'WebPageTest - Page Not Found',
+    'body_class' => 'four-oh-four',
+]);
diff --git a/www/assets/css/wpt-header.css b/www/assets/css/wpt-header.css
@@ -19,6 +19,7 @@ wpt-header * {
 .account-layout wpt-header,
 body.history wpt-header,
 body.about wpt-header,
+body.four-oh-four wpt-header,
 body.common wpt-header,
 body.video wpt-header,
 body.compare:not(.compare-experiment) wpt-header,

diff --git a/www/resources/views/pages/404.blade.php b/www/resources/views/pages/404.blade.php
@@ -0,0 +1,17 @@
+@extends('default')
+
+@section('content')
+
+<div class="about">
+    <h1>Page Not Found</h1>
+    <div class="box">
+        <p>
+            <strong>Sorry!</strong>
+            That page doesn't appear to exist. If you think you have the right link,
+            perhaps try logging in to see if anything changes.
+        </p>
+
+    </div>
+</div>
+
+@endsection