Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: move footer info to top in error_exception.php #8626

Merged
merged 7 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions app/Views/errors/html/debug.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ body {
}
h1 {
font-weight: lighter;
letter-spacing: 0.8;
font-size: 3rem;
color: var(--dark-text-color);
margin: 0;
Expand All @@ -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;
Expand All @@ -65,14 +64,11 @@ p.lead {
display: inline;
}

.footer {
.environment {
background: var(--dark-bg-color);
color: var(--light-text-color);
MGatner marked this conversation as resolved.
Show resolved Hide resolved
}
.footer .container {
border-top: 1px solid #e7e7e7;
margin-top: 1rem;
text-align: center;
padding: 0.2rem;
}

.source {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -152,9 +148,6 @@ p.lead {
border-radius: 5px;
color: #31708f;
}
ul, ol {
line-height: 1.8;
}

table {
width: 100%;
Expand Down
19 changes: 6 additions & 13 deletions app/Views/errors/html/error_exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
8 changes: 8 additions & 0 deletions user_guide_src/source/installation/upgrade_447.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
****************
Expand Down
Loading