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.

Sign up for GitHub

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

Update onboarding pages layout #2083

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Update onboarding pages layout #2083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae9c61f
feat: update layout for forlorn pages
luistoptal Nov 6, 2024
88f41fd
chore: up logs
luistoptal Nov 6, 2024
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Unreleased

- Feat #1892: Update onboarding pages layout
- Fix #2042: Batch deletion of file attributes and samples

## v4.3.9 - 2024-10-28 - 961f7821a -
Expand Down
35 changes: 26 additions & 9 deletions protected/views/user/confirm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
<? if ($user->is_activated) { ?>
<h3>Your account has been activated</h3>
<div class="container">
<? if ($user->is_activated) {
$this->widget('TitleBreadcrumb', [
'pageTitle' => 'Account activated',
'breadcrumbItems' => [
['label' => 'Home', 'href' => '/'],
['isActive' => true, 'label' => 'Account activated'],
]
]);

<p><?= CHtml::link("Log in", array('site/login')) ?> to configure your account.</p>
<? } else { ?>
<h3>Account Pending</h3>

You are now registered. We will contact you shortly. Feel free to
or <?= CHtml::link("contact us", "mailto:" . Yii::app()->params['support_email']) ?>&nbsp;
if you prefer.</p>
<? } ?>
?>
<p>Your account has been activated. <?= CHtml::link("Log in", array('site/login')) ?> to configure your account.</p>
<? } else {
$this->widget('TitleBreadcrumb', [
'pageTitle' => 'Account Pending',
'breadcrumbItems' => [
['label' => 'Home', 'href' => '/'],
['isActive' => true, 'label' => 'Account Pending'],
]
]);


?>
<p>You are now registered. We will contact you shortly. Feel free to
or <?= CHtml::link("contact us", "mailto:" . Yii::app()->params['support_email']) ?>&nbsp;if you prefer.</p>
<? } ?>

</div>
21 changes: 16 additions & 5 deletions protected/views/user/welcome.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
<? $this->pageTitle = Yii::app()->name . ' - Welcome' ?>

<h2><?=Yii::t('app' , 'Welcome!')?></h2>
<div class="clear"></div>
<p><?=Yii::t('app' , 'Thank you for registering with GigaDB. An account activation email will be sent to your email address shortly. To complete your account\'s activation, please click on the activation link in the account activation email.')?><br/>
<?= Yii::t('app' , 'If you don\'t receive the email within a few minutes, please check your spam filters, or')?> <?= CHtml::link(Yii::t('app' ,"resend the email"), array("user/sendActivationEmail", 'id'=>$user->id)) ?>.</p>

<div class="container">
<?php
$this->widget('TitleBreadcrumb', [
'pageTitle' => Yii::t('app', 'Welcome!'),
'breadcrumbItems' => [
['label' => 'Home', 'href' => '/'],
['isActive' => true, 'label' => 'Welcome'],
]
]);
?>
<p>
<?= Yii::t('app', 'Thank you for registering with GigaDB. An account activation email will be sent to your email address shortly. To complete your account\'s activation, please click on the activation link in the account activation email.') ?><br />
<?= Yii::t('app', 'If you don\'t receive the email within a few minutes, please check your spam filters, or') ?>
<?= CHtml::link(Yii::t('app', "resend the email"), array("user/sendActivationEmail", 'id' => $user->id)) ?>.
</p>
</div>