diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index ac95ee0f2..63143ec52 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -164,35 +164,37 @@ <% end %> - <% if @proposal.published? %> - -

<%= t("votes.supports") %>

-
- <% if @proposal.successful? %> -

- <%= t("proposals.proposal.successful", - voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %> +

+

<%= t("votes.supports") %>

+
+ <% if @proposal.draft? %> +

<%= t '.draft' %>

+ <% elsif @proposal.successful? %> +

+ <%= t("proposals.proposal.successful", + voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %> +

+ <% if can? :create, Poll::Question %> +

+ <%= link_to t('poll_questions.create_question'), + new_admin_question_path(proposal_id: @proposal.id), + class: "button hollow expanded" %>

- <% if can? :create, Poll::Question %> -

- <%= link_to t('poll_questions.create_question'), - new_admin_question_path(proposal_id: @proposal.id), - class: "button hollow expanded" %> -

- <% end %> - <% elsif @proposal.archived? %> -
-

- <%= t("proposals.proposal.supports", count: @proposal.total_votes) %> -

-

<%= t("proposals.proposal.archived") %>

-
- <% else %> - <%= render 'votes', - { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %> <% end %> -
- <% end %> + <% elsif @proposal.archived? %> +
+

+ <%= t("proposals.proposal.supports", count: @proposal.total_votes) %> +

+

<%= t("proposals.proposal.archived") %>

+
+ <% else %> + <%= render 'votes', + { 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, diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 868c85a53..6eb2e2e62 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -470,6 +470,7 @@ en: zero: No comments comments_tab: Comments dashboard_proposal_link: Dashboard + draft: Draft flag: This proposal has been flagged as inappropriate by several users. login_to_comment: You must %{signin} or %{signup} to leave a comment. notifications_tab: Notifications diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 66e8fa55a..1370070e4 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -470,6 +470,7 @@ es: other: "%{count} Comentarios" comments_tab: Comentarios dashboard_proposal_link: Panel de control + draft: En borrador flag: Esta propuesta ha sido marcada como inapropiada por varios usuarios. login_to_comment: Necesitas %{signin} o %{signup} para comentar. notifications_tab: Notificaciones