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

Provide "Do not close your browser" message on enrollment flow redirect page (CO-2844) #667

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions app/Lib/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -2312,6 +2312,7 @@
'op.clear.filters.alpha' => 'Clear alphabet filter',
'op.clear.filters.pl' => 'Clear Filters',
'op.clear.search' => 'Clear search',
'op.close.browser' => 'Please do not close your browser.',
'op.cluster.acct.auto' => 'Autogenerate Cluster Accounts',
'op.cluster.acct.auto.confirm' => 'Are you sure you wish to autogenerate cluster accounts?',
'op.collapse' => 'Collapse this section',
Expand Down
6 changes: 6 additions & 0 deletions app/View/Layouts/redirect.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,12 @@

<div id="content">
<div id="content-inner">
<div class="co-info-topbox co-redirect-warning">
<em class="material-icons">warning</em>
<div class="co-info-topbox-text">
<?php print _txt('op.close.browser'); ?>
</div>
</div>
<div id="redirect-box">
<?php print $this->fetch('content'); ?>
</div>
Expand Down
16 changes: 13 additions & 3 deletions app/webroot/css/co-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -845,15 +845,25 @@ body.co_people.canvas .titleNavContainer {
#redirect-box {
background-color: #f5f5f5;
border: 1px solid #ddd;
margin: 1em auto;
padding: 1em;
margin: 0 auto 2em;
padding: 1.5em 1em 1.25em;
text-align: center;
width: 240px;
min-width: 240px;
}
#redirect-spinner {
padding: 1em 1em 2em;
position: relative;
}
.co-redirect-warning {
justify-content: center;
margin: 2em auto 0;
min-width: 240px;
border: 1px solid var(--cmg-color-lightgray-006);
border-bottom: none;
}
.co-redirect-warning .material-icons {
color: var(--cmg-color-red-002) !important;
}
/* SELECT CO */
#fpCoList .co-row {
cursor: pointer;
Expand Down
13 changes: 10 additions & 3 deletions app/webroot/css/co-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -386,13 +386,20 @@
}
/* REDIRECT PAGE */
#redirect-box {
margin: 4em auto;
padding: 2em 2em 1.5em;
width: 320px;
margin: 0 auto 4em;
padding: 2em 2em 1.75em;
min-width: 320px;
max-width: 380px;
}
body.ui-mode-basic #redirect-box {
left: unset;
}
.co-redirect-warning {
min-width: 320px;
max-width: 380px;
margin: 4em auto 0;
font-size: 1.1em;
}
/********************************/
/* My Population - People Index */
/********************************/
Expand Down