From f2da89802b6c577076dcf30b3411d6c45a94d9bd Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Fri, 6 Dec 2024 15:30:20 +0200 Subject: [PATCH 1/7] UEPR-113 copy changes --- .../registration/phone-number-step.jsx | 3 +++ src/components/registration/steps.jsx | 22 ++++++++++++++++--- src/components/registration/steps.scss | 11 ++++++++++ src/components/slide/slide.scss | 11 ++++++++++ src/views/teacherregistration/l10n.json | 7 +++++- .../teacherregistration.jsx | 2 +- 6 files changed, 51 insertions(+), 5 deletions(-) diff --git a/src/components/registration/phone-number-step.jsx b/src/components/registration/phone-number-step.jsx index 7390a21aa..03bd5ea6b 100644 --- a/src/components/registration/phone-number-step.jsx +++ b/src/components/registration/phone-number-step.jsx @@ -75,6 +75,9 @@ class PhoneNumberStep extends React.Component { this.props.intl.formatMessage({id: 'teacherRegistration.phoneConsent'}) } /> +
+ +
} waiting={this.props.waiting} diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index 055e6c394..01a4b23ba 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -1193,8 +1193,14 @@ class EmailStep extends React.Component {

+

+ +

+

+ +

- + {chunks}; +const BoldText = chunks => {chunks}; +const NewLine = () =>
; /* * TEACHER APPROVAL STEP */ @@ -1289,9 +1297,17 @@ const TeacherApprovalStep = props => (

-
- {props.email} +

+
+

+ + {props.email}

) } diff --git a/src/components/registration/steps.scss b/src/components/registration/steps.scss index 1dd988309..adde70a34 100644 --- a/src/components/registration/steps.scss +++ b/src/components/registration/steps.scss @@ -112,6 +112,17 @@ 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 { diff --git a/src/components/slide/slide.scss b/src/components/slide/slide.scss index 45928df61..f0c267416 100644 --- a/src/components/slide/slide.scss +++ b/src/components/slide/slide.scss @@ -15,6 +15,11 @@ margin-bottom: 2rem; } + > .description-wide { + margin: 0 -8rem 0 -8rem; + } + + .card { margin: 0 auto; } @@ -30,3 +35,9 @@ padding: 0; } } + +@media only screen and (max-width : 941px) { + .slide .description-wide { + margin: 0 -2rem 2rem -2rem; + } +} \ No newline at end of file diff --git a/src/views/teacherregistration/l10n.json b/src/views/teacherregistration/l10n.json index 4079b2e44..b034340c5 100644 --- a/src/views/teacherregistration/l10n.json +++ b/src/views/teacherregistration/l10n.json @@ -8,6 +8,7 @@ "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.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.privacyDescription": "Your information will not be displayed publicly, and will be kept confidential and secure.", "teacherRegistration.organization": "Organization", @@ -34,7 +35,11 @@ "teacherRegistration.useScratchMaxLength": "Description must be at most 300 characters", "teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?", "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

no-reply@scratch.mit.edu to verify your email address. ", + "teacherRegistration.confirmationEmail": "Click the link in the confirmation email sent to:", "teacherRegistration.validationEmailMatch": "The emails do not match", "teacherRegistration.validationAge": "Sorry, teachers must be at least 16 years old" } diff --git a/src/views/teacherregistration/teacherregistration.jsx b/src/views/teacherregistration/teacherregistration.jsx index 285aa673b..0da3e8e8b 100644 --- a/src/views/teacherregistration/teacherregistration.jsx +++ b/src/views/teacherregistration/teacherregistration.jsx @@ -106,7 +106,7 @@ class TeacherRegistration extends React.Component { {this.state.registrationError} : - + Date: Fri, 6 Dec 2024 15:38:22 +0200 Subject: [PATCH 2/7] UEPR-113 small text adjustment --- src/views/teacherregistration/l10n.json | 2 +- src/views/teacherregistration/teacherregistration.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/teacherregistration/l10n.json b/src/views/teacherregistration/l10n.json index b034340c5..66e309f48 100644 --- a/src/views/teacherregistration/l10n.json +++ b/src/views/teacherregistration/l10n.json @@ -39,7 +39,7 @@ "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

