diff --git a/app/views/proposals/_social_share.html.erb b/app/views/proposals/_social_share.html.erb new file mode 100644 index 000000000..b675fe192 --- /dev/null +++ b/app/views/proposals/_social_share.html.erb @@ -0,0 +1,10 @@ +<%= render 'shared/social_share', + share_title: share_title, + title: proposal.title, + url: proposal_url(proposal), + description: t("proposals.share.message", + summary: proposal.summary, + org: setting['org_name']), + mobile: t("proposals.share.message_mobile", + summary: proposal.summary, + handle: setting['twitter_handle']) %> diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb index 92b680493..6624448fe 100644 --- a/app/views/proposals/_votes.html.erb +++ b/app/views/proposals/_votes.html.erb @@ -10,7 +10,8 @@ <%= t("proposals.proposal.supports", count: proposal.total_votes) %> - <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %> + <%= t("proposals.proposal.supports_necessary", + number: number_with_delimiter(Proposal.votes_needed_for_success)) %> @@ -60,11 +61,7 @@ <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %>
<% end %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 9794c0365..2c40a7075 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -192,12 +192,8 @@ { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %> <% end %> - <%= render partial: 'shared/social_share', locals: { - share_title: t("proposals.show.share"), - title: @proposal.title, - url: proposal_url(@proposal), - description: @proposal.summary - } %> + + <%= render 'proposals/social_share', proposal: @proposal, share_title: t("proposals.show.share") %> <% if current_user %> diff --git a/app/views/shared/_social_share.html.erb b/app/views/shared/_social_share.html.erb index 7148f4f0a..f2346c30c 100644 --- a/app/views/shared/_social_share.html.erb +++ b/app/views/shared/_social_share.html.erb @@ -1,13 +1,17 @@ +<% description = local_assigns.fetch(:description, '') %> +<% description = truncate(ActionView::Base.full_sanitizer.sanitize(description), length: 140) %> <% if local_assigns[:share_title].present? %> <% end %>