Addressing feedback
This commit is contained in:
@@ -19,9 +19,10 @@ const wrapperRendered = setInterval(() => {
|
||||
props: {
|
||||
socialAccountLinks: window.auth,
|
||||
isActive: window.isActive,
|
||||
additionalSiteSpecificDeletionText: window.additionalSiteSpecificDeletionText,
|
||||
mktgRootLink: window.mktgRootLink,
|
||||
platformName: window.platformName,
|
||||
siteName: window.siteName,
|
||||
mktgRootLink: window.mktgRootLink
|
||||
siteName: window.siteName
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@@ -96,13 +96,22 @@ export class StudentAccountDeletion extends React.Component {
|
||||
},
|
||||
);
|
||||
|
||||
const bodyDeletion2 = StringUtils.interpolate(
|
||||
gettext('This includes access to {siteName} from your employer’s or university’s system and access to private sites offered by {additionalSiteSpecificDeletionText}.'),
|
||||
{
|
||||
siteName: this.props.siteName,
|
||||
additionalSiteSpecificDeletionText: this.props.additionalSiteSpecificDeletionText,
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
return (
|
||||
<div className="account-deletion-details">
|
||||
<p className="account-settings-header-subtitle">{ gettext('We’re sorry to see you go!') }</p>
|
||||
<p className="account-settings-header-subtitle">{noteDeletion}</p>
|
||||
<p className="account-settings-header-subtitle">
|
||||
<span>{bodyDeletion} </span>
|
||||
<span>{ gettext('This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.') }</span>
|
||||
<span>{bodyDeletion2}</span>
|
||||
</p>
|
||||
<p
|
||||
className="account-settings-header-subtitle"
|
||||
@@ -146,9 +155,10 @@ export class StudentAccountDeletion extends React.Component {
|
||||
}
|
||||
{deletionModalOpen && <StudentAccountDeletionModal
|
||||
onClose={this.closeDeletionModal}
|
||||
additionalSiteSpecificDeletionText={this.props.additionalSiteSpecificDeletionText}
|
||||
mktgRootLink={this.props.mktgRootLink}
|
||||
platformName={this.props.platformName}
|
||||
siteName={this.props.siteName}
|
||||
mktgRootLink={this.props.mktgRootLink}
|
||||
/>}
|
||||
</div>
|
||||
);
|
||||
@@ -160,13 +170,15 @@ StudentAccountDeletion.propTypes = {
|
||||
socialAccountLinks: PropTypes.shape({
|
||||
providers: PropTypes.arrayOf(PropTypes.object),
|
||||
}).isRequired,
|
||||
additionalSiteSpecificDeletionText: PropTypes.string,
|
||||
mktgRootLink: PropTypes.string,
|
||||
platformName: PropTypes.string,
|
||||
siteName: PropTypes.string,
|
||||
mktgRootLink: PropTypes.string,
|
||||
};
|
||||
|
||||
StudentAccountDeletion.defaultProps = {
|
||||
additionalSiteSpecificDeletionText: '',
|
||||
mktgRootLink: '',
|
||||
platformName: '',
|
||||
siteName: '',
|
||||
mktgRootLink: '',
|
||||
};
|
||||
|
||||
@@ -116,6 +116,15 @@ class StudentAccountDeletionConfirmationModal extends React.Component {
|
||||
},
|
||||
);
|
||||
|
||||
const bodyDeletion2 = StringUtils.interpolate(
|
||||
gettext('This includes access to {siteName} from your employer’s or university’s system and access to private sites offered by {additionalSiteSpecificDeletionText}.'),
|
||||
{
|
||||
siteName: this.props.siteName,
|
||||
additionalSiteSpecificDeletionText: this.props.additionalSiteSpecificDeletionText,
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
return (
|
||||
<div className="delete-confirmation-wrapper">
|
||||
<Modal
|
||||
@@ -155,7 +164,7 @@ class StudentAccountDeletionConfirmationModal extends React.Component {
|
||||
<h3 className="alert-title">{noteDeletion}</h3>
|
||||
<p>
|
||||
<span>{bodyDeletion} </span>
|
||||
<span>{ gettext('This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.') }</span>
|
||||
<span>{bodyDeletion2}</span>
|
||||
</p>
|
||||
<p dangerouslySetInnerHTML={{ __html: loseAccessText }} />
|
||||
</div>
|
||||
@@ -216,16 +225,18 @@ class StudentAccountDeletionConfirmationModal extends React.Component {
|
||||
|
||||
StudentAccountDeletionConfirmationModal.propTypes = {
|
||||
onClose: PropTypes.func,
|
||||
additionalSiteSpecificDeletionText: PropTypes.string,
|
||||
mktgRootLink: PropTypes.string,
|
||||
platformName: PropTypes.string,
|
||||
siteName: PropTypes.string,
|
||||
mktgRootLink: PropTypes.string,
|
||||
};
|
||||
|
||||
StudentAccountDeletionConfirmationModal.defaultProps = {
|
||||
onClose: () => {},
|
||||
additionalSiteSpecificDeletionText: "",
|
||||
mktgRootLink: "",
|
||||
platformName: "",
|
||||
siteName: "",
|
||||
mktgRootLink: "",
|
||||
};
|
||||
|
||||
export default StudentAccountDeletionConfirmationModal;
|
||||
|
||||
@@ -77,9 +77,11 @@ from openedx.core.djangoapps.user_api.accounts.utils import is_secondary_email_f
|
||||
<script type="text/javascript">
|
||||
window.auth = ${ auth | n, dump_js_escaped_json };
|
||||
window.isActive = ${ user.is_active | n, dump_js_escaped_json };
|
||||
window.additionalSiteSpecificDeletionText = "${ static.get_value('SITE_SPECIFIC_DELETION_TEXT', 'MIT Open Learning, Wharton Executive Education, and Harvard Medical School.') | n, js_escaped_string }";
|
||||
window.mktgRootLink = "${ static.marketing_link('ROOT') | n, js_escaped_string }";
|
||||
window.platformName = "${ platform_name | n, js_escaped_string }";
|
||||
window.siteName = "${ static.get_value('SITE_NAME', settings.SITE_NAME) | n, js_escaped_string }";
|
||||
window.mktgRootLink = "${ static.marketing_link('ROOT') | n, js_escaped_string }";
|
||||
|
||||
</script>
|
||||
<%static:webpack entry="StudentAccountDeletionInitializer">
|
||||
</%static:webpack>
|
||||
|
||||
Reference in New Issue
Block a user