From f42cec4c417828cbe3ede6b42e85b59a253b9db8 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 30 May 2017 12:25:10 +0200 Subject: [PATCH 1/2] Create shared partial for Social Share block --- app/views/shared/_social_share.html.erb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 app/views/shared/_social_share.html.erb diff --git a/app/views/shared/_social_share.html.erb b/app/views/shared/_social_share.html.erb new file mode 100644 index 000000000..c911d8e76 --- /dev/null +++ b/app/views/shared/_social_share.html.erb @@ -0,0 +1,10 @@ + +

<%= share_title %>

+
+ <%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}") %> + + + <%= t("social.whatsapp") %> + +
From f03e2ec236cb04130042f7e190812b41bdd8b253 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 30 May 2017 12:26:04 +0200 Subject: [PATCH 2/2] Use shared social_share partial on every view that was using duplicated code --- .../budgets/investments/_investment_show.html.erb | 15 +++++---------- app/views/debates/show.html.erb | 15 +++++---------- app/views/polls/show.html.erb | 15 +++++---------- app/views/proposals/show.html.erb | 15 +++++---------- app/views/spending_proposals/show.html.erb | 15 +++++---------- 5 files changed, 25 insertions(+), 50 deletions(-) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index a6a4fe8cb..42a8b9f26 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -107,16 +107,11 @@

<% end %> - -

<%= t("budgets.investments.show.share") %>

- + <%= render partial: 'shared/social_share', locals: { + share_title: t("budgets.investments.show.share"), + title: investment.title, + url: budget_investment_url(budget_id: investment.budget_id, id: investment.id) + } %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 7ca7b0e35..0a57b2997 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -52,16 +52,11 @@
<%= render 'debates/votes', debate: @debate %>
-
-

<%= t("debates.show.share") %>

- + <%= render partial: 'shared/social_share', locals: { + share_title: t("debates.show.share"), + title: @debate.title, + url: debate_url(@debate) + } %> diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 8178928b6..27c241d6f 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -38,16 +38,11 @@ diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 93a3e2f73..2cfddb6b1 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -131,16 +131,11 @@ { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %> <% end %> - -

<%= t("proposals.show.share") %>

- + <%= render partial: 'shared/social_share', locals: { + share_title: t("proposals.show.share"), + title: @proposal.title, + url: proposal_url(@proposal) + } %> diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb index b6a1f6e83..1b72a1368 100644 --- a/app/views/spending_proposals/show.html.erb +++ b/app/views/spending_proposals/show.html.erb @@ -40,16 +40,11 @@ { spending_proposal: @spending_proposal, vote_url: vote_spending_proposal_path(@spending_proposal, value: 'yes') } %> -
-

<%= t("spending_proposals.show.share") %>

- + <%= render partial: 'shared/social_share', locals: { + share_title: t("spending_proposals.show.share"), + title: @spending_proposal.title, + url: spending_proposal_url(@spending_proposal) + } %>