Updating packages for 5.1.1

Signed-off-by: Yury German <blueknight@gentoo.org>

1 files changed, 133 insertions, 829 deletions

diff --git a/plugins/jetpack/class.jetpack-connection-banner.php b/plugins/jetpack/class.jetpack-connection-banner.php
index c13d7ebc..056f138c 100644
--- a/plugins/jetpack/class.jetpack-connection-banner.php
+++ b/plugins/jetpack/class.jetpack-connection-banner.php
@@ -22,50 +22,6 @@ class Jetpack_Connection_Banner {
 	 */
 	private function __construct() {
 		add_action( 'current_screen', array( $this, 'maybe_initialize_hooks' ) );
-		add_action( 'updating_jetpack_version', array( $this, 'cleanup_on_upgrade' ), 10, 2 );
-	}
-
-	function cleanup_on_upgrade( $new_version = null, $old_version = null ) {
-		if ( version_compare( $old_version, '4.4', '>=' ) && version_compare( $old_version, '5.3', '<' ) ) {
-			delete_option( 'jetpack_connection_banner_ab' );
-		}
-	}
-
-	/**
-	 * Checks whether the connection banner A/B test should be ran.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @param null $now
-	 *
-	 * @return bool
-	 */
-	static function check_ab_test_not_expired( $now = null ) {
-		// Get the current timestamp in GMT
-		$now = empty( $now ) ? current_time( 'timestamp', 1 ) : $now;
-
-		// Arguments are hour, minute, second, month, day, year. So, we are getting the timestamp for GMT timestamp
-		// for the October 5th, 2017.
-		$expiration = gmmktime( 0, 0, 0, 10, 5, 2017 );
-
-		return $expiration >= $now;
-	}
-
-	/**
-	 * Gets the value for which connection banner to show, and initializes if not set.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @return int
-	 */
-	static function get_random_connection_banner_value() {
-		$random_connection_banner = get_option( 'jetpack_connection_banner_ab' );
-		if ( ! $random_connection_banner ) {
-			$random_connection_banner = mt_rand( 1, 2 );
-			update_option( 'jetpack_connection_banner_ab', $random_connection_banner );
-		}
-
-		return $random_connection_banner;
 	}
 
 	/**
@@ -73,21 +29,43 @@ class Jetpack_Connection_Banner {
 	 * a URL for, this function returns a connection URL with a from parameter that will
 	 * support split testing.
 	 *
+	 * @since 7.2   Event key format is now banner-connect-banner-72-dashboard or connect-banner-72-plugins.
+	 *              The param $slide_num was removed since we removed all slides but the first one.
+	 * @since 4.4.0
+	 *
 	 * @param string     $jp_version_banner_added A short version of when the banner was added. Ex. 44
-	 * @param string|int $slide_num               The index of the slide, 1-indexed.
+	 *
 	 * @return string
 	 */
-	function build_connect_url_for_slide( $jp_version_banner_added, $slide_num ) {
+	function build_connect_url_for_slide( $jp_version_banner_added ) {
 		global $current_screen;
 		$url = Jetpack::init()->build_connect_url(
 			true,
 			false,
-			sprintf( 'banner-%s-slide-%s-%s', $jp_version_banner_added, $slide_num, $current_screen->base )
+			sprintf( 'connect-banner-%s-%s', $jp_version_banner_added, $current_screen->base )
 		);
 		return add_query_arg( 'auth_approved', 'true', $url );
 	}
 
 	/**
+	 * Return an img HTML tag pointing to the Jetpack logo. Includes alt text.
+	 *
+	 * @since 7.2
+	 *
+	 * @return string
+	 */
+	public static function get_jetpack_logo() {
+		return sprintf(
+			'<img src="%s" class="jetpack-logo" alt="%s" />',
+			esc_url( plugins_url( 'images/jetpack-logo-green.svg', JETPACK__PLUGIN_FILE ) ),
+			esc_attr__(
+				'Jetpack is a free plugin that utilizes powerful WordPress.com servers to enhance your site and simplify managing it',
+				'jetpack'
+			)
+		);
+	}
+
+	/**
 	 * Will initialize hooks to display the new (as of 4.4) connection banner if the current user can
 	 * connect Jetpack, if Jetpack has not been deactivated, and if the current page is the plugins page.
 	 *
@@ -96,6 +74,7 @@ class Jetpack_Connection_Banner {
 	 * @since 4.4.0
 	 * @since 4.5.0 Made the new (as of 4.4) connection banner display to everyone by default.
 	 * @since 5.3.0 Running another split test between 4.4 banner and a new one in 5.3.
+	 * @since 7.2   B test was removed.
 	 *
 	 * @param $current_screen
 	 */
@@ -114,12 +93,7 @@ class Jetpack_Connection_Banner {
 			return;
 		}
 
-		if ( self::check_ab_test_not_expired() && 2 == self::get_random_connection_banner_value() ) {
-			add_action( 'admin_notices', array( $this, 'render_banner_b' ) );
-		} else {
-			add_action( 'admin_notices', array( $this, 'render_banner' ) );
-		}
-
+		add_action( 'admin_notices', array( $this, 'render_banner' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_banner_scripts' ) );
 		add_action( 'admin_print_styles', array( Jetpack::init(), 'admin_banner_styles' ) );
 
@@ -139,7 +113,7 @@ class Jetpack_Connection_Banner {
 	 *
 	 * @since 4.4.0
 	 */
-	function enqueue_banner_scripts() {
+	public static function enqueue_banner_scripts() {
 		wp_enqueue_script(
 			'jetpack-connection-banner-js',
 			Jetpack::get_file_url_for_environment(
@@ -164,409 +138,76 @@ class Jetpack_Connection_Banner {
 	/**
 	 * Renders the new connection banner as of 4.4.0.
 	 *
+	 * @since 7.2   Copy and visual elements reduced to show the new focus of Jetpack on Security and Performance.
 	 * @since 4.4.0
 	 */
 	function render_banner() { ?>
 		<div id="message" class="updated jp-wpcom-connect__container">
+			<div class="jp-wpcom-connect__container-top-text">
+				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect x="0" fill="none" width="24" height="24"/><g><path d="M12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2zm1 15h-2v-2h2v2zm0-4h-2l-.5-6h3l-.5 6z"/></g></svg>
+				<span><?php esc_html_e( 'You’re almost done. Set up Jetpack to enable powerful security and performance tools for WordPress.', 'jetpack' ); ?></span>
+			</div>
 			<div class="jp-wpcom-connect__inner-container">
 				<span
 					class="notice-dismiss connection-banner-dismiss"
 					title="<?php esc_attr_e( 'Dismiss this notice', 'jetpack' ); ?>">
 				</span>
 
-				<div class="jp-wpcom-connect__vertical-nav">
-					<div class="jp-wpcom-connect__vertical-nav-container">
-						<div class="vertical-menu__feature-item jp-feature-intro vertical-menu__feature-item-is-selected">
-							<div class="vertical-menu__feature-item-icon">
-								<svg class="jp-wpcom-connect__svg-jetpack" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" version="1.1"><path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M11,14H6l5-10V14z M13,20V10h5L13,20z"/></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Welcome to Jetpack', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 2 20 20" version="1.1"><path d="M7.8 17.6L12.2 17.6 12.2 2 7.8 2 7.8 17.6ZM14.4 17.6L18.9 17.6 18.9 5.3 14.4 5.3 14.4 17.6ZM1.1 17.6L5.6 17.6 5.6 9.8 1.1 9.8 1.1 17.6ZM0 22L20 22 20 19.8 0 19.8 0 22Z" /></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Stats &amp; Traffic Tools', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20" viewBox="0 1 16 20" version="1.1"><defs><polygon points="16 10 16 0 0 0 0 10 0 20 16 20"/></defs><g stroke="none" stroke-width="1" transform="translate(0.000000, 1.000000)"><mask fill="white"/><path d="M9 13.7L9 16 7 16 7 13.7C6.4 13.4 6 12.7 6 12 6 10.9 6.9 10 8 10 9.1 10 10 10.9 10 12 10 12.7 9.6 13.4 9 13.7L9 13.7ZM5 5C5 3.3 6.3 2 8 2 9.7 2 11 3.3 11 5L11 6 5 6 5 5ZM14 6L13 6 13 5C13 2.2 10.8 0 8 0 5.2 0 3 2.2 3 5L3 6 2 6C0.9 6 0 6.9 0 8L0 18C0 19.1 0.9 20 2 20L14 20C15.1 20 16 19.1 16 18L16 8C16 6.9 15.1 6 14 6L14 6Z" mask="url(#mask-2)"/></g></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Site Security', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect x="0" fill="none" width="20" height="20"/><g><path d="M4 6c-1.105 0-2 .895-2 2v12c0 1.1.9 2 2 2h12c1.105 0 2-.895 2-2H4V6zm16-4H8c-1.105 0-2 .895-2 2v12c0 1.105.895 2 2 2h12c1.105 0 2-.895 2-2V4c0-1.105-.895-2-2-2zm-5 14H8V9h7v7zm5 0h-3V9h3v7zm0-9H8V4h12v3z"/></g></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Professional Themes', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 2 20 20" version="1.1"><path d="M6 4L6 10.3 9 7 13.9 12.4 14.5 11.7C15.3 10.8 16.7 10.8 17.5 11.7L18 12.2 18 4 6 4ZM20 4L20 16C20 17.1 19.1 18 18 18L6 18C4.9 18 4 17.1 4 16L4 4C4 2.9 4.9 2 6 2L18 2C19.1 2 20 2.9 20 4L20 4ZM2 20L16 20 16 20C16 21.1 15.1 22 14 22L2 22C0.9 22 0 21.1 0 20L0 8C0 6.9 0.9 6 2 6L2 6 2 20ZM13 7.5C13 6.7 13.7 6 14.5 6 15.3 6 16 6.7 16 7.5 16 8.3 15.3 9 14.5 9 13.7 9 13 8.3 13 7.5L13 7.5Z" /></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Performance', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item wp-app-logo">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 2 20 20" version="1.1"><defs><polygon points="0 20 20 20 20 0 0 0 0 20"/></defs><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(0.000000, 2.000000)"><mask fill="white"/><path d="M14.3 17.3L16.9 9.8C17.4 8.6 17.5 7.7 17.5 6.8 17.5 6.5 17.5 6.2 17.5 5.9 18.1 7.1 18.5 8.5 18.5 10 18.5 13.1 16.8 15.9 14.3 17.3L14.3 17.3ZM11.2 6C11.7 6 12.1 5.9 12.1 5.9 12.6 5.9 12.5 5.2 12.1 5.2 12.1 5.2 10.7 5.3 9.8 5.3 9 5.3 7.6 5.2 7.6 5.2 7.1 5.2 7.1 5.9 7.5 5.9 7.5 5.9 8 6 8.4 6L9.7 9.6 7.9 15.2 4.8 6C5.3 6 5.8 5.9 5.8 5.9 6.2 5.9 6.2 5.2 5.7 5.2 5.7 5.2 4.3 5.3 3.4 5.3 3.3 5.3 3.1 5.3 2.9 5.3 4.4 3 7 1.5 10 1.5 12.2 1.5 14.2 2.3 15.7 3.7 15.7 3.7 15.7 3.7 15.6 3.7 14.8 3.7 14.2 4.5 14.2 5.2 14.2 5.9 14.6 6.5 15 7.2 15.4 7.8 15.7 8.5 15.7 9.6 15.7 10.3 15.5 11.1 15.1 12.3L14.2 15.2 11.2 6ZM10 18.5C9.2 18.5 8.4 18.4 7.6 18.2L10.1 10.7 12.8 17.9C12.8 17.9 12.8 18 12.8 18 11.9 18.3 11 18.5 10 18.5L10 18.5ZM1.5 10C1.5 8.8 1.8 7.6 2.2 6.5L6.3 17.7C3.5 16.3 1.5 13.4 1.5 10L1.5 10ZM10 0C4.5 0 0 4.5 0 10 0 15.5 4.5 20 10 20 15.5 20 20 15.5 20 10 20 4.5 15.5 0 10 0L10 0Z" fill="#86A6BD" mask="url(#mask-2)"/></g></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'WordPress Apps', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 4 15 15" version="1.1"><polygon points="6.6 4 6.6 10.6 0 10.6 0 12.4 6.6 12.4 6.6 19 8.4 19 8.4 12.4 15 12.4 15 10.6 8.4 10.6 8.4 4"/></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'More Features', 'jetpack' ); ?></span>
-						</div>
-					</div>
-				</div>
 				<div class="jp-wpcom-connect__content-container">
 
 					<!-- slide 1: intro -->
 					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-one jp__slide-is-active">
-						<h2><?php esc_html_e( 'Jetpack simplifies site security, customization, and management.', 'jetpack' ) ?></h2>
-
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/jetpack-welcome.svg', JETPACK__PLUGIN_FILE ); ?>" alt="<?php
-									esc_attr_e(
-										'Jetpack is a free plugin that utilizes powerful WordPress.com servers to enhance your site and simplify managing it',
-									'jetpack'
-								); ?>" height="auto" width="250" />
-						</div>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Jetpack is a free plugin that utilizes powerful WordPress.com servers to enhance your site and simplify managing it.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'You get detailed visitor stats, state-of-the-art security services, image performance upgrades, traffic generation tools, and more.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Connect to WordPress.com (free) to get started!',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a
-								href="<?php echo esc_url( $this->build_connect_url_for_slide( '44', 1 ) ); ?>"
-								class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a
-								href="#"
-								class="dops-button next-feature"
-								title="<?php
-								esc_attr_e(
-									'Start tour to Learn about the benefits you receive when you connect Jetpack to WordPress.com',
-									'jetpack'
-								);
-								?>">
-								<?php esc_html_e( 'Start quick tour', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 1 -->
-
-					<!-- slide 2: stats -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-two">
-						<h2><?php esc_html_e( 'Detailed stats and traffic tools to help your site grow', 'jetpack' ) ?></h2>
-
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/stats-people.svg', JETPACK__PLUGIN_FILE ); ?>" alt="<?php
-								esc_attr_e(
-									'Get clear and concise stats and analytics about your visitors',
-								 'jetpack'
-								); ?>" height="auto" width="225" />
-						</div>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Jetpack provides detailed stats and insights about your viewers.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'This helps you make informed decisions about your content and drive more traffic to your site with our related posts, social, and enhanced distribution features.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Professional Plan customers get access to advanced SEO tools.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a href="<?php echo esc_url( $this->build_connect_url_for_slide( '44', 2 ) ); ?>" class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a href="#" class="dops-button next-feature" title="<?php esc_attr_e( 'Jetpack Tour: Next Feature', 'jetpack' ); ?>">
-								<?php esc_html_e( 'Next feature', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 2 -->
-
-					<!-- slide 3: security -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-three">
-						<h2><?php esc_html_e( 'Multiple security tools to give you peace of mind', 'jetpack' ) ?></h2>
 
 						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/security.svg', JETPACK__PLUGIN_FILE ); ?>" alt="<?php
-									esc_attr_e(
-										'Your site is automatically protected from brute force attacks, plus you can use single sign-on for extra security',
+							<?php echo self::get_jetpack_logo(); ?>
+							<img
+								src="<?php echo plugins_url( 'images/jetpack-powering-up.svg', JETPACK__PLUGIN_FILE ); ?>"
+								class="jp-wpcom-connect__hide-phone-and-smaller"
+								alt="<?php esc_attr_e(
+									'Jetpack premium services offer even more powerful performance, security, ' .
+									'and revenue tools to help you keep your site safe, fast, and help generate income.',
 									'jetpack'
-								); ?>" height="auto" width="250" />
+								); ?>"
+								height="auto"
+								width="225"
+								/>
 						</div>
 
-						<p>
-							<?php
-							esc_html_e(
-								'Jetpack protects your site against brute force attacks and unauthorized logins. We also monitor your site for downtime and keep your plugins updated. You can view a chronological list of these activities.',
-								'jetpack'
-							);
-							?>
-						</p>
+						<div class="jp-wpcom-connect__slide-text">
+							<h2><?php esc_html_e( 'Simplify your site security and performance with Jetpack', 'jetpack' ) ?></h2>
 
-						<?php if ( Jetpack::show_backups_ui() ): ?>
 							<p>
 								<?php
 								esc_html_e(
-									'Customers on paid plans also benefit from unlimited backups of your entire site, spam protection, malware scanning, and automated fixes.',
+									'Jetpack protects you against brute force attacks and unauthorized logins. Basic protection ' .
+									'is always free, while premium plans add unlimited backups of your whole site, spam protection, ' .
+									'malware scanning, and automated fixes.',
 									'jetpack'
 								);
 								?>
 							</p>
-						<?php endif; ?>
-
-						<p>
-							<?php
-							esc_html_e(
-								'We also offer free support to all users, and priority assistance to paid customers.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a
-								href="<?php echo esc_url( $this->build_connect_url_for_slide( '44', 3 ) ); ?>"
-								class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a href="#" class="dops-button next-feature" title="<?php esc_attr_e( 'Jetpack Tour: Next Feature', 'jetpack' ); ?>">
-								<?php esc_html_e( 'Next feature', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 3 -->
-
-					<!-- slide 3A: themes -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-three-a">
-						<h2><?php esc_html_e( 'Hundreds of beautiful themes to choose from', 'jetpack' ) ?></h2>
-
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/customize-theme.svg', JETPACK__PLUGIN_FILE ); ?>" alt="<?php
-									esc_attr_e(
-										'Choosing a design for your site is essential. It defines your brand, your layout, and your visitors’ reading experience',
-									'jetpack'
-								); ?>" height="auto" width="250" />
-						</div>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Choosing a design for your site is essential. It defines your brand, your layout, and your visitors’ reading experience.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Jetpack reduces complexity and makes this previously difficult process a breeze. Browse hundreds of themes in our showcase, or search by theme, name, style, color, or type.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Preview, install, and activate with one-click, then use our suite of design tools to make it look just as you need it to.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a
-								href="<?php echo esc_url( $this->build_connect_url_for_slide( '44', '3a' ) ); ?>"
-								class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a href="#" class="dops-button next-feature" title="<?php esc_attr_e( 'Jetpack Tour: Next Feature', 'jetpack' ); ?>">
-								<?php esc_html_e( 'Next feature', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 3A -->
 
-
-					<!-- slide 4: Performance -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-four">
-						<h2><?php esc_html_e( 'Faster performance and site speeds', 'jetpack' ); ?></h2>
-
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo esc_url( plugins_url( 'images/cloud-based.svg', JETPACK__PLUGIN_FILE ) ); ?>" alt="<?php
-								esc_attr_e(
-									'Activate Jetpack’s site accelerator to load pages faster, optimize your images, and serve your images and static files (like CSS and JavaScript) from our global network of servers. You’ll also reduce bandwidth usage, which may lead to lower hosting costs.',
+							<p>
+								<?php
+								esc_html_e(
+									'Activate site accelerator tools and watch your page load times and hosting costs drop – we’ll ' .
+									'optimize your images and serve them from our own powerful global network of servers, ' .
+									'and speed up your mobile site to reduce bandwidth usage.',
 									'jetpack'
 								);
-							?>" height="auto" width="225" />
-						</div>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Activate Jetpack’s site accelerator to load pages faster, optimize your images, and serve your images and static files (like CSS and JavaScript) from our global network of servers. You’ll also reduce bandwidth usage, which may lead to lower hosting costs.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a href="<?php echo esc_url( $this->build_connect_url_for_slide( '44', 4 ) ); ?>" class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a href="#" class="dops-button next-feature" title="<?php esc_attr_e( 'Jetpack Tour: Next Feature', 'jetpack' ); ?>">
-								<?php esc_html_e( 'Next feature', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 4 -->
-
-					<!-- slide 5: Apps -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-five">
-						<h2><?php esc_html_e( 'Free WordPress apps to manage your site(s) from any device', 'jetpack' ) ?></h2>
-
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/apps.svg', JETPACK__PLUGIN_FILE ); ?>" alt="<?php
-									esc_attr_e(
-										'Our mobile and desktop apps are free and available to you on Apple or Android devices once Jetpack is connected to WordPress.com',
-									'jetpack'
-								); ?>" height="auto" width="225" />
-						</div>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Publish content, track stats, moderate comments and so much more from anywhere in the world. Our mobile and desktop apps are free and available to you on Apple or Android devices once Jetpack is connected to WordPress.com.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'When Jetpack is connected to WordPress.com, head over to the Apps tab within Jetpack for direct links to the mobile and desktop apps.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a href="<?php echo esc_url( $this->build_connect_url_for_slide( '44', 5 ) ); ?>" class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a href="#" class="dops-button next-feature" title="<?php esc_attr_e( 'Jetpack Tour: Next Feature', 'jetpack' ); ?>">
-								<?php esc_html_e( 'Next feature', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 5 -->
-
-					<!-- slide 6: more features -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-six">
-						<h2><?php esc_html_e( 'More Jetpack features our users love', 'jetpack' ) ?></h2>
+								?>
+							</p>
 
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/customize-theme-2.svg', JETPACK__PLUGIN_FILE ); ?>" alt="<?php
-									esc_attr_e(
-										'Jetpack includes other features that help you customize your site',
-									'jetpack'
-								); ?>" height="auto" width="225" />
+							<div class="jp-banner__button-container">
+								<span class="jp-banner__tos-blurb"><?php jetpack_render_tos_blurb(); ?></span>
+								<a
+									href="<?php echo esc_url( $this->build_connect_url_for_slide( '72' ) ); ?>"
+									class="dops-button is-primary">
+									<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
+								</a>
+							</div>
 						</div>
-
-						<p>
-							<?php
-							esc_html_e(  'Jetpack includes other features that help you customize your site including Custom CSS, Contact Forms, Galleries and Carousels, Notifications and Subscriptions, Configurable Widgets, and many more.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(  'Connect to WordPress.com to get started',
-								'jetpack'
-							);
-							?>
-							<a href="https://jetpack.com/features" target="_blank">
-								<?php esc_html_e( 'or visit our site for the full feature list.', 'jetpack' ); ?>
-							</a>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a
-								href="<?php echo esc_url( $this->build_connect_url_for_slide( '44', 6 ) ); ?>"
-								class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 6 -->
+					</div> <!-- end slide 1 -->
 				</div>
 			</div>
 		</div>
@@ -574,424 +215,87 @@ class Jetpack_Connection_Banner {
 	}
 
 	/**
-	 * Renders a split-test banner as of 5.3.0.
-	 *
-	 * @since 5.3.0
+	 * Renders the full-screen connection prompt.  Only shown once and on plugin activation.
 	 */
-	function render_banner_b() { ?>
-		<div id="message" class="updated jp-wpcom-connect__container">
-			<div class="jp-wpcom-connect__inner-container">
-				<span
-					class="notice-dismiss connection-banner-dismiss"
-					title="<?php esc_attr_e( 'Dismiss this notice', 'jetpack' ); ?>">
-				</span>
+	public static function render_connect_prompt_full_screen() {
+		$current_screen = get_current_screen();
+		if ( 'plugins' === $current_screen->base ) {
+			$bottom_connect_url_from = 'full-screen-prompt';
+		} else {
+			$bottom_connect_url_from = 'landing-page-bottom';
+		}
+		?>
+		<div class="jp-connect-full__container"><div class="jp-connect-full__container-card">
 
-				<div class="jp-wpcom-connect__vertical-nav">
-					<div class="jp-wpcom-connect__vertical-nav-container">
-						<div class="vertical-menu__feature-item jp-feature-intro vertical-menu__feature-item-is-selected">
-							<div class="vertical-menu__feature-item-icon">
-								<svg class="jp-wpcom-connect__svg-jetpack" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" version="1.1"><path d="M14.4 11.3L10.5 18.1 10.5 8.7 13.7 9.5C14.5 9.7 14.9 10.6 14.4 11.3L14.4 11.3ZM9.6 13.3L6.5 12.5C5.7 12.3 5.3 11.4 5.7 10.7L9.6 3.9 9.6 13.3ZM10 1C4.5 1 0 5.5 0 11 0 16.5 4.5 21 10 21 15.5 21 20 16.5 20 11 20 5.5 15.5 1 10 1L10 1Z" /></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Welcome to Jetpack', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 2 20 20" version="1.1"><path d="M6 4L6 10.3 9 7 13.9 12.4 14.5 11.7C15.3 10.8 16.7 10.8 17.5 11.7L18 12.2 18 4 6 4ZM20 4L20 16C20 17.1 19.1 18 18 18L6 18C4.9 18 4 17.1 4 16L4 4C4 2.9 4.9 2 6 2L18 2C19.1 2 20 2.9 20 4L20 4ZM2 20L16 20 16 20C16 21.1 15.1 22 14 22L2 22C0.9 22 0 21.1 0 20L0 8C0 6.9 0.9 6 2 6L2 6 2 20ZM13 7.5C13 6.7 13.7 6 14.5 6 15.3 6 16 6.7 16 7.5 16 8.3 15.3 9 14.5 9 13.7 9 13 8.3 13 7.5L13 7.5Z" /></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Create Your Site', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 2 20 20" version="1.1"><path d="M7.8 17.6L12.2 17.6 12.2 2 7.8 2 7.8 17.6ZM14.4 17.6L18.9 17.6 18.9 5.3 14.4 5.3 14.4 17.6ZM1.1 17.6L5.6 17.6 5.6 9.8 1.1 9.8 1.1 17.6ZM0 22L20 22 20 19.8 0 19.8 0 22Z" /></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Make It Successful', 'jetpack' ); ?></span>
-						</div>
-						<div class="vertical-menu__feature-item">
-							<div class="vertical-menu__feature-item-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20" viewBox="0 1 16 20" version="1.1"><defs><polygon points="16 10 16 0 0 0 0 10 0 20 16 20"/></defs><g stroke="none" stroke-width="1" transform="translate(0.000000, 1.000000)"><mask fill="white"/><path d="M9 13.7L9 16 7 16 7 13.7C6.4 13.4 6 12.7 6 12 6 10.9 6.9 10 8 10 9.1 10 10 10.9 10 12 10 12.7 9.6 13.4 9 13.7L9 13.7ZM5 5C5 3.3 6.3 2 8 2 9.7 2 11 3.3 11 5L11 6 5 6 5 5ZM14 6L13 6 13 5C13 2.2 10.8 0 8 0 5.2 0 3 2.2 3 5L3 6 2 6C0.9 6 0 6.9 0 8L0 18C0 19.1 0.9 20 2 20L14 20C15.1 20 16 19.1 16 18L16 8C16 6.9 15.1 6 14 6L14 6Z" mask="url(#mask-2)"/></g></svg>
-							</div>
-							<span class="vertical-menu__feature-item-label"><?php esc_html_e( 'Keep It Safe', 'jetpack' ); ?></span>
-						</div>
+				<?php if ( 'plugins' === $current_screen->base ) : ?>
+					<?php echo self::get_jetpack_logo(); ?>
+
+					<div class="jp-connect-full__dismiss">
+						<svg class="jp-connect-full__svg-dismiss" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>Dismiss Jetpack Connection Window</title><rect x="0" fill="none" /><g><path d="M17.705 7.705l-1.41-1.41L12 10.59 7.705 6.295l-1.41 1.41L10.59 12l-4.295 4.295 1.41 1.41L12 13.41l4.295 4.295 1.41-1.41L13.41 12l4.295-4.295z"/></g></svg>
 					</div>
-				</div>
-				<div class="jp-wpcom-connect__content-container">
+				<?php endif; ?>
 
-					<!-- slide 1: intro -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-one jp__slide-is-active">
-						<h2><?php esc_html_e( 'Welcome to Jetpack', 'jetpack' ) ?></h2>
+				<div class="jp-connect-full__step-header">
+					<h2 class="jp-connect-full__step-header-title"><?php esc_html_e( 'Activate essential WordPress security and performance tools by setting up Jetpack', 'jetpack' ) ?></h2>
+				</div>
 
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/jetpack-welcome.svg', JETPACK__PLUGIN_FILE ); ?>" alt="Your site is automatically protected from brute force attacks, plus you can use single sign-on for extra security." height="auto" width="250" />
+				<div class="jp-connect-full__row">
+					<div class="jp-connect-full__slide">
+						<div class="jp-connect-full__slide-card illustration">
+							<img
+									src="<?php echo plugins_url( 'images/security.svg', JETPACK__PLUGIN_FILE ); ?>"
+									alt="<?php esc_attr_e( 'Security & Backups', 'jetpack' ); ?>"
+							/>
 						</div>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Jetpack is the best way to experience WordPress, whether your site is brand new or already well established.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'You get themes and tools to design your site, marketing services to make it successful, and state-of-the-art security.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Connect to WordPress.com (free) to get started.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a
-								href="<?php echo esc_url( $this->build_connect_url_for_slide( '53', 1 ) ); ?>"
-								class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a
-								href="#"
-								class="dops-button next-feature"
-								title="<?php
-								esc_attr_e(
-									'Start tour to Learn about the benefits you receive when you connect Jetpack to WordPress.com',
+						<div class="jp-connect-full__slide-card">
+							<p><?php
+								esc_html_e(
+									'Jetpack protects you against brute force attacks and unauthorized logins. ' .
+									'Basic protection is always free, while premium plans add unlimited backups of your whole site, ' .
+									'spam protection, malware scanning, and automated fixes.',
 									'jetpack'
 								);
-								?>">
-								<?php esc_html_e( 'Start quick tour', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 1 -->
-
-					<!-- slide 2: design -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-two">
-						<h2><?php esc_html_e( 'Code-Free Design and Publishing', 'jetpack' ) ?></h2>
-
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/customize-theme.svg', JETPACK__PLUGIN_FILE ); ?>" alt="Customization tools and widgets help you make your site look great without writing any code" height="auto" width="225" />
+								?></p>
 						</div>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Jetpack gives you access to more than 100 free and 200 premium WordPress themes.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Customization tools and widgets help you make your site look great without writing any code, and our CDN speeds up your images.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Publish with ease using WordPress.com or the official WordPress mobile apps.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a href="<?php echo esc_url( $this->build_connect_url_for_slide( '53', 2 ) ); ?>" class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a href="#" class="dops-button next-feature" title="<?php esc_attr_e( 'Jetpack Tour: Next Feature', 'jetpack' ); ?>">
-								<?php esc_html_e( 'Next feature', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 2 -->
-
-					<!-- slide 3: marketing -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-three">
-						<h2><?php esc_html_e( 'Get The Traffic You Deserve', 'jetpack' ) ?></h2>
-
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/stats-people.svg', JETPACK__PLUGIN_FILE ); ?>" alt="Get clear and concise stats and analytics about your visitors." height="auto" width="265" />
-						</div>
-
-						<p>
-							<?php
-							esc_html_e(
-								'A site without traffic is like a car without gas. Jetpack helps you fill up so that you can achieve your goals.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'Kickstart your marketing with social media automation tools, related content, email subscriptions, and sharing tools.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(
-								'You also get clear and concise stats and analytics about your visitors.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a
-								href="<?php echo esc_url( $this->build_connect_url_for_slide( '53', 3 ) ); ?>"
-								class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-							<a href="#" class="dops-button next-feature" title="<?php esc_attr_e( 'Jetpack Tour: Next Feature', 'jetpack' ); ?>">
-								<?php esc_html_e( 'Next feature', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 3 -->
-
-					<!-- slide 4: security -->
-					<div class="jp-wpcom-connect__slide jp-wpcom-connect__slide-four">
-						<h2><?php esc_html_e( 'Make Sure Your Site Is Always Online', 'jetpack' ) ?></h2>
-
-						<div class="jp-wpcom-connect__content-icon jp-connect-illo">
-							<img src="<?php echo plugins_url( 'images/security.svg', JETPACK__PLUGIN_FILE ); ?>" alt="Your site is automatically protected from brute force attacks, plus you can use single sign-on for extra security." height="auto" width="250" />
+					</div>
+					<div class="jp-connect-full__slide">
+						<div class="jp-connect-full__slide-card illustration">
+							<img
+									src="<?php echo plugins_url( 'images/jetpack-speed.svg', JETPACK__PLUGIN_FILE ); ?>"
+									alt="<?php esc_attr_e( 'Built-in Performance', 'jetpack' ); ?>"
+							/>
 						</div>
-
-						<p>
-							<?php
-							esc_html_e(  'Jetpack checks your site every few minutes, and if it\'s offline we\'ll notify you instantly.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<p>
-							<?php
-							esc_html_e(  'Your site is automatically protected from brute force attacks, plus you can use single sign-on for extra security.',
-								'jetpack'
-							);
-							?>
-						</p>
-
-						<?php if ( Jetpack::show_backups_ui() ): ?>
-							<p>
-								<?php
-								esc_html_e(  'Paying customers also benefit from automated backups, malware scans, and priority support.',
+						<div class="jp-connect-full__slide-card">
+							<p><?php
+								esc_html_e(
+									"Activate site accelerator tools and watch your page load times and hosting costs drop—" .
+									"we'll optimize your images and serve them from our own powerful global network of servers, " .
+									"and speed up your mobile site to reduce bandwidth usage.",
 									'jetpack'
 								);
-								?>
-							</p>
-						<?php endif; ?>
-
-						<p class="jp-banner__button-container">
-							<span class="jp-banner__tos-blurb">
-								<?php jetpack_render_tos_blurb(); ?>
-							</span>
-							<a
-								href="<?php echo esc_url( $this->build_connect_url_for_slide( '53', 4 ) ); ?>"
-								class="dops-button is-primary">
-								<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div> <!-- end slide 4 -->
-				</div>
-			</div>
-		</div>
-		<?php
-	}
-
-	/**
-	 * Renders the full-screen connection prompt.  Only shown once and on plugin activation.
-	 */
-	function render_connect_prompt_full_screen() {
-		?>
-		<div class="jp-connect-full__container"><div class="jp-connect-full__container-card">
-
-			<img
-				class="jetpack-logo"
-				src="<?php echo plugins_url( 'images/jetpack-logo-green.svg', JETPACK__PLUGIN_FILE ); ?>"
-				alt="<?php
-					esc_attr_e(
-						'Jetpack is a free plugin that utilizes powerful WordPress.com servers to enhance your site and simplify managing it',
-						'jetpack'
-				); ?>"
-			/>
-
-			<div class="jp-connect-full__dismiss">
-				<svg class="jp-connect-full__svg-dismiss" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>Dismiss Jetpack Connection Window</title><rect x="0" fill="none" /><g><path d="M17.705 7.705l-1.41-1.41L12 10.59 7.705 6.295l-1.41 1.41L10.59 12l-4.295 4.295 1.41 1.41L12 13.41l4.295 4.295 1.41-1.41L13.41 12l4.295-4.295z"/></g></svg>
-			</div>
-
-			<div class="jp-connect-full__step-header">
-				<h2 class="jp-connect-full__step-header-title"><?php esc_html_e( 'The ideal way to experience WordPress', 'jetpack' ) ?></h2>
-				<h3 class="jp-connect-full__step-header-title"><?php esc_html_e( 'Hassle-free design, marketing, and security — all in one place.', 'jetpack' ) ?></h3>
-			</div>
-			<p class="jp-connect-full__tos-blurb">
-				<?php jetpack_render_tos_blurb(); ?>
-			</p>
-
-			<p class="jp-connect-full__button-container">
-				<a href="<?php echo esc_url( Jetpack::init()->build_connect_url( true, false, 'full-screen-prompt' ) ); ?>" class="dops-button is-primary">
-					<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-				</a>
-			</p>
-
-			<p class="jp-connect-full__dismiss-paragraph">
-				<a><?php echo esc_html_x( 'not now', 'a link that closes the modal window that offers to connect Jetpack', 'jetpack' ); ?></a>
-			</p>
-
-			<div class="jp-connect-full__slide">
-				<div class="jp-connect-full__slide-card">
-					<h4><?php esc_html_e( 'Design & Customization', 'jetpack' ); ?></h4>
-					<p><?php
-						esc_html_e(
-							'Design: Choose from hundreds of website theme designs and customize your site.',
-							'jetpack'
-						);
-					?></p>
-                    <p><?php
-						esc_html_e(
-							'Customize: Jetpack features have been completely redesigned for the new WordPress content creation and editing experience, Gutenberg. Get more customization options for Jetpack features right in the new editor.',
-							'jetpack'
-						);
-						?></p>
-					<p><?php
-						esc_html_e(
-							'Optimize: Jetpack’s site accelerator uploads images, videos, and static files like CSS to our powerful servers and delivers them at lightning-fast speeds to your visitors. You’ll also save precious bandwidth.',
-							'jetpack'
-						);
-					?></p>
-				</div>
-				<div class="jp-connect-full__slide-card illustration">
-					<img
-						src="<?php echo plugins_url( 'images/jetpack-design.svg', JETPACK__PLUGIN_FILE ); ?>"
-						alt="<?php esc_attr_e( 'Design & Customization', 'jetpack' ); ?>"
-					/>
-				</div>
-			</div>
-			<div class="jp-connect-full__slide">
-				<div class="jp-connect-full__slide-card illustration">
-					<img
-						src="<?php echo plugins_url( 'images/jetpack-performance.svg', JETPACK__PLUGIN_FILE ); ?>"
-						alt="<?php esc_attr_e( 'Marketing & Performance', 'jetpack' ); ?>"
-					/>
-				</div>
-				<div class="jp-connect-full__slide-card">
-					<h4><?php esc_html_e( 'Marketing & Performance', 'jetpack' ); ?></h4>
-					<p><?php
-						esc_html_e(
-							'Promote: Spread the word about your website by connecting to all major social media channels and plan ahead with automated scheduled posting.',
-							'jetpack'
-						);
-					?></p>
-					<p><?php
-						esc_html_e(
-							'Measure: Keep track of your site’s performance with real-time stats—see where visitors are coming from and what they’re searching for.',
-							'jetpack'
-						);
-					?></p>
-					<p><?php
-						esc_html_e(
-							'Earn: Generate revenue with the WordPress.com ad program and accept payment for goods and services with our simple payments button.',
-							'jetpack'
-						);
-					?></p>
-				</div>
-			</div>
-			<div class="jp-connect-full__slide">
-				<div class="jp-connect-full__slide-card">
-					<h4><?php esc_html_e( 'Security & Backups', 'jetpack' ); ?></h4>
-					<p><?php
-						esc_html_e(
-							'Monitor: Get instant alerts if your site goes down via email and push notifications.',
-							'jetpack'
-						);
-					?></p>
-					<p><?php
-						esc_html_e(
-							'Protect: Have peace of mind with around the clock protection against brute force attacks, spam, and malware.',
-							'jetpack'
-						);
-					?></p>
-					<?php if ( Jetpack::show_backups_ui() ) : ?>
-						<p><?php
-							esc_html_e(
-								'Backup & Restore: Rest assured with real-time site backups and easy roll-back site restores.',
-								'jetpack'
-							);
-						?></p>
-					<?php endif; ?>
-				</div>
-				<div class="jp-connect-full__slide-card illustration">
-					<img
-						src="<?php echo plugins_url( 'images/security.svg', JETPACK__PLUGIN_FILE ); ?>"
-						alt="<?php esc_attr_e( 'Security & Backups', 'jetpack' ); ?>"
-					/>
+								?></p>
+						</div>
+					</div>
 				</div>
-			</div>
-
 
-			<img
-				class="support-characters"
-				src="<?php echo plugins_url( 'images/characters.svg', JETPACK__PLUGIN_FILE ); ?>"
-				alt="<?php
-					esc_attr_e(
-						'Jetpack help personnel',
-						'jetpack'
-				); ?>"
-			/>
-			<div class="jp-connect-full__step-support">
-				<h2>At your service whenever you need help</h2>
-				<h3>
-					<?php esc_html_e( 'If you need help at any step of the way we’re happy to chat with you!', 'jetpack' ); ?>
-				</h3>
-			</div>
-
-			<p class="jp-connect-full__button-container">
-				<a href="https://jetpack.com/contact-support/" class="dops-button">
-					<?php esc_html_e( 'Get in touch with us', 'jetpack' ); ?>
-				</a>
-				<a href="https://jetpack.com/support" class="dops-button">
-					<?php esc_html_e( 'Search our support site', 'jetpack' ); ?>
-				</a>
-			</p>
-			<div class="jp-connect-full__step-header bottom">
-				<h2 class="jp-connect-full__step-header-title"><?php esc_html_e( 'Get started today', 'jetpack' ) ?></h2>
-				<h3 class="jp-connect-full__step-header-title">
-					<?php esc_html_e( 'Connect to, or create, a WordPress.com account to start using Jetpack, and activate our powerful security, traffic and customization services.', 'jetpack' ) ?>
-				</h3>
-			</div>
-			<p class="jp-connect-full__tos-blurb">
-				<?php jetpack_render_tos_blurb(); ?>
-			</p>
-			<p class="jp-connect-full__button-container">
-				<a href="<?php echo esc_url( Jetpack::init()->build_connect_url( true, false, 'full-screen-prompt' ) ); ?>" class="dops-button is-primary">
-					<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
-				</a>
-			</p>
-		</div></div>
+				<p class="jp-connect-full__tos-blurb">
+					<?php jetpack_render_tos_blurb(); ?>
+				</p>
+				<p class="jp-connect-full__button-container">
+					<a href="<?php echo esc_url( Jetpack::init()->build_connect_url( true, false, $bottom_connect_url_from ) ); ?>" class="dops-button is-primary">
+						<?php esc_html_e( 'Set up Jetpack', 'jetpack' ); ?>
+					</a>
+				</p>
+				<?php if ( 'plugins' === $current_screen->base ) : ?>
+					<p class="jp-connect-full__dismiss-paragraph">
+						<a>
+							<?php echo esc_html_x(
+								'Not now, thank you.', 'a link that closes the modal window that offers to connect Jetpack', 'jetpack'
+							); ?>
+						</a>
+					</p>
+				<?php endif; ?>
+			</div></div>
 		<?php
 	}