From 520563d54fbaef3108297c82d0506e57531deb03 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 30 May 2017 22:42:52 +0200 Subject: [PATCH] Add proposal improvement info link to share page, and make it option through Setting variable --- app/controllers/proposals_controller.rb | 3 +++ app/views/proposals/share.html.erb | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 6d17908ad..33497dd26 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -57,6 +57,9 @@ class ProposalsController < ApplicationController end def share + if Setting['proposal_improvement_url'].present? + @proposal_improvement_url = root_url + Setting['proposal_improvement_url'] + end end def vote_featured diff --git a/app/views/proposals/share.html.erb b/app/views/proposals/share.html.erb index c6c9be207..d1538e524 100644 --- a/app/views/proposals/share.html.erb +++ b/app/views/proposals/share.html.erb @@ -22,7 +22,6 @@ <%= @proposal.code %>

-

<%= t("proposals.proposal.share.guide").html_safe %>

<%= render partial: 'shared/social_share', locals: { @@ -30,11 +29,17 @@ url: proposal_url(@proposal) } %> - +
- <%= link_to proposal_path(@proposal), class: 'proposal button hollow float-right' do %> + <% if @proposal_improvement_url.present? %> +

<%= t('proposals.proposal.improve_info', improve_info_link: link_to(t('proposals.proposal.improve_info_link'), @proposal_improvement_url)).html_safe %>

+ <% end %> + +

+ <%= link_to proposal_path(@proposal), class: 'proposal' do %> <%= t("proposals.proposal.share.view_proposal") %> <% end %> +