mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-12-20 20:42:57 -05:00
UEPR-113 copy changes
This commit is contained in:
parent
9c944d3be3
commit
f2da89802b
6 changed files with 51 additions and 5 deletions
|
@ -75,6 +75,9 @@ class PhoneNumberStep extends React.Component {
|
||||||
this.props.intl.formatMessage({id: 'teacherRegistration.phoneConsent'})
|
this.props.intl.formatMessage({id: 'teacherRegistration.phoneConsent'})
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
<div className="info-box">
|
||||||
|
<intl.FormattedMessage id="teacherRegistration.phoneSecurityNotice" />
|
||||||
|
</div>
|
||||||
<NextStepButton
|
<NextStepButton
|
||||||
text={<intl.FormattedMessage id="registration.nextStep" />}
|
text={<intl.FormattedMessage id="registration.nextStep" />}
|
||||||
waiting={this.props.waiting}
|
waiting={this.props.waiting}
|
||||||
|
|
|
@ -1193,8 +1193,14 @@ class EmailStep extends React.Component {
|
||||||
<h2>
|
<h2>
|
||||||
<FormattedMessage id="teacherRegistration.emailStepTitle" />
|
<FormattedMessage id="teacherRegistration.emailStepTitle" />
|
||||||
</h2>
|
</h2>
|
||||||
|
<p className="description description-wide">
|
||||||
|
<FormattedMessage id="teacherRegistration.emailStepDescription1" />
|
||||||
|
</p>
|
||||||
|
<p className="description description-wide">
|
||||||
|
<FormattedMessage id="teacherRegistration.emailStepDescription2" />
|
||||||
|
</p>
|
||||||
<p className="description">
|
<p className="description">
|
||||||
<FormattedMessage id="teacherRegistration.emailStepDescription" />
|
<FormattedMessage id="teacherRegistration.reviewProcess" />
|
||||||
<Tooltip
|
<Tooltip
|
||||||
tipContent={
|
tipContent={
|
||||||
this.props.intl.formatMessage({id: 'registration.nameStepTooltip'})
|
this.props.intl.formatMessage({id: 'registration.nameStepTooltip'})
|
||||||
|
@ -1273,6 +1279,8 @@ const IntlEmailStep = injectIntl(EmailStep);
|
||||||
|
|
||||||
const EducatorResourcesLink = chunks => <a href="/educators#resources">{chunks}</a>;
|
const EducatorResourcesLink = chunks => <a href="/educators#resources">{chunks}</a>;
|
||||||
|
|
||||||
|
const BoldText = chunks => <strong>{chunks}</strong>;
|
||||||
|
const NewLine = () => <br />;
|
||||||
/*
|
/*
|
||||||
* TEACHER APPROVAL STEP
|
* TEACHER APPROVAL STEP
|
||||||
*/
|
*/
|
||||||
|
@ -1289,9 +1297,17 @@ const TeacherApprovalStep = props => (
|
||||||
<Card className="confirm">
|
<Card className="confirm">
|
||||||
<h4><FormattedMessage id="registration.confirmYourEmail" /></h4>
|
<h4><FormattedMessage id="registration.confirmYourEmail" /></h4>
|
||||||
<p>
|
<p>
|
||||||
<FormattedMessage id="registration.confirmYourEmailDescription" /><br />
|
<FormattedMessage
|
||||||
<strong>{props.email}</strong>
|
id="teacherRegistration.confirmYourEmailDescription"
|
||||||
|
values={{b: BoldText, br: NewLine}}
|
||||||
|
/>
|
||||||
</p>
|
</p>
|
||||||
|
<br />
|
||||||
|
<p>
|
||||||
|
<FormattedMessage
|
||||||
|
id="teacherRegistration.confirmationEmail"
|
||||||
|
/>
|
||||||
|
<strong>{props.email}</strong></p>
|
||||||
</Card>
|
</Card>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,6 +112,17 @@
|
||||||
margin-bottom: 1.25rem;
|
margin-bottom: 1.25rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.info-box{
|
||||||
|
display: block;
|
||||||
|
margin: 0 -4rem 0 -4rem;
|
||||||
|
background-color: #e0f4ff;
|
||||||
|
color: $ui-blue;
|
||||||
|
padding: 1rem;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.organization-step {
|
&.organization-step {
|
||||||
|
|
|
@ -15,6 +15,11 @@
|
||||||
margin-bottom: 2rem;
|
margin-bottom: 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
> .description-wide {
|
||||||
|
margin: 0 -8rem 0 -8rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
@ -30,3 +35,9 @@
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width : 941px) {
|
||||||
|
.slide .description-wide {
|
||||||
|
margin: 0 -2rem 2rem -2rem;
|
||||||
|
}
|
||||||
|
}
|
|
@ -8,6 +8,7 @@
|
||||||
"teacherRegistration.phoneStepDescription": "Your phone number will not be displayed publicly, and will be kept confidential and secure",
|
"teacherRegistration.phoneStepDescription": "Your phone number will not be displayed publicly, and will be kept confidential and secure",
|
||||||
"teacherRegistration.phoneConsent": "Yes, the Scratch Team may call me to verify my Teacher Account if needed",
|
"teacherRegistration.phoneConsent": "Yes, the Scratch Team may call me to verify my Teacher Account if needed",
|
||||||
"teacherRegistration.validationPhoneNumber": "Please enter a valid phone number",
|
"teacherRegistration.validationPhoneNumber": "Please enter a valid phone number",
|
||||||
|
"teacherRegistration.phoneSecurityNotice": "To secure your account, we will send you a one-time passcode to verify it’s really you. ",
|
||||||
"teacherRegistration.validationPhoneConsent": "You must consent to verification of your Teacher Account",
|
"teacherRegistration.validationPhoneConsent": "You must consent to verification of your Teacher Account",
|
||||||
"teacherRegistration.privacyDescription": "Your information will not be displayed publicly, and will be kept confidential and secure.",
|
"teacherRegistration.privacyDescription": "Your information will not be displayed publicly, and will be kept confidential and secure.",
|
||||||
"teacherRegistration.organization": "Organization",
|
"teacherRegistration.organization": "Organization",
|
||||||
|
@ -34,7 +35,11 @@
|
||||||
"teacherRegistration.useScratchMaxLength": "Description must be at most 300 characters",
|
"teacherRegistration.useScratchMaxLength": "Description must be at most 300 characters",
|
||||||
"teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?",
|
"teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?",
|
||||||
"teacherRegistration.emailStepTitle": "Email Address",
|
"teacherRegistration.emailStepTitle": "Email Address",
|
||||||
"teacherRegistration.emailStepDescription": "We will send you a confirmation email that will allow you to access your Scratch Teacher Account.",
|
"teacherRegistration.emailStepDescription1": "We will send you an email from no-reply@scratch.mit.edu to verify your email address.",
|
||||||
|
"teacherRegistration.emailStepDescription2": " Once you confirm your email, we will proceed with reviewing your request for a Teacher Account.",
|
||||||
|
"teacherRegistration.reviewProcess": "The review process may take up to 24 hours.",
|
||||||
|
"teacherRegistration.confirmYourEmailDescription": "Please check your inbox for a confirmation email from <br></br> <b>no-reply@scratch.mit.edu</b> to verify your email address. ",
|
||||||
|
"teacherRegistration.confirmationEmail": "Click the link in the confirmation email sent to:",
|
||||||
"teacherRegistration.validationEmailMatch": "The emails do not match",
|
"teacherRegistration.validationEmailMatch": "The emails do not match",
|
||||||
"teacherRegistration.validationAge": "Sorry, teachers must be at least 16 years old"
|
"teacherRegistration.validationAge": "Sorry, teachers must be at least 16 years old"
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,7 +106,7 @@ class TeacherRegistration extends React.Component {
|
||||||
<Steps.RegistrationError>
|
<Steps.RegistrationError>
|
||||||
{this.state.registrationError}
|
{this.state.registrationError}
|
||||||
</Steps.RegistrationError> :
|
</Steps.RegistrationError> :
|
||||||
<Progression step={this.state.step}>
|
<Progression step={3}>
|
||||||
<Steps.UsernameStep
|
<Steps.UsernameStep
|
||||||
waiting={this.state.waiting}
|
waiting={this.state.waiting}
|
||||||
onNextStep={this.handleAdvanceStep}
|
onNextStep={this.handleAdvanceStep}
|
||||||
|
|
Loading…
Reference in a new issue