diff --git a/app/views/proposals/_support_status.html.erb b/app/views/proposals/_support_status.html.erb new file mode 100644 index 000000000..21fd09dc9 --- /dev/null +++ b/app/views/proposals/_support_status.html.erb @@ -0,0 +1,43 @@ +<% if proposal.selected? %> +
+ <%= t("proposals.proposal.selected") %> +
+<% else %> +
+
+
+ +

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

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

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

+
+ <% elsif proposal.successful? %> +
+ <%= render "supports", proposal: proposal %> +
+ <% 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 %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index f405f15af..596c9624e 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -2,12 +2,12 @@ <% provide :title do %><%= @proposal.title %><% end %> <% content_for :meta_description do %><%= @proposal.summary %><% end %> <% provide :social_media_meta_tags do %> -<%= render "shared/social_media_meta_tags", - social_url: proposal_url(@proposal), - social_title: @proposal.title, - social_description: @proposal.summary, - twitter_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil), - og_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil) %> + <%= render "shared/social_media_meta_tags", + social_url: proposal_url(@proposal), + social_title: @proposal.title, + social_description: @proposal.summary, + twitter_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil), + og_image_url: (@proposal.image.present? ? @proposal.image_url(:thumb) : nil) %> <% end %> <% content_for :canonical do %> <%= render "shared/canonical", href: proposal_url(@proposal) %> @@ -62,50 +62,7 @@ <% end %> - <% if @proposal.selected? %> -
- <%= t("proposals.proposal.selected") %> -
- <% else %> -
-
-
- -

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

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

<%= t(".draft") %>

-
- <% elsif @proposal.successful? %> -
- <%= render "supports", proposal: @proposal %> -
- <% 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 %> + <%= render "proposals/support_status", proposal: @proposal %> <%= render "proposals/social_share", proposal: @proposal, share_title: t("proposals.show.share") %>