From 37b4c0c8cb038b4dc40c266cd8faf1e8ce241eb1 Mon Sep 17 00:00:00 2001 From: Caleb Richelson Date: Mon, 7 May 2018 16:33:35 -0400 Subject: [PATCH] Updates to the Setup flow: added Rewards --- _locales/en/messages.json | 43 +++++++------- app/scss/setup.scss | 6 +- app/setup/components/Navigation.jsx | 73 ++++++++++++++---------- app/setup/components/Views/LogInView.jsx | 43 +------------- 4 files changed, 69 insertions(+), 96 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index b3c4f4956..b135058c0 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1341,7 +1341,7 @@ "message": "One-Click Setup" }, "setup_choice_view_share_data": { - "message": "Share my analytics and Human Web data to improve Ghostery’s performance." + "message": "Participate in Ghostery Rewards and share Human Web & analytics data." }, "setup_choice_view_share_data_no_human_web": { "message": "Share my analytics data to improve Ghostery’s performance." @@ -1355,6 +1355,23 @@ "setup_choice_view_answer_questions": { "message": "Choose my own settings by answering a few short questions." }, + "setup_choice_view_legal": { + "message": "By installing Ghostery, you agree to Ghostery's $LINK_PP_START$Privacy Policy$LINK_PP_END$ and $LINK_TERMS_START$Terms of Use$LINK_TERMS_END$.", + "placeholders": { + "link_pp_start": { + "content": "" + }, + "link_pp_end": { + "content": "" + }, + "link_terms_start": { + "content": "" + }, + "link_terms_end": { + "content": "" + } + } + }, "setup_blocking_view_title": { "message": "Ghostery can block trackers to make your browsing cleaner, faster, and safer. What would you like to block?" }, @@ -1447,26 +1464,6 @@ "setup_login_view_password_error": { "message": "Use between 8 and 50 characters." }, - "setup_login_view_terms_error": { - "message": "You must accept this." - }, - "setup_login_view_terms": { - "message": "I agree to Ghostery's $LINK_PP_START$Privacy Policy$LINK_PP_END$ and $LINK_TERMS_START$Terms of Use$LINK_TERMS_END$", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Don't have an account? Create one." }, @@ -1477,10 +1474,10 @@ "message": "Signed in as" }, "setup_data_view_title": { - "message": "Would you like to help improve Ghostery?" + "message": "Would you like to support Ghostery?" }, "setup_data_view_desc": { - "message": "We use anonymous analytics and Human Web data to improve Ghostery’s performance, without collecting any personal data. $LINK_START$Learn more$LINK_END$.", + "message": "We use anonymous analytics and Human Web data to improve Ghostery’s performance, and provide Rewards without collecting any personal data. $LINK_START$Learn more$LINK_END$.", "placeholders": { "link_start": { "content": "" diff --git a/app/scss/setup.scss b/app/scss/setup.scss index c52ffc21c..9b79e32b4 100644 --- a/app/scss/setup.scss +++ b/app/scss/setup.scss @@ -72,7 +72,7 @@ body { //Don't show blue border on click *:focus { outline: none; - } + } #header { height: 53px; color: $white; @@ -166,6 +166,10 @@ body { #navigation { background-color: $whisper; padding: 0 0 35px; + .legal-notice { + text-align: center; + font-style: italic; + } .navigation-dots { width: 250px; max-width: 250px; diff --git a/app/setup/components/Navigation.jsx b/app/setup/components/Navigation.jsx index f3bb1b071..6a580afad 100644 --- a/app/setup/components/Navigation.jsx +++ b/app/setup/components/Navigation.jsx @@ -88,6 +88,14 @@ class Navigation extends Component { this.props.actions.close(); } + /** + * Wrapper function for dangerouslySetInnerHTML. Provides extra security + * @return {Object} + */ + createLegalMarkup() { + return { __html: t('setup_choice_view_legal') }; + } + /** * React's required render function. Returns JSX * @return {JSX} JSX for rendering the Navigation @@ -97,38 +105,43 @@ class Navigation extends Component { const { nextButtons } = this.props; return (