Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
3b3e52f874
@ -151,10 +151,7 @@
|
||||
}
|
||||
|
||||
</style>
|
||||
<?php
|
||||
$isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team()) ? 'active show' : '';
|
||||
?>
|
||||
<div class="tab-pane fade <?= $isActive ?>" id="claims-dash-tab">
|
||||
<div class="tab-pane fade <?= $dash_claims_pane_active ?? '' ?>" id="claims-dash-tab">
|
||||
<div class="row">
|
||||
<div class="col inside-tab-content-div">
|
||||
<div class="claimTypeTile">
|
||||
|
||||
@ -193,7 +193,7 @@
|
||||
|
||||
</style>
|
||||
|
||||
<div class="tab-pane active show" id="pending-actions-dash-tab" >
|
||||
<div class="tab-pane fade <?= $dash_pending_pane_active ?? '' ?>" id="pending-actions-dash-tab" >
|
||||
|
||||
<div class="inside-tab-content-div">
|
||||
|
||||
|
||||
@ -41,11 +41,19 @@
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.error-illustration-frame {
|
||||
display: inline-block;
|
||||
max-width: 100%;
|
||||
line-height: 0;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.error-image {
|
||||
width: min(100%, 560px);
|
||||
height: auto;
|
||||
display: block;
|
||||
margin: 0 auto 10px auto;
|
||||
width: auto !important;
|
||||
height: auto !important;
|
||||
max-width: 100% !important;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.error-title {
|
||||
@ -98,7 +106,7 @@
|
||||
background-image: radial-gradient(circle at 0 0, rgba(87, 233, 255, 0.12) 0, rgba(87, 233, 255, 0.12) 120px, transparent 120px), radial-gradient(circle at 100% 100%, rgba(87, 233, 255, 0.12) 0, rgba(87, 233, 255, 0.12) 140px, transparent 140px);
|
||||
}
|
||||
|
||||
.error-image {
|
||||
.error-illustration-frame {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
@ -113,7 +121,13 @@
|
||||
|
||||
<body>
|
||||
<main class="error-wrapper">
|
||||
<img class="error-image" src="<?= base_url()."public"; ?>/assets/images/errors/404_illustration.jpg" alt="404 page not found illustration">
|
||||
<div class="error-illustration-frame">
|
||||
<img class="error-image"
|
||||
src="<?= base_url()."public"; ?>/assets/images/errors/404_illustration.png"
|
||||
decoding="async"
|
||||
fetchpriority="high"
|
||||
alt="404 page not found">
|
||||
</div>
|
||||
<h1 class="error-title">PAGE NOT FOUND</h1>
|
||||
<p class="error-subtitle">
|
||||
<?= isset($message) && !empty($message) ? $message : "Sorry, the page you're looking for doesn't exist or has been moved." ?>
|
||||
|
||||
@ -1,84 +1,23 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title><?= lang('Errors.pageNotFound') ?></title>
|
||||
<?php
|
||||
|
||||
<style>
|
||||
div.logo {
|
||||
height: 200px;
|
||||
width: 155px;
|
||||
display: inline-block;
|
||||
opacity: 0.08;
|
||||
position: absolute;
|
||||
top: 2rem;
|
||||
left: 50%;
|
||||
margin-left: -73px;
|
||||
}
|
||||
body {
|
||||
height: 100%;
|
||||
background: #fafafa;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
color: #777;
|
||||
font-weight: 300;
|
||||
}
|
||||
h1 {
|
||||
font-weight: lighter;
|
||||
letter-spacing: normal;
|
||||
font-size: 3rem;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
color: #222;
|
||||
}
|
||||
.wrap {
|
||||
max-width: 1024px;
|
||||
margin: 5rem auto;
|
||||
padding: 2rem;
|
||||
background: #fff;
|
||||
text-align: center;
|
||||
border: 1px solid #efefef;
|
||||
border-radius: 0.5rem;
|
||||
position: relative;
|
||||
}
|
||||
pre {
|
||||
white-space: normal;
|
||||
margin-top: 1.5rem;
|
||||
}
|
||||
code {
|
||||
background: #fafafa;
|
||||
border: 1px solid #efefef;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 5px;
|
||||
display: block;
|
||||
}
|
||||
p {
|
||||
margin-top: 1.5rem;
|
||||
}
|
||||
.footer {
|
||||
margin-top: 2rem;
|
||||
border-top: 1px solid #efefef;
|
||||
padding: 1em 2em 0 2em;
|
||||
font-size: 85%;
|
||||
color: #999;
|
||||
}
|
||||
a:active,
|
||||
a:link,
|
||||
a:visited {
|
||||
color: #dd4814;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="wrap">
|
||||
<h1>404</h1>
|
||||
declare(strict_types=1);
|
||||
|
||||
<p>
|
||||
<?php if (ENVIRONMENT !== 'production') : ?>
|
||||
<?= nl2br(esc($message)) ?>
|
||||
<?php else : ?>
|
||||
<?= lang('Errors.sorryCannotFind') ?>
|
||||
<?php endif; ?>
|
||||
</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
/**
|
||||
* CodeIgniter resolves PageNotFoundException to this file (see ExceptionHandler::determineView).
|
||||
* Delegate to the NHance branded page at Views/errors/404.php.
|
||||
*/
|
||||
|
||||
$page_name = $page_name ?? 'NHance';
|
||||
|
||||
if (ENVIRONMENT === 'production') {
|
||||
$displayMessage = lang('Errors.sorryCannotFind');
|
||||
if ($displayMessage === '') {
|
||||
$displayMessage = "Sorry, the page you're looking for doesn't exist or has been moved.";
|
||||
}
|
||||
} else {
|
||||
$displayMessage = nl2br(esc($message ?? ''));
|
||||
}
|
||||
|
||||
$message = $displayMessage;
|
||||
|
||||
include dirname(__DIR__) . DIRECTORY_SEPARATOR . '404.php';
|
||||
|
||||
@ -156,10 +156,7 @@
|
||||
|
||||
|
||||
</style>
|
||||
<?php
|
||||
$isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_team()) ? 'show active' : '';
|
||||
?>
|
||||
<div class="tab-pane fade <?= $isActive ?>" id="leads-dash-tab">
|
||||
<div class="tab-pane fade <?= $dash_leads_pane_active ?? '' ?>" id="leads-dash-tab">
|
||||
<div class="row">
|
||||
<div class="col inside-tab-content-div">
|
||||
<div class="leadTypeTile">
|
||||
|
||||
BIN
public/assets/images/errors/404_illustration.png
Normal file
BIN
public/assets/images/errors/404_illustration.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 100 KiB |
BIN
public/assets/images/errors/404_illustration_old.jpg
Normal file
BIN
public/assets/images/errors/404_illustration_old.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Loading…
Reference in New Issue
Block a user