Add inline module settings for plan welcome page #8985

gravityrail · 2018-03-05T22:50:30Z

Changes proposed in this Pull Request:

Show toggles to enable plan features in the "welcome" page for the plan, after upgrade (as per Allow enabling lazy images from the upgrade screen #8700)

Testing instructions:

Upgrade to Jetpack Personal
Observe that form includes module toggles (toggle all on, then all off)
Upgrade to Jetpack Premium
Same as above
Upgrade to Jetpack Professional
Same as above

Screenshots

I have deliberately done the smallest change I can, while still sharing code across plans (which changes some copy). I have only removed prompts from the bottom of the form where I feel that there was a clearly redundant CTA.

Personal

Premium

Professional

alisterscott · 2018-03-08T00:30:55Z

Hi,

I tested this against jurassic.ninja sites (before and after the change) and it looked and worked well.

The only issue I came across was trying to activate ads on a personal site - it gave me an error:

I had a look at both the pricing page, and the plans page (in Calypso) and couldn't find monetization as part of the personal plan so maybe this doesn't belong in this change?

Otherwise everything else worked well for me for the other plans

gravityrail · 2018-03-08T00:53:47Z

Fixed! Thanks for the review @alisterscott

ebinnion

I left a couple of comments on code. The two blockers that I see are that:

We're adding a component that we're not using
We're mention Jetpack Professional in all of the plan in the monitor akismet backups section.

I have a couple of other questions:

Since the social-seo-ads-prompt.jsx is only required for the Professional plan, and since it's specific to the Professional plan, should we just add toggles and phrasing directly into the professional.jsx file?
Similar thing for social-ads-prompt.jsx and that only being used in the premium.jsx file. Should we just roll that directly into the premium.jsx file?

ebinnion · 2018-03-08T20:39:41Z

_inc/client/components/welcome-new-plan/monitor-akismet-backups-prompt.jsx

+		return <div>
+			<img src={ imagePath + 'security.svg' } className="jp-welcome__svg" alt={ __( 'Security' ) } />
+			<p>
+				{ __( 'Jetpack Professional gives you everything you need to keep your hard work safe, including ' +


This is shown for all three plans. Perhaps we could say, "Your Jetpack plan...". Or, we can add a placeholder in and then substitute the plan name in.

ebinnion · 2018-03-08T20:43:48Z

_inc/client/components/welcome-new-plan/wordads-prompt.jsx

@@ -0,0 +1,28 @@
+/**


Are we using this component anywhere? I didn't notice it in the screenshots and when I search wordads-prompt on this page, nothing shows up.

ebinnion · 2018-03-08T20:45:44Z

_inc/client/components/welcome-new-plan/videopress-prompt.jsx

+class VideoPressPrompt extends React.Component {
+	render() {
+		return <div>
+			<img src={ imagePath + 'wordads.svg' } className="jp-welcome__svg" alt={ __( 'VideoPress' ) } />


Since this icon is the same one we're using for the social and ads section, does it make sense to group the settings together under a single instance of the icon?

alisterscott · 2018-03-08T22:27:12Z

Re-tested and I'm no longer seeing the ads on a personal plan - thanks for the fix.

As @ebinnion points out above, could the "Jetpack Professional gives you everything you need to keep your hard work safe," be rephrased as "Your Jetpack plan gives you everything you need to keep your hard work safe,"?

gravityrail · 2018-03-09T23:37:04Z

@ebinnion I removed the unused modules, moved modules only used in one place to be inline, fixed the wording about "Professional" plan to be more generic, and removed the icon from the VideoPress section (since it didn't quite fit in the other section, and there was no videopress-suitable svg icon already in the repo)

… unused modules

Any chance you could take another look?

keoshi

Works and looks great!

Other than the copy tweak @alisterscott mentioned, it's good to go!

oskosk · 2018-03-26T14:04:43Z

@gravityrail this one needs a rebase now

gravityrail · 2018-03-26T14:58:33Z

Merged with master and added toggle for enabling Search. Here's a screenshot - I put the search toggle right below the first mention of Search in the landing page. This might not be the most elegant way to show it (or perhaps we need an icon above the para/toggle?)

cc @Viper007Bond @keoshi

keoshi · 2018-03-27T10:40:53Z

Looks great to me for a first iteration. Let's ship this!

oskosk · 2018-03-27T16:44:32Z

@gravityrail I started with a site from scratch, connected, then upgraded to personal... Was presented with the toggles. three of them. Two of them were toggled. Only the backups one was off. So i toggled it, and then it activated but the welcome screen closed itself unexpectedly. Is this ok ?

oskosk · 2018-03-27T16:53:30Z

Forget it. I can't reproduce. Tested all plans and looks great.

oskosk

LGTM!

oskosk · 2018-03-27T17:14:50Z

Note that the changes here, will not take advantage of the string updates done to the Learn More popover introduced in #9137. cc @eliorivero @rickybanister

oskosk · 2018-03-27T17:18:42Z

@rickybanister @eliorivero @keoshi I'm merging this one. Please let me know if we need to tackle the strings I mentioned on my previous comment

eliorivero · 2018-03-27T17:20:08Z

Yeah, I think for consistency this should be implemented.

@tiagonoronha

* Changelog 6.0: create base for changelog. * Add #8938 to changelog * Add #8962 to changelog * Add #8974 to changelog * Add #8975 to changelog * Add #8978 to changelog * Add #8867 to changelog * Add #8937 to changelog * Add #8961 to changelog * Add #8855 to changelog * Add #8944 to changelog * Add #8973 to changelog * Add #8977 to changelog * Add #8979 to changelog * Add #8980 to changelog * Add #8982 to changelog * Add #8983 to changelog * Add #8984 to changelog * Add #8986 to changelog * Add #9005 to changelog * Add #9010 to changelog * Add #9012 to changelog * Add #9021 to changelog * Add #9022 to changelog * Add #9056 to changelog * Add #9061 to changelog * Add #9079 to changelog * Add #9080 to changelog * Add #9088 to changelog * Add #9096 to changelog * Add #9097 to changelog * Add #9100 to changelog * Add #9107 to changelog * Add #8969 to changelog * Add #8993 to changelog * Add #9003 to changelog * Add #9031 to changelog * Add #8945 to changelog * Add #9052 to changelog * Add #9058 to changelog * Add #9066 to changelog * Add #9076 to changelog * Add #9053 to changelog * Add #9108 to changelog * Add #9135 to changelog * Add #9148 to changelog * Add #9125 to changelog * Add #9137 to changelog * Added testing instructions for 6.0. * Added IS testing instructions, huge props to @tiagonoronha. * Added #8498 to changelog. * Added #8954 to changelog. * Added #8985 to changelog. * add #9027 * add #9112 to changelog * add #9136 to changelog * add #9102 to changelog * add #9093 to changelog * add #9062 to changelog * add #9172 to changelog

Add inline module settings for plan welcome page

2105de4

gravityrail requested a review from a team as a code owner March 5, 2018 22:50

gravityrail added [Status] In Progress [Focus] FixTheFlows labels Mar 5, 2018

gravityrail self-assigned this Mar 5, 2018

gravityrail added this to the 6.0 milestone Mar 5, 2018

gravityrail added 4 commits March 6, 2018 09:50

Merge branch 'master' into fix/inline-module-enable-plan-welcome

56f0c1f

Move inline module toggle into its own component

66c1a83

Merge branch 'master' into fix/inline-module-enable-plan-welcome

61746a4

Add inline module toggle for all plan levels

ace6616

gravityrail added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Status] Needs Design Review Design has been added. Needs a review! and removed [Status] In Progress labels Mar 7, 2018

gravityrail requested a review from beaulebens March 7, 2018 20:08

Remove wordads module from Personal plans overview

acfa959

ebinnion previously requested changes Mar 8, 2018

View reviewed changes

Un-modularize code only used from one place; Fix some wording; remove…

0db6fb8

… unused modules

gravityrail requested a review from keoshi March 12, 2018 13:30

keoshi approved these changes Mar 12, 2018

View reviewed changes

beaulebens mentioned this pull request Mar 12, 2018

VideoPress: Auto-activate on a supported paid plan? #7362

Closed

jeherve added [Feature] Warm Welcome Plans labels Mar 26, 2018

gravityrail added 2 commits March 26, 2018 07:52

Include newly-added Search features on Professional landing page

b8ccc3a

Merge branch 'master' into fix/inline-module-enable-plan-welcome

95275b5

oskosk approved these changes Mar 27, 2018

View reviewed changes

oskosk added the [Status] Ready to Merge Go ahead, you can push that green button! label Mar 27, 2018

oskosk merged commit 0e5f1e8 into master Mar 27, 2018

matticbot added the [Status] Needs Changelog label Mar 27, 2018

ghost removed the [Status] Ready to Merge Go ahead, you can push that green button! label Mar 27, 2018

oskosk deleted the fix/inline-module-enable-plan-welcome branch March 27, 2018 17:18

zinigor added a commit that referenced this pull request Mar 27, 2018

Added #8985 to changelog.

30a71ff

zinigor removed the [Status] Needs Changelog label Mar 27, 2018

kraftbj removed the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Sep 29, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add inline module settings for plan welcome page #8985

Add inline module settings for plan welcome page #8985

gravityrail commented Mar 5, 2018 •

edited

Loading

alisterscott commented Mar 8, 2018 •

edited

Loading

gravityrail commented Mar 8, 2018

ebinnion left a comment

ebinnion Mar 8, 2018

ebinnion Mar 8, 2018

ebinnion Mar 8, 2018

alisterscott commented Mar 8, 2018

gravityrail commented Mar 9, 2018

keoshi left a comment

oskosk commented Mar 26, 2018

gravityrail commented Mar 26, 2018

keoshi commented Mar 27, 2018

oskosk commented Mar 27, 2018

oskosk commented Mar 27, 2018

oskosk left a comment

oskosk commented Mar 27, 2018

oskosk commented Mar 27, 2018

eliorivero commented Mar 27, 2018

Add inline module settings for plan welcome page #8985

Add inline module settings for plan welcome page #8985

Conversation

gravityrail commented Mar 5, 2018 • edited Loading

Changes proposed in this Pull Request:

Testing instructions:

Screenshots

Personal

Premium

Professional

alisterscott commented Mar 8, 2018 • edited Loading

gravityrail commented Mar 8, 2018

ebinnion left a comment

Choose a reason for hiding this comment

ebinnion Mar 8, 2018

Choose a reason for hiding this comment

ebinnion Mar 8, 2018

Choose a reason for hiding this comment

ebinnion Mar 8, 2018

Choose a reason for hiding this comment

alisterscott commented Mar 8, 2018

gravityrail commented Mar 9, 2018

keoshi left a comment

Choose a reason for hiding this comment

oskosk commented Mar 26, 2018

gravityrail commented Mar 26, 2018

keoshi commented Mar 27, 2018

oskosk commented Mar 27, 2018

oskosk commented Mar 27, 2018

oskosk left a comment

Choose a reason for hiding this comment

oskosk commented Mar 27, 2018

oskosk commented Mar 27, 2018

eliorivero commented Mar 27, 2018

gravityrail commented Mar 5, 2018 •

edited

Loading

alisterscott commented Mar 8, 2018 •

edited

Loading