no-reply@scratch.mit.edu to verify your email address. ", - "teacherRegistration.confirmationEmail": "Click the link in the confirmation email sent to:", + "teacherRegistration.confirmationEmail": "Click the link in the confirmation email sent to: ", "teacherRegistration.validationEmailMatch": "The emails do not match", "teacherRegistration.validationAge": "Sorry, teachers must be at least 16 years old" } diff --git a/src/views/teacherregistration/teacherregistration.jsx b/src/views/teacherregistration/teacherregistration.jsx index 0da3e8e8b..285aa673b 100644 --- a/src/views/teacherregistration/teacherregistration.jsx +++ b/src/views/teacherregistration/teacherregistration.jsx @@ -106,7 +106,7 @@ class TeacherRegistration extends React.Component { {this.state.registrationError} : - + Date: Fri, 6 Dec 2024 15:42:28 +0200 Subject: [PATCH 3/7] UEPR-113 changed color --- src/components/registration/steps.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/registration/steps.scss b/src/components/registration/steps.scss index adde70a34..c4ab2d8a5 100644 --- a/src/components/registration/steps.scss +++ b/src/components/registration/steps.scss @@ -116,7 +116,7 @@ .info-box{ display: block; margin: 0 -4rem 0 -4rem; - background-color: #e0f4ff; + background-color: rgba($ui-blue, 0.15); color: $ui-blue; padding: 1rem; text-align: center; From a670631795ecaf93acd97bb677aabb72c2d30a8b Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Tue, 10 Dec 2024 09:25:16 +0200 Subject: [PATCH 4/7] Changed copy, waiting --- src/components/registration/steps.jsx | 5 ++++- src/l10n.json | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index 01a4b23ba..50c957170 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -1315,7 +1315,10 @@ const TeacherApprovalStep = props => (

- +

: [] } diff --git a/src/l10n.json b/src/l10n.json index caf294525..7d645b8a6 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -235,7 +235,7 @@ "registration.showPassword": "Show password", "registration.troubleReload": "Scratch is having trouble finishing registration. Try reloading the page or try again in another browser.", "registration.tryAgainInstruction": "Click \"Try again\".", - "registration.usernameStepDescription": "Fill in the following forms to request an account. The approval process may take up to one day.", + "registration.usernameStepDescription": "Fill in the following forms to request an account. You will need to confirm you email. The approval process may take up to one day.", "registration.usernameStepDescriptionNonEducator": "Create projects, share ideas, make friends. It’s free!", "registration.usernameStepRealName": "Please do not use any portion of your real name in your username.", "registration.usernameAdviceShort": "Don't use your real name", @@ -261,7 +261,7 @@ "registration.validationUsernameSpaces": "Usernames can't have spaces", "registration.validationEmailInvalid": "Email doesn’t look right. Try another?", "registration.waitForApproval": "Wait for Approval", - "registration.waitForApprovalDescription": "You can log into your Scratch Account now, but the features specific to Teachers are not yet available. Your information is being reviewed. Please be patient, the approval process can take up to one day. You will receive an email indicating your account has been upgraded once your account has been approved.", + "registration.waitForApprovalDescription": "You can log into your Scratch Account now, but the features specific to Teachers are not yet available. Your information is being reviewed. Please be patient, the approval process can take up to one day. You will receive an email indicating your account has been upgraded once your account has been approved. If you have not received a confirmation email within 24 hours, please reach out to the Scratch Team at https://scratch.mit.edu/contact-us/.", "registration.welcomeStepDescription": "You have successfully set up a Scratch account! You are now a member of the class:", "registration.welcomeStepDescriptionNonEducator": "You’re now logged in! You can start exploring and creating projects.", "registration.welcomeStepInstructions": "Want to share and comment? Click the link on the email we sent to {email}.", From ff3da84419025ab56ae9f67b26daf9bbe5decfcf Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Mon, 16 Dec 2024 14:22:57 +0200 Subject: [PATCH 5/7] uepr-113-new-copy-changes --- src/components/registration/steps.jsx | 35 ++++++++++++++++++++----- src/components/registration/steps.scss | 15 +++++++++++ src/views/teacherregistration/l10n.json | 11 +++++--- 3 files changed, 50 insertions(+), 11 deletions(-) diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index 50c957170..463cb9c21 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -176,14 +176,15 @@ class UsernameStep extends React.Component { )} -

+

{this.props.description ? ( this.props.description ) : ( -   + +
- + )} @@ -1131,6 +1132,12 @@ const IntlUseScratchStep = injectIntl(UseScratchStep); /* * EMAIL STEP */ + +const Email = chunks => ({chunks}); + class EmailStep extends React.Component { constructor (props) { super(props); @@ -1194,7 +1201,10 @@ class EmailStep extends React.Component {

- +

@@ -1279,7 +1289,11 @@ const IntlEmailStep = injectIntl(EmailStep); const EducatorResourcesLink = chunks => {chunks}; -const BoldText = chunks => {chunks}; +const BoldEmail = chunks => ({chunks}); +const Link = chunks => {chunks}; const NewLine = () =>
; /* * TEACHER APPROVAL STEP @@ -1299,7 +1313,14 @@ const TeacherApprovalStep = props => (

+

+
+

+


@@ -1317,7 +1338,7 @@ const TeacherApprovalStep = props => (

: [] diff --git a/src/components/registration/steps.scss b/src/components/registration/steps.scss index c4ab2d8a5..73e4537ef 100644 --- a/src/components/registration/steps.scss +++ b/src/components/registration/steps.scss @@ -44,6 +44,21 @@ color: $ui-dark-gray; } + .wide-description { + margin: 0 -3.2rem 2rem -3.2rem; + } + + .underline-link { + text-decoration: underline; + color: $ui-white; + font-weight: inherit; + } + + .bold-link { + font-weight: bold; + color: $type-gray; + } + &.class-invite-step { text-align: center; diff --git a/src/views/teacherregistration/l10n.json b/src/views/teacherregistration/l10n.json index 66e309f48..3c2156809 100644 --- a/src/views/teacherregistration/l10n.json +++ b/src/views/teacherregistration/l10n.json @@ -1,11 +1,13 @@ { + "teacherRegistration.requestTeacherAccountInstructions": "Fill in the following forms to request an account. You will need to confirm your email address before your account is approved. The approval process may take up to one day after you have confirmed your email address.", + "teacherRegistration.usernameStepRealName": "Please do not use any portion of your real name in your usernames. Usernames containing names are subject to immediate deletion.", "teacherRegistration.nameStepTitle": "First & Last Name", "teacherRegistration.nameStepTitleNew": "First & Last Name", "teacherRegistration.nameStepDescription": "Your name will not be displayed publicly, and will be kept confidential and secure.", "teacherRegistration.firstName": "First Name", "teacherRegistration.lastName": "Last Name", - "teacherRegistration.phoneNumber": "Phone Number", - "teacherRegistration.phoneStepDescription": "Your phone number will not be displayed publicly, and will be kept confidential and secure", + "teacherRegistration.phoneNumber": "Mobile Number", + "teacherRegistration.phoneStepDescription": "Your mobile 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.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. ", @@ -35,10 +37,11 @@ "teacherRegistration.useScratchMaxLength": "Description must be at most 300 characters", "teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?", "teacherRegistration.emailStepTitle": "Email Address", - "teacherRegistration.emailStepDescription1": "We will send you an email from no-reply@scratch.mit.edu to verify your email address.", + "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

no-reply@scratch.mit.edu to verify your email address. ", + "teacherRegistration.confirmYourEmailDescription": "Please check your inbox for a confirmation email from

no-reply@scratch.mit.edu to verify your email address before your account can be approved.", + "teacherRegistration.confirmYourEmailFirewall": "Many schools use email firewalls. To prevent delays in approving your account, please ask your school's IT department to whitelist no-reply@scratch.mit.edu. This will ensure that you can get automated emails from Scratch in the future, which you'll need for things like changing your or your students' passwords.", "teacherRegistration.confirmationEmail": "Click the link in the confirmation email sent to: ", "teacherRegistration.validationEmailMatch": "The emails do not match", "teacherRegistration.validationAge": "Sorry, teachers must be at least 16 years old" From 634c3b4b325cedb05a71e1abf2ce4f7cf168977c Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Wed, 18 Dec 2024 13:15:18 +0200 Subject: [PATCH 6/7] UEPR 113 PR changes --- src/components/registration/steps.jsx | 6 +++--- src/components/registration/steps.scss | 7 +++++-- src/components/slide/slide.scss | 5 ----- src/views/teacherregistration/l10n.json | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index 463cb9c21..951e40209 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -176,7 +176,7 @@ class UsernameStep extends React.Component { )} -

+

{this.props.description ? ( this.props.description ) : ( @@ -1200,13 +1200,13 @@ class EmailStep extends React.Component {

-

+

-

+

diff --git a/src/components/registration/steps.scss b/src/components/registration/steps.scss index 73e4537ef..31f816a21 100644 --- a/src/components/registration/steps.scss +++ b/src/components/registration/steps.scss @@ -44,8 +44,8 @@ color: $ui-dark-gray; } - .wide-description { - margin: 0 -3.2rem 2rem -3.2rem; + .description.wide { + margin: 0 -8rem 0 -8rem; } .underline-link { @@ -88,6 +88,9 @@ top:auto; left:auto; } + > .description.wide { + margin: 0 -3.2rem 2rem -3.2rem; + } } &.demographics-step { diff --git a/src/components/slide/slide.scss b/src/components/slide/slide.scss index f0c267416..54dccab9f 100644 --- a/src/components/slide/slide.scss +++ b/src/components/slide/slide.scss @@ -15,11 +15,6 @@ margin-bottom: 2rem; } - > .description-wide { - margin: 0 -8rem 0 -8rem; - } - - .card { margin: 0 auto; } diff --git a/src/views/teacherregistration/l10n.json b/src/views/teacherregistration/l10n.json index 3c2156809..a88fa8536 100644 --- a/src/views/teacherregistration/l10n.json +++ b/src/views/teacherregistration/l10n.json @@ -38,7 +38,7 @@ "teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?", "teacherRegistration.emailStepTitle": "Email Address", "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.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

no-reply@scratch.mit.edu to verify your email address before your account can be approved.", "teacherRegistration.confirmYourEmailFirewall": "Many schools use email firewalls. To prevent delays in approving your account, please ask your school's IT department to whitelist no-reply@scratch.mit.edu. This will ensure that you can get automated emails from Scratch in the future, which you'll need for things like changing your or your students' passwords.", From 476f2d358463529b868181d8504903c2ea6e5fdd Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Wed, 18 Dec 2024 13:37:31 +0200 Subject: [PATCH 7/7] UEPR 113 Removed new line --- src/components/registration/steps.jsx | 5 ++--- src/views/teacherregistration/l10n.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx index 951e40209..9bafc119d 100644 --- a/src/components/registration/steps.jsx +++ b/src/components/registration/steps.jsx @@ -1294,7 +1294,6 @@ const BoldEmail = chunks => ({chunks}); const Link = chunks => {chunks}; -const NewLine = () =>
; /* * TEACHER APPROVAL STEP */ @@ -1313,14 +1312,14 @@ const TeacherApprovalStep = props => (



diff --git a/src/views/teacherregistration/l10n.json b/src/views/teacherregistration/l10n.json index a88fa8536..9c3f2cee2 100644 --- a/src/views/teacherregistration/l10n.json +++ b/src/views/teacherregistration/l10n.json @@ -40,7 +40,7 @@ "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

no-reply@scratch.mit.edu to verify your email address before your account can be approved.", + "teacherRegistration.confirmYourEmailDescription": "Please check your inbox for a confirmation email from no-reply@scratch.mit.edu to verify your email address before your account can be approved.", "teacherRegistration.confirmYourEmailFirewall": "Many schools use email firewalls. To prevent delays in approving your account, please ask your school's IT department to whitelist no-reply@scratch.mit.edu. This will ensure that you can get automated emails from Scratch in the future, which you'll need for things like changing your or your students' passwords.", "teacherRegistration.confirmationEmail": "Click the link in the confirmation email sent to: ", "teacherRegistration.validationEmailMatch": "The emails do not match",