Merge pull request #8626 from kenjis/refactor-error_exception.php

refactor: move footer info to top in error_exception.php
codeigniter4 · Mar 15, 2024 · c190334 · c190334
2 parents bbb9542 + d894567
commit c190334
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
@@ -19,7 +19,6 @@ body {
 }
 h1 {
     font-weight: lighter;
-    letter-spacing: 0.8;
     font-size: 3rem;
     color: var(--dark-text-color);
     margin: 0;
@@ -44,7 +43,7 @@ p.lead {
     color: var(--dark-text-color);
 }
 .header .container {
-    padding: 1rem 1.75rem 1.75rem 1.75rem;
+    padding: 1rem;
 }
 .header h1 {
     font-size: 2.5rem;
@@ -65,14 +64,11 @@ p.lead {
     display: inline;
 }
 
-.footer {
+.environment {
     background: var(--dark-bg-color);
     color: var(--light-text-color);
-}
-.footer .container {
-    border-top: 1px solid #e7e7e7;
-    margin-top: 1rem;
     text-align: center;
+    padding: 0.2rem;
 }
 
 .source {
@@ -112,7 +108,7 @@ p.lead {
 }
 .tabs a:link,
 .tabs a:visited {
-    padding: 0rem 1rem;
+    padding: 0 1rem;
     line-height: 2.7;
     text-decoration: none;
     color: var(--dark-text-color);
@@ -152,9 +148,6 @@ p.lead {
     border-radius: 5px;
     color: #31708f;
 }
-ul, ol {
-    line-height: 1.8;
-}
 
 table {
     width: 100%;

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
@@ -23,6 +23,12 @@
 
     <!-- Header -->
     <div class="header">
+        <div class="environment">
+            Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
+            PHP: <?= esc(PHP_VERSION) ?>  &mdash;
+            CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
+            Environment: <?= ENVIRONMENT ?>
+        </div>
         <div class="container">
             <h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
             <p>
@@ -401,18 +407,5 @@
     </div> <!-- /container -->
     <?php endif; ?>
 
-    <div class="footer">
-        <div class="container">
-
-            <p>
-                Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
-                PHP: <?= esc(PHP_VERSION) ?>  &mdash;
-                CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
-                Environment: <?= ENVIRONMENT ?>
-            </p>
-
-        </div>
-    </div>
-
 </body>
 </html>
diff --git a/user_guide_src/source/installation/upgrade_447.rst b/user_guide_src/source/installation/upgrade_447.rst
@@ -16,6 +16,14 @@ Please refer to the upgrade instructions corresponding to your installation meth
 Mandatory File Changes
 **********************
 
+Error Files
+===========
+
+The error page has been updated. Please update the following files:
+
+- app/Views/errors/html/debug.css
+- app/Views/errors/html/error_exception.php
+
 ****************
 Breaking Changes
 ****************