From 57adeca23f164e98898b1bb9138a1ed39a51f8b6 Mon Sep 17 00:00:00 2001 From: Chase Livingston Date: Sat, 17 Sep 2016 16:12:07 -0700 Subject: [PATCH 1/5] Add WordPress.org profile to Social Media Icons widget --- modules/widgets/social-media-icons.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/widgets/social-media-icons.php b/modules/widgets/social-media-icons.php index 4a40818fc4b03..7efd724710053 100644 --- a/modules/widgets/social-media-icons.php +++ b/modules/widgets/social-media-icons.php @@ -58,6 +58,7 @@ public function __construct() { 'vimeo_username' => '', 'googleplus_username' => '', 'flickr_username' => '', + 'wordpress_username' => '', ); $this->services = array( 'facebook' => array( 'Facebook', 'https://www.facebook.com/%s/' ), @@ -70,6 +71,7 @@ public function __construct() { 'vimeo' => array( 'Vimeo', 'https://vimeo.com/%s/' ), 'googleplus' => array( 'Google+', 'https://plus.google.com/u/0/%s/' ), 'flickr' => array( 'Flickr', 'https://www.flickr.com/photos/%s/' ), + 'wordpress' => array( 'WordPress', 'https://profiles.wordpress.org/%s/' ), ); if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) { add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ) ); From 61a89a3437540443c1f22f59c6afa2f73e02e7ec Mon Sep 17 00:00:00 2001 From: Chase Livingston Date: Mon, 26 Sep 2016 12:40:07 -0400 Subject: [PATCH 2/5] Include org to avoid confusion with .com --- modules/widgets/social-media-icons.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/widgets/social-media-icons.php b/modules/widgets/social-media-icons.php index 7efd724710053..2470580e95e61 100644 --- a/modules/widgets/social-media-icons.php +++ b/modules/widgets/social-media-icons.php @@ -58,7 +58,7 @@ public function __construct() { 'vimeo_username' => '', 'googleplus_username' => '', 'flickr_username' => '', - 'wordpress_username' => '', + 'wordpressorg_username' => '', ); $this->services = array( 'facebook' => array( 'Facebook', 'https://www.facebook.com/%s/' ), @@ -71,7 +71,7 @@ public function __construct() { 'vimeo' => array( 'Vimeo', 'https://vimeo.com/%s/' ), 'googleplus' => array( 'Google+', 'https://plus.google.com/u/0/%s/' ), 'flickr' => array( 'Flickr', 'https://www.flickr.com/photos/%s/' ), - 'wordpress' => array( 'WordPress', 'https://profiles.wordpress.org/%s/' ), + 'wordpressorg' => array( 'WordPress.org', 'https://profiles.wordpress.org/%s/' ), ); if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) { add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ) ); From b18bd2f6d850c5260e7fcdcff157ea1c0bb4eb43 Mon Sep 17 00:00:00 2001 From: Chase Livingston Date: Mon, 26 Sep 2016 12:42:30 -0400 Subject: [PATCH 3/5] Remove errant commit --- modules/subscriptions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/subscriptions.php b/modules/subscriptions.php index 857a8ee53e6f5..8b420efc7dc2f 100644 --- a/modules/subscriptions.php +++ b/modules/subscriptions.php @@ -976,7 +976,7 @@ public static function defaults() { 'subscribe_text' => esc_html__( 'Enter your email address to subscribe to this blog and receive notifications of new posts by email.', 'jetpack' ), 'subscribe_placeholder' => esc_html__( 'Email Address', 'jetpack' ), 'subscribe_button' => esc_html__( 'Subscribe', 'jetpack' ), - 'success_message' => esc_html__( "Success! An email was just sent to confirm your subscription. Please find the email now and click 'Confirm Follow' to start subscribing.", 'jetpack' ), + 'success_message' => esc_html__( 'Success! An email was just sent to confirm your subscription. Please find the email now and click activate to start subscribing.', 'jetpack' ), 'show_subscribers_total' => true, ); } From df6f3f72896f7cb3231502db208a5faec585c0ef Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Thu, 27 Oct 2016 19:34:47 +0000 Subject: [PATCH 4/5] Social Media Icons Widget: add spaces for correct indentation. --- modules/subscriptions.php | 2 +- modules/widgets/social-media-icons.php | 42 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/subscriptions.php b/modules/subscriptions.php index 8b420efc7dc2f..857a8ee53e6f5 100644 --- a/modules/subscriptions.php +++ b/modules/subscriptions.php @@ -976,7 +976,7 @@ public static function defaults() { 'subscribe_text' => esc_html__( 'Enter your email address to subscribe to this blog and receive notifications of new posts by email.', 'jetpack' ), 'subscribe_placeholder' => esc_html__( 'Email Address', 'jetpack' ), 'subscribe_button' => esc_html__( 'Subscribe', 'jetpack' ), - 'success_message' => esc_html__( 'Success! An email was just sent to confirm your subscription. Please find the email now and click activate to start subscribing.', 'jetpack' ), + 'success_message' => esc_html__( "Success! An email was just sent to confirm your subscription. Please find the email now and click 'Confirm Follow' to start subscribing.", 'jetpack' ), 'show_subscribers_total' => true, ); } diff --git a/modules/widgets/social-media-icons.php b/modules/widgets/social-media-icons.php index 2470580e95e61..13824a55c6d8f 100644 --- a/modules/widgets/social-media-icons.php +++ b/modules/widgets/social-media-icons.php @@ -47,30 +47,30 @@ public function __construct() { ) ); $this->defaults = array( - 'title' => __( 'Social', 'jetpack' ), - 'facebook_username' => '', - 'twitter_username' => '', - 'instagram_username' => '', - 'pinterest_username' => '', - 'linkedin_username' => '', - 'github_username' => '', - 'youtube_username' => '', - 'vimeo_username' => '', - 'googleplus_username' => '', - 'flickr_username' => '', + 'title' => __( 'Social', 'jetpack' ), + 'facebook_username' => '', + 'twitter_username' => '', + 'instagram_username' => '', + 'pinterest_username' => '', + 'linkedin_username' => '', + 'github_username' => '', + 'youtube_username' => '', + 'vimeo_username' => '', + 'googleplus_username' => '', + 'flickr_username' => '', 'wordpressorg_username' => '', ); $this->services = array( - 'facebook' => array( 'Facebook', 'https://www.facebook.com/%s/' ), - 'twitter' => array( 'Twitter', 'https://twitter.com/%s/' ), - 'instagram' => array( 'Instagram', 'https://instagram.com/%s/' ), - 'pinterest' => array( 'Pinterest', 'https://www.pinterest.com/%s/' ), - 'linkedin' => array( 'LinkedIn', 'https://www.linkedin.com/in/%s/' ), - 'github' => array( 'GitHub', 'https://github.com/%s/' ), - 'youtube' => array( 'YouTube', 'https://www.youtube.com/%s/' ), - 'vimeo' => array( 'Vimeo', 'https://vimeo.com/%s/' ), - 'googleplus' => array( 'Google+', 'https://plus.google.com/u/0/%s/' ), - 'flickr' => array( 'Flickr', 'https://www.flickr.com/photos/%s/' ), + 'facebook' => array( 'Facebook', 'https://www.facebook.com/%s/' ), + 'twitter' => array( 'Twitter', 'https://twitter.com/%s/' ), + 'instagram' => array( 'Instagram', 'https://instagram.com/%s/' ), + 'pinterest' => array( 'Pinterest', 'https://www.pinterest.com/%s/' ), + 'linkedin' => array( 'LinkedIn', 'https://www.linkedin.com/in/%s/' ), + 'github' => array( 'GitHub', 'https://github.com/%s/' ), + 'youtube' => array( 'YouTube', 'https://www.youtube.com/%s/' ), + 'vimeo' => array( 'Vimeo', 'https://vimeo.com/%s/' ), + 'googleplus' => array( 'Google+', 'https://plus.google.com/u/0/%s/' ), + 'flickr' => array( 'Flickr', 'https://www.flickr.com/photos/%s/' ), 'wordpressorg' => array( 'WordPress.org', 'https://profiles.wordpress.org/%s/' ), ); if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) { From 935047b498c3df908650dc0df357b3f47b181684 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Thu, 27 Oct 2016 19:45:54 +0000 Subject: [PATCH 5/5] Revert "Include org to avoid confusion with .com" This reverts commit 011f57fde4a1e25750ae3178e971d0fe815addc8. I didn't think of the consequences when suggesting renaming to `wordpressorg`. While it is more specific, it then breaks the display of the WordPress logo since Genericons use the `wordpress` class to display the logo. Let's then have WordPress.org be the default `wordpress`. --- modules/widgets/social-media-icons.php | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/widgets/social-media-icons.php b/modules/widgets/social-media-icons.php index 13824a55c6d8f..c44ec0bc5401c 100644 --- a/modules/widgets/social-media-icons.php +++ b/modules/widgets/social-media-icons.php @@ -47,31 +47,31 @@ public function __construct() { ) ); $this->defaults = array( - 'title' => __( 'Social', 'jetpack' ), - 'facebook_username' => '', - 'twitter_username' => '', - 'instagram_username' => '', - 'pinterest_username' => '', - 'linkedin_username' => '', - 'github_username' => '', - 'youtube_username' => '', - 'vimeo_username' => '', - 'googleplus_username' => '', - 'flickr_username' => '', - 'wordpressorg_username' => '', + 'title' => __( 'Social', 'jetpack' ), + 'facebook_username' => '', + 'twitter_username' => '', + 'instagram_username' => '', + 'pinterest_username' => '', + 'linkedin_username' => '', + 'github_username' => '', + 'youtube_username' => '', + 'vimeo_username' => '', + 'googleplus_username' => '', + 'flickr_username' => '', + 'wordpress_username' => '', ); $this->services = array( - 'facebook' => array( 'Facebook', 'https://www.facebook.com/%s/' ), - 'twitter' => array( 'Twitter', 'https://twitter.com/%s/' ), - 'instagram' => array( 'Instagram', 'https://instagram.com/%s/' ), - 'pinterest' => array( 'Pinterest', 'https://www.pinterest.com/%s/' ), - 'linkedin' => array( 'LinkedIn', 'https://www.linkedin.com/in/%s/' ), - 'github' => array( 'GitHub', 'https://github.com/%s/' ), - 'youtube' => array( 'YouTube', 'https://www.youtube.com/%s/' ), - 'vimeo' => array( 'Vimeo', 'https://vimeo.com/%s/' ), - 'googleplus' => array( 'Google+', 'https://plus.google.com/u/0/%s/' ), - 'flickr' => array( 'Flickr', 'https://www.flickr.com/photos/%s/' ), - 'wordpressorg' => array( 'WordPress.org', 'https://profiles.wordpress.org/%s/' ), + 'facebook' => array( 'Facebook', 'https://www.facebook.com/%s/' ), + 'twitter' => array( 'Twitter', 'https://twitter.com/%s/' ), + 'instagram' => array( 'Instagram', 'https://instagram.com/%s/' ), + 'pinterest' => array( 'Pinterest', 'https://www.pinterest.com/%s/' ), + 'linkedin' => array( 'LinkedIn', 'https://www.linkedin.com/in/%s/' ), + 'github' => array( 'GitHub', 'https://github.com/%s/' ), + 'youtube' => array( 'YouTube', 'https://www.youtube.com/%s/' ), + 'vimeo' => array( 'Vimeo', 'https://vimeo.com/%s/' ), + 'googleplus' => array( 'Google+', 'https://plus.google.com/u/0/%s/' ), + 'flickr' => array( 'Flickr', 'https://www.flickr.com/photos/%s/' ), + 'wordpress' => array( 'WordPress.org', 'https://profiles.wordpress.org/%s/' ), ); if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) { add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ) );