From e0480675ed8609ee6c605d14701c189955d6813a Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 7 Mar 2018 13:38:43 +0100 Subject: [PATCH] Replaces hardcoded social share buttons tag with correct partial --- app/views/budgets/investments/_votes.html.erb | 8 ++++++-- app/views/legislation/proposals/_featured_votes.html.erb | 6 +++++- app/views/legislation/proposals/_votes.html.erb | 6 +++++- app/views/proposals/_featured_votes.html.erb | 6 +++++- app/views/proposals/_votes.html.erb | 6 +++++- app/views/spending_proposals/_votes.html.erb | 8 +++++--- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/app/views/budgets/investments/_votes.html.erb b/app/views/budgets/investments/_votes.html.erb index 39bb95fdb..8f5241f4c 100644 --- a/app/views/budgets/investments/_votes.html.erb +++ b/app/views/budgets/investments/_votes.html.erb @@ -40,8 +40,12 @@ <% if user_voted_for && setting['twitter_handle'] %>
- <%= social_share_button_tag("#{investment.title} #{setting['twitter_hashtag']}", - url: budget_investment_url(investment.budget, investment), via: setting['twitter_handle']) %> + <%= render partial: 'shared/social_share', locals: { + title: investment.title, + image_url: image_absolute_url(investment.image, :thumb), + url: budget_investment_url(investment.budget, investment), + description: investment.title + } %>
<% end %> diff --git a/app/views/legislation/proposals/_featured_votes.html.erb b/app/views/legislation/proposals/_featured_votes.html.erb index 3177812a4..719782387 100644 --- a/app/views/legislation/proposals/_featured_votes.html.erb +++ b/app/views/legislation/proposals/_featured_votes.html.erb @@ -37,7 +37,11 @@ <% if voted_for?(@featured_proposals_votes, proposal) %> <% if setting['twitter_handle'] %>
- <%= social_share_button_tag("#{proposal.title} #{setting['twitter_hashtag']}", url: proposal_url(proposal), via: setting['twitter_handle']) %> + <%= render partial: 'shared/social_share', locals: { + title: proposal.title, + url: proposal_url(proposal), + description: proposal.summary + } %>
<% end %> <% end %> diff --git a/app/views/legislation/proposals/_votes.html.erb b/app/views/legislation/proposals/_votes.html.erb index f56c0ead2..8452bed9f 100644 --- a/app/views/legislation/proposals/_votes.html.erb +++ b/app/views/legislation/proposals/_votes.html.erb @@ -72,7 +72,11 @@ <% if voted_for?(@legislation_proposal_votes, proposal) && setting['twitter_handle'] %>
- <%= social_share_button_tag("#{proposal.title} #{setting['twitter_hashtag']}", url: proposal_url(proposal), via: setting['twitter_handle']) %> + <%= render partial: 'shared/social_share', locals: { + title: proposal.title, + url: proposal_url(proposal), + description: proposal.summary + } %>
<% end %> diff --git a/app/views/proposals/_featured_votes.html.erb b/app/views/proposals/_featured_votes.html.erb index 3177812a4..719782387 100644 --- a/app/views/proposals/_featured_votes.html.erb +++ b/app/views/proposals/_featured_votes.html.erb @@ -37,7 +37,11 @@ <% if voted_for?(@featured_proposals_votes, proposal) %> <% if setting['twitter_handle'] %>
- <%= social_share_button_tag("#{proposal.title} #{setting['twitter_hashtag']}", url: proposal_url(proposal), via: setting['twitter_handle']) %> + <%= render partial: 'shared/social_share', locals: { + title: proposal.title, + url: proposal_url(proposal), + description: proposal.summary + } %>
<% end %> <% end %> diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb index fb41357af..98723513c 100644 --- a/app/views/proposals/_votes.html.erb +++ b/app/views/proposals/_votes.html.erb @@ -60,7 +60,11 @@ <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %>
- <%= social_share_button_tag("#{proposal.title} #{setting['twitter_hashtag']}", url: proposal_url(proposal), via: setting['twitter_handle']) %> + <%= render partial: 'shared/social_share', locals: { + title: proposal.title, + url: proposal_url(proposal), + description: proposal.summary + } %>
<% end %> diff --git a/app/views/spending_proposals/_votes.html.erb b/app/views/spending_proposals/_votes.html.erb index e14d19bcb..647f4ff88 100644 --- a/app/views/spending_proposals/_votes.html.erb +++ b/app/views/spending_proposals/_votes.html.erb @@ -36,8 +36,10 @@ <% end %> <% if user_voted_for && setting['twitter_handle'] %> -
- <%= social_share_button_tag("#{spending_proposal.title} #{setting['twitter_hashtag']}", url: spending_proposal_url(spending_proposal), via: setting['twitter_handle']) %> -
+ <%= render partial: 'shared/social_share', locals: { + title: spending_proposal.title, + url: spending_proposal_url(spending_proposal), + description: spending_proposal.title + } %> <% end %>