Merge branch 'master' into dna-menus-module

_inc/client/components/jumpstart/style.scss

@@ -9,7 +9,16 @@
 	display: flex;
 	margin-bottom: 0;
 
-	.jp-jumpstart-card__img,
+	.jp-jumpstart-card__img {
+		@include breakpoint( ">480px" ) {
+			flex: 1 0 rem( 100px );
+		}
+
+		@include breakpoint( ">660px" ) {
+			flex: 1 0 rem( 200px );
+		}
+	}
+
 	.jp-jumpstart-card__img img {
 		display: none;
 
@@ -23,7 +32,9 @@
 		}
 	}
 
+
 	.jp-jumpstart-card__description {
+		margin-left: 0;
 
 		@include breakpoint( ">480px" ) {
 			margin-left: 2rem;

_inc/client/components/support-card/style.scss

@@ -6,7 +6,6 @@
 .jp-support-card__description {
 	font-size: rem( 14px);
 	line-height: 1.65;
-	color: $blue-text;
 
 	&:first-of-type {
 		margin-top: 4px;
@@ -67,7 +66,6 @@
 }
 
 .jp-support-card__header {
-	color: $blue-heading;
 	font-weight: 400;
 	font-size: rem( 21px );
 	margin: 0;

_inc/client/discussion/comments.jsx

@@ -99,7 +99,7 @@ class CommentsComponent extends React.Component {
 						</ModuleToggle>
 						<FormFieldset>
 							<FormLabel>
-								<span className="jp-form-label-wide">{ __( 'Comments headline' ) }</span>
+								<span className="jp-form-label-wide">{ __( 'Comment form introduction' ) }</span>
 								<TextInput
 									name={ 'highlander_comment_form_prompt' }
 									value={ this.props.getOptionValue( 'highlander_comment_form_prompt' ) }
@@ -112,7 +112,7 @@ class CommentsComponent extends React.Component {
 								/>
 							</FormLabel>
 							<span className="jp-form-setting-explanation">
-								{ __( 'A few catchy words to motivate your readers to comment.' ) }
+								{ __( 'A few catchy words to motivate your visitors to comment.' ) }
 							</span>
 							<FormLabel>
 								<span className="jp-form-label-wide">{ __( 'Color scheme' ) }</span>

_inc/client/discussion/index.jsx

@@ -61,7 +61,7 @@ export class Discussion extends React.Component {
 						this.props.searchTerm
 							? __( 'Discussion' )
 							: __(
-									'Open your site to comments and invite subscribers to get alerts about your latest work.'
+									'Manage advanced comment settings and grow your audience with email subscriptions.'
 							  )
 					}
 					className="jp-settings-description"

_inc/client/my-plan/style.scss

@@ -50,10 +50,11 @@
 
 .jp-landing__plan-features-card {
 	display: flex;
+	flex-basis: 32%;
 	flex-wrap: nowrap;
 	flex-grow: 1;
 	box-sizing: border-box;
-	max-width: 49.5%;
+	margin: rem( 8px );
 	background-color: $white;
 	box-shadow: 0 0 0 1px transparentize( lighten( $gray, 20% ), .5 ),
 		0 1px 2px lighten( $gray, 30% );
@@ -81,22 +82,22 @@
 }
 
 .jp-landing__plan-features-img {
-	width: 90px;
-	margin-right: 8px;
+	width: rem( 90px );
+	margin-right: rem( 8px );
 	line-height: 1;
 
 	@include breakpoint( ">960px" ) {
-		width: 120px;
-		margin-right: 18px;
+		width: rem( 120px );
+		margin-right: rem( 18px );
 	}
 }
 
 .jp-landing__plan-features-icon {
 	display: block;
-	margin-left: -8px;
+	margin-left: rem( -8px );
 
 	@include breakpoint( ">480px" ) {
-		margin-left: -16px;
+		margin-left: rem( -16px );
 	}
 }
 
@@ -111,9 +112,12 @@
 .jp-landing__plan-features {
 	display: flex;
 	flex-wrap: wrap;
+	flex-direction: row;
 	align-items: stretch;
 	justify-content: space-between;
 	margin-bottom: rem( 32px );
+	margin-left: rem( -8px );
+	margin-right: rem( -8px );
 
 	@include breakpoint( "<660px" ) {
 		display: block;
@@ -163,13 +167,13 @@
 }
 
 .jp-landing__plan-icon {
-	width: 82px;
+	width: rem( 82px );
 	position: relative;
-	left: -3px;
+	left: rem( -3px );
 
 	@include breakpoint( ">960px" ) {
-		width: 96px;
-		left: 2px;
+		width: rem( 96px );
+		left: rem( 2px );
 	}
 }
 

_inc/client/security/sso.jsx

@@ -75,7 +75,7 @@ export const SSO = withModuleSettingsFormHelpers(
 						<p>
 							{ __(
 								'Add an extra layer of security to your website by enabling WordPress.com log in and secure ' +
-									'authentication. If you have multiple sites with this option enabled, you will be able to log into every ' +
+									'authentication. If you have multiple sites with this option enabled, you will be able to log in to every ' +
 									'one of them with the same credentials.'
 							) }
 						</p>

_inc/client/sharing/index.jsx

@@ -57,7 +57,9 @@ class Sharing extends Component {
 					title={
 						this.props.searchTerm
 							? __( 'Sharing' )
-							: __( 'Share your content on social media and increase audience engagement.' )
+							: __(
+									'Share your content to social media, reaching new audiences and increasing engagement.'
+							  )
 					}
 					className="jp-settings-description"
 				/>

_inc/client/sharing/share-buttons.jsx

@@ -95,7 +95,7 @@ export const ShareButtons = withModuleSettingsFormHelpers(
 							toggling={ this.props.isSavingAnyOption( 'sharedaddy' ) }
 							toggleModule={ this.props.toggleModuleNow }
 						>
-							{ __( 'Add sharing buttons to your posts' ) }
+							{ __( 'Add sharing buttons to your posts and pages' ) }
 						</ModuleToggle>
 					</SettingsGroup>
 					{ isActive && configCard() }

_inc/client/traffic/shortlinks.jsx

@@ -39,7 +39,7 @@ class Shortlinks extends Component {
 						toggling={ this.props.isSavingAnyOption( 'shortlinks' ) }
 						toggleModule={ this.props.toggleModuleNow }
 					>
-						{ __( 'Create short and simple links for all posts and pages' ) }
+						{ __( 'Generate shortened URLs for simpler sharing.' ) }
 					</ModuleToggle>
 				</SettingsGroup>
 			</SettingsCard>

_inc/client/traffic/verification-services.jsx

@@ -100,7 +100,7 @@ class VerificationServicesComponent extends React.Component {
 						toggleModule={ this.props.toggleModuleNow }
 					>
 						<span className="jp-form-toggle-explanation">
-							{ __( 'Verify your site with various services' ) }
+							{ __( 'Verify site ownership with third party services' ) }
 						</span>
 					</ModuleToggle>
 					<p>

_inc/client/writing/index.jsx

@@ -84,9 +84,6 @@ export class Writing extends React.Component {
 					className="jp-settings-description"
 				/>
 				{ this.props.isModuleFound( 'carousel' ) && <WritingMedia { ...commonProps } /> }
-				{ this.props.isModuleFound( 'masterbar' ) && ! this.props.masterbarIsAlwaysActive && (
-					<Masterbar connectUrl={ this.props.connectUrl } { ...commonProps } />
-				) }
 				{ showComposing && (
 					<Composing { ...commonProps } userCanManageModules={ this.props.userCanManageModules } />
 				) }
@@ -103,6 +100,9 @@ export class Writing extends React.Component {
 						userCanManageModules={ this.props.userCanManageModules }
 					/>
 				) }
+				{ this.props.isModuleFound( 'masterbar' ) && ! this.props.masterbarIsAlwaysActive && (
+					<Masterbar connectUrl={ this.props.connectUrl } { ...commonProps } />
+				) }
 				{ ! showComposing && ! showPostByEmail && (
 					<Card>
 						{ __(

_inc/client/writing/masterbar.jsx

@@ -36,11 +36,10 @@ export const Masterbar = withModuleSettingsFormHelpers(
 					>
 						<p>
 							{ __(
-								'The WordPress.com toolbar replaces the default WordPress ' +
-									'admin toolbar and streamlines your WordPress experience. ' +
-									'It offers one-click access to manage all your sites, ' +
-									'update your WordPress.com profile, view notifications, ' +
-									'and catch up on the sites you follow in the Reader.'
+								'The WordPress.com toolbar replaces the default WordPress admin toolbar. ' +
+									'It offers one-click access to notifcations, your WordPress.com ' +
+									'profile and your other Jetpack and WordPress.com websites. ' +
+									'You can also catch up on the sites you follow in the Reader.'
 							) }
 						</p>
 						<ModuleToggle

_inc/lib/debugger/class-jetpack-debug-data.php

@@ -6,6 +6,7 @@
  */
 
 use Automattic\Jetpack\Constants;
+use Automattic\Jetpack\Sync\Sender;
 
 /**
  * Class Jetpack_Debug_Data
@@ -284,7 +285,7 @@ public static function debug_data() {
 			);
 		}
 
-		$queue = Jetpack_Sync_Sender::get_instance()->get_sync_queue();
+		$queue = Sender::get_instance()->get_sync_queue();
 
 		$debug_info['sync_size'] = array(
 			'label'   => 'Sync Queue Size',
@@ -297,7 +298,7 @@ public static function debug_data() {
 			'private' => false,
 		);
 
-		$full_sync_queue = Jetpack_Sync_Sender::get_instance()->get_full_sync_queue();
+		$full_sync_queue = Sender::get_instance()->get_full_sync_queue();
 
 		$debug_info['full_sync_size'] = array(
 			'label'   => 'Full Sync Queue Size',

class.jetpack-xmlrpc-server.php

@@ -1,6 +1,7 @@
 <?php
 
 use Automattic\Jetpack\Connection\Client;
+use Automattic\Jetpack\Sync\Sender;
 use Automattic\Jetpack\Tracking;
 
 /**
@@ -708,7 +709,7 @@ function sync_object( $args ) {
 		list( $module_name, $object_type, $id ) = $args;
 
 		$sync_module = Jetpack_Sync_Modules::get_module( $module_name );
-		$codec = Jetpack_Sync_Sender::get_instance()->get_codec();
+		$codec = Sender::get_instance()->get_codec();
 
 		return $codec->encode( $sync_module->get_object_by_id( $object_type, $id ) );
 	}

class.jetpack.php

@@ -6,6 +6,7 @@
 use Automattic\Jetpack\Connection\REST_Connector as REST_Connector;
 use Automattic\Jetpack\Connection\XMLRPC_Connector as XMLRPC_Connector;
 use Automattic\Jetpack\Constants;
+use Automattic\Jetpack\Sync\Sender;
 use Automattic\Jetpack\Tracking;
 
 /*
@@ -3288,7 +3289,7 @@ public static function disconnect( $update_activated_state = true ) {
 		delete_transient( $transient_key );
 
 		// Delete all the sync related data. Since it could be taking up space.
-		Jetpack_Sync_Sender::get_instance()->uninstall();
+		Sender::get_instance()->uninstall();
 
 		// Disable the Heartbeat cron
 		Jetpack_Heartbeat::init()->deactivate();

json-endpoints/jetpack/class.jetpack-json-api-get-post-backup-endpoint.php

@@ -17,14 +17,22 @@ function validate_input( $post_id ) {
 	}
 
 	protected function result() {
+		global $wpdb;
+
 		$post = get_post( $this->post_id );
 		if ( empty( $post ) ) {
 			return new WP_Error( 'post_not_found', __( 'Post not found', 'jetpack' ), 404 );
 		}
 
+		// Fetch terms associated with this post object
+		$terms = $wpdb->get_results( $wpdb->prepare(
+			"SELECT term_taxonomy_id, term_order FROM {$wpdb->term_relationships} WHERE object_id = %d;", $post->ID
+		) );
+
 		return array(
-			'post' => (array)$post,
-			'meta' => get_post_meta( $post->ID ),
+			'post'  => (array)$post,
+			'meta'  => get_post_meta( $post->ID ),
+			'terms' => (array)$terms,
 		);
 	}
 

json-endpoints/jetpack/class.jetpack-json-api-sync-endpoint.php

@@ -1,5 +1,7 @@
 <?php
 
+use Automattic\Jetpack\Sync\Sender;
+
 // POST /sites/%s/sync
 class Jetpack_JSON_API_Sync_Endpoint extends Jetpack_JSON_API_Endpoint {
 	protected $needed_capabilities = 'manage_options';
@@ -137,7 +139,7 @@ protected function result() {
 		$object_type = $args['object_type'];
 		$object_ids  = $args['object_ids'];
 
-		$codec = Jetpack_Sync_Sender::get_instance()->get_codec();
+		$codec = Sender::get_instance()->get_codec();
 
 		Jetpack_Sync_Settings::set_is_syncing( true );
 		$objects = $codec->encode( $sync_module->get_objects_by_id( $object_type, $object_ids ) );
@@ -159,7 +161,7 @@ protected function result() {
 			return $queue_name;
 		}
 
-		$sender = Jetpack_Sync_Sender::get_instance();
+		$sender = Sender::get_instance();
 		$response = $sender->do_sync_for_queue( new Jetpack_Sync_Queue( $args['queue'] ) );
 
 		return array(
@@ -187,7 +189,7 @@ protected function result() {
 			return new WP_Error( 'queue_size', 'The queue is empty and there is nothing to send', 400 );
 		}
 
-		$sender = Jetpack_Sync_Sender::get_instance();
+		$sender = Sender::get_instance();
 
 		// try to give ourselves as much time as possible
 		set_time_limit( 0 );

json-endpoints/jetpack/json-api-jetpack-endpoints.php

@@ -1061,8 +1061,9 @@
 		'$post' => '(int) The post ID',
 	),
 	'response_format' => array(
-		'post' => '(array) Post table row',
-		'meta' => '(array) Associative array of key/value postmeta data',
+		'post'  => '(array) Post table row',
+		'meta'  => '(array) Associative array of key/value postmeta data',
+		'terms' => '(array) List of terms attached to the post object',
 	),
 	'example_request_data' => array(
 		'headers' => array(

modules/calypsoify/_colors.scss

@@ -50,6 +50,7 @@ $gray-darken-30: $muriel-gray-600;
 
 // Alerts
 $alert-yellow:           $muriel-hot-yellow-400;
+$alert-orange:           $muriel-hot-orange-500;
 $alert-red:              $muriel-hot-red-400;
 $alert-green:            $muriel-hot-green-400;
 $alert-purple:           $muriel-hot-purple-400;

modules/calypsoify/style.scss

@@ -542,6 +542,10 @@ body,
 		font-size: 24px;
 		line-height: 1.45;
 	}
+
+	li#wp-admin-bar-recovery-mode {
+		background-color: $alert-orange !important;
+	}
 }
 
 /* WP Admin UI Mods */