diff --git a/addons/social_media/demo/res_company_demo.xml b/addons/social_media/demo/res_company_demo.xml index b095436bc60..7a62347e2bc 100644 --- a/addons/social_media/demo/res_company_demo.xml +++ b/addons/social_media/demo/res_company_demo.xml @@ -3,7 +3,6 @@ https://twitter.com/Odoo https://www.facebook.com/Odoo - https://plus.google.com/+Odooapps https://www.linkedin.com/company/odoo https://www.youtube.com/user/OpenERPonline https://github.com/odoo diff --git a/addons/social_media/models/res_company.py b/addons/social_media/models/res_company.py index a8dab798abb..6eb79ca0ddb 100644 --- a/addons/social_media/models/res_company.py +++ b/addons/social_media/models/res_company.py @@ -12,5 +12,4 @@ class Company(models.Model): social_github = fields.Char('GitHub Account') social_linkedin = fields.Char('LinkedIn Account') social_youtube = fields.Char('Youtube Account') - social_googleplus = fields.Char('Google+ Account') social_instagram = fields.Char('Instagram Account') diff --git a/addons/social_media/views/res_company_views.xml b/addons/social_media/views/res_company_views.xml index ae744abc4e4..1e48f713ac6 100644 --- a/addons/social_media/views/res_company_views.xml +++ b/addons/social_media/views/res_company_views.xml @@ -13,7 +13,6 @@ - diff --git a/addons/website/models/res_config_settings.py b/addons/website/models/res_config_settings.py index 0fff2f6eb3b..95c84dea10e 100644 --- a/addons/website/models/res_config_settings.py +++ b/addons/website/models/res_config_settings.py @@ -44,13 +44,12 @@ class ResConfigSettings(models.TransientModel): social_github = fields.Char(related='website_id.social_github', readonly=False) social_linkedin = fields.Char(related='website_id.social_linkedin', readonly=False) social_youtube = fields.Char(related='website_id.social_youtube', readonly=False) - social_googleplus = fields.Char(related='website_id.social_googleplus', readonly=False) social_instagram = fields.Char(related='website_id.social_instagram', readonly=False) - @api.depends('website_id', 'social_twitter', 'social_facebook', 'social_github', 'social_linkedin', 'social_youtube', 'social_googleplus', 'social_instagram') + @api.depends('website_id', 'social_twitter', 'social_facebook', 'social_github', 'social_linkedin', 'social_youtube', 'social_instagram') def has_social_network(self): self.has_social_network = self.social_twitter or self.social_facebook or self.social_github \ - or self.social_linkedin or self.social_youtube or self.social_googleplus or self.social_instagram + or self.social_linkedin or self.social_youtube or self.social_instagram def inverse_has_social_network(self): if not self.has_social_network: @@ -59,7 +58,6 @@ class ResConfigSettings(models.TransientModel): self.social_github = '' self.social_linkedin = '' self.social_youtube = '' - self.social_googleplus = '' self.social_instagram = '' has_social_network = fields.Boolean("Configure Social Network", compute=has_social_network, inverse=inverse_has_social_network) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index f8d8d652e72..2cfd7ab7a28 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -72,9 +72,6 @@ class Website(models.Model): def _default_social_youtube(self): return self.env.ref('base.main_company').social_youtube - def _default_social_googleplus(self): - return self.env.ref('base.main_company').social_googleplus - def _default_social_instagram(self): return self.env.ref('base.main_company').social_instagram @@ -92,7 +89,6 @@ class Website(models.Model): social_github = fields.Char('GitHub Account', default=_default_social_github) social_linkedin = fields.Char('LinkedIn Account', default=_default_social_linkedin) social_youtube = fields.Char('Youtube Account', default=_default_social_youtube) - social_googleplus = fields.Char('Google+ Account', default=_default_social_googleplus) social_instagram = fields.Char('Instagram Account', default=_default_social_instagram) social_default_image = fields.Binary(string="Default Social Share Image", help="If set, replaces the company logo as the default social share image.") diff --git a/addons/website/static/src/img/snippets_thumbs/s_share.png b/addons/website/static/src/img/snippets_thumbs/s_share.png old mode 100755 new mode 100644 index b1a7431d0b1..3ace714f8b8 Binary files a/addons/website/static/src/img/snippets_thumbs/s_share.png and b/addons/website/static/src/img/snippets_thumbs/s_share.png differ diff --git a/addons/website/static/src/js/content/snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js index 7acb36d284b..9a7b4ee8c14 100644 --- a/addons/website/static/src/js/content/snippets.animation.js +++ b/addons/website/static/src/js/content/snippets.animation.js @@ -997,7 +997,6 @@ registry.socialShare = publicWidget.Widget.extend({ this.$('.oe_social_facebook').click($.proxy(this._renderSocial, this, 'facebook')); this.$('.oe_social_twitter').click($.proxy(this._renderSocial, this, 'twitter')); this.$('.oe_social_linkedin').click($.proxy(this._renderSocial, this, 'linkedin')); - this.$('.oe_social_google-plus').click($.proxy(this._renderSocial, this, 'google-plus')); }, /** * @private @@ -1033,7 +1032,6 @@ registry.socialShare = publicWidget.Widget.extend({ 'facebook': 'https://www.facebook.com/sharer/sharer.php?u=' + url, 'twitter': 'https://twitter.com/intent/tweet?original_referer=' + url + '&text=' + encodeURIComponent(title + hashtags + ' - ') + url, 'linkedin': 'https://www.linkedin.com/shareArticle?mini=true&url=' + url + '&title=' + encodeURIComponent(title), - 'google-plus': 'https://plus.google.com/share?url=' + url, }; if (!_.contains(_.keys(socialNetworks), social)) { return; @@ -1055,7 +1053,7 @@ registry.socialShare = publicWidget.Widget.extend({ */ _onMouseEnter: function () { var social = this.$el.data('social'); - this.socialList = social ? social.split(',') : ['facebook', 'twitter', 'linkedin', 'google-plus']; + this.socialList = social ? social.split(',') : ['facebook', 'twitter', 'linkedin']; this.hashtags = this.$el.data('hashtags') || ''; this._render(); diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml index 4c3f7e6c296..fe1592bc35b 100644 --- a/addons/website/views/res_config_settings_views.xml +++ b/addons/website/views/res_config_settings_views.xml @@ -265,10 +265,6 @@