Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Google+ buttons #1667

Merged
merged 5 commits into from
Apr 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ This release contains bug fixes for Largo 0.6.
- Updates INN's logos in the `img/` folder. If your child theme redefines the function `inn_logo()`, please update that function to reference the new SVG image locations in `img/`. [Pull request #1633](https://github.com/INN/largo/pull/1633) for [issue #1621](https://github.com/INN/largo/issues/1631)
- Adds the term's taxonomy slug and term slug in the format `taxonomy-term` as a class on the term in the output of `largo_top_term()`, `largo_category_and_tags()`, and `largo_maybe_top_term()`. [Pull request](https://github.com/INN/largo/pull/1648) for [issue #1646](https://github.com/INN/largo/issues/1646).
- The arguments set on `largo_byline()` are now passed to the `largo_byline` filter as an array of argument name => argument value. [Pull request #1657](https://github.com/INN/largo/pull/1657) for [issue #1646](https://github.com/INN/largo/issues/1656).
- Removed all Google+ profile fields in the admin interface and buttons on the front-end due to [Google+ being shut down](https://support.google.com/plus/answer/9217723#whatshappening) on April 2, 2019. [Pull request #1667](https://github.com/INN/largo/pull/1667) for [issue #1546](https://github.com/INN/largo/issues/1546).

### Fixes

Expand Down
10 changes: 1 addition & 9 deletions css/editor-style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/editor-style.min.css

Large diffs are not rendered by default.

14 changes: 1 addition & 13 deletions css/style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/style.min.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion inc/header-footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ function largo_social_links() {
$networks = array(
'facebook' => __( 'Link to Facebook Profile', 'largo' ),
'twitter' => __( 'Link to Twitter Page', 'largo' ),
'gplus' => __( 'Link to Google Plus Page', 'largo' ),
'youtube' => __( 'Link to YouTube Page', 'largo' ),
'instagram' => __( 'Link to Instagram Page', 'largo' ),
'tumblr' => __( 'Link to Tumblr', 'largo' ),
Expand Down
4 changes: 0 additions & 4 deletions inc/open-graph.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ function largo_opengraph() {
if ( $thumbnailURL )
echo '<meta property="og:image" content="' . esc_url( $thumbnailURL ) . '" />';

// google author/publisher markup
// see: https://support.google.com/webmasters/answer/1408986
if ( of_get_option( 'gplus_link' ) )
echo '<link href="' . esc_url( of_get_option( 'gplus_link' ) ) . '" rel="publisher" />';
}
}
// don't add this if Yoast is active
Expand Down
8 changes: 0 additions & 8 deletions inc/users.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ function largo_contactmethods( $contactmethods ) {
$contactmethods[$service] = $format;
}

// Add a format hint for G+
$contactmethods['googleplus'] = 'Google+<br><em>https://plus.google.com/userID/</em>';

return $contactmethods;
}
add_filter( 'user_contactmethods', 'largo_contactmethods' );
Expand Down Expand Up @@ -65,11 +62,6 @@ function largo_filter_guest_author_fields( $fields_to_return, $groups ) {
'label' => 'LinkedIn<br><em>http://www.linkedin.com/in/username</em>',
'group' => 'contact-info',
);
$fields_to_return[] = array(
'key' => 'googleplus',
'label' => 'Google+<br><em>https://plus.google.com/userID/</em>',
'group' => 'contact-info',
);
$fields_to_return[] = array(
'key' => 'show_email',
'label' => 'Show Email Address',
Expand Down
1 change: 0 additions & 1 deletion inc/widgets/largo-follow.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ function widget( $args, $instance ) {
$networks = array(
'facebook' => 'Like Us on Facebook',
'twitter' => 'Follow Us on Twitter',
'gplus' => 'Follow Us on Google+',
'youtube' => 'Follow Us on YouTube',
'instagram' => 'Follow Us on Instagram',
'linkedin' => 'Find Us on LinkedIn',
Expand Down
12 changes: 0 additions & 12 deletions js/largoCore.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,6 @@ jQuery(document).ready(function($) {
});
},

// Handle the Google+ service
do_googleplus: function( data ) {
var url = 'https://plus.google.com/share?' + $.param({
url: data.url
});

this.popup({
url: url,
name: 'googleplus_share'
});
},

// Handle the LinkedIn service
do_linkedin: function( data ) {
var url = 'http://www.linkedin.com/shareArticle?' + $.param({
Expand Down
1 change: 0 additions & 1 deletion less/inc/icons.less
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
.icon-spinner:before { content: '\61'; } /* 'a' */
.icon-map:before { content: '\e809'; } /* '' */
.icon-share:before { content: '\e80a'; } /* '' */
.icon-gplus:before { content: '\62'; } /* 'b' */
.icon-pinterest:before { content: '\63'; } /* 'c' */
.icon-cc:before { content: '\64'; } /* 'd' */
.icon-flickr:before { content: '\65'; } /* 'e' */
Expand Down
3 changes: 0 additions & 3 deletions less/inc/single.less
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,6 @@ h2.subtitle {
.linkedin {
.socialButton (@linkedin);
}
.gplus {
.socialButton (@gplus);
}
.flickr {
.socialButton (@flickr);
}
Expand Down
1 change: 0 additions & 1 deletion less/inc/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
@facebook: #3a5795;
@twitter: #55acee;
@youtube: #e52d27;
@gplus: #dd4b39;
@flickr: #ff0084;
@linkedin: #007bb6;
@tumblr: #35465c;
Expand Down
6 changes: 0 additions & 6 deletions options.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,6 @@ function optionsframework_options() {
'std' => '',
'type' => 'text');

$options[] = array(
'desc' => __('<strong>Link to Google+ Page</strong> (https://plus.google.com/userID/)', 'largo'),
'id' => 'gplus_link',
'std' => '',
'type' => 'text');

$options[] = array(
'desc' => __('<strong>Link to YouTube Channel</strong> (http://www.youtube.com/user/username)', 'largo'),
'id' => 'youtube_link',
Expand Down
6 changes: 0 additions & 6 deletions partials/author-bio-social-links.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@
</li>
<?php } ?>

<?php if ( $googleplus = $author_obj->googleplus ) { ?>
<li class="gplus">
<a href="<?php echo esc_url( $googleplus ); ?>" title="<?php echo esc_attr( $author_obj->display_name ); ?> on Google+" rel="me"><i class="icon-gplus"></i></a>
</li>
<?php } ?>

<?php if ( $linkedin = $author_obj->linkedin ) { ?>
<li class="linkedin">
<a href="<?php echo esc_url( $linkedin ); ?>" title="<?php echo esc_attr( $author_obj->display_name ); ?> on LinkedIn"><i class="icon-linkedin"></i></a>
Expand Down
1 change: 0 additions & 1 deletion tests/inc/test-header-footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ function test_largo_social_links() {
'youtube_link',
'flickr_link',
'tumblr_link',
'gplus_link',
'linkedin_link',
'github_link'
);
Expand Down