Show completed progress bar for successful proposals

Show a completed progress bar with total supports intead of showing
a message telling the proposal has reached the needed supports.
This commit is contained in:
Julian Herrero
2019-05-10 13:13:11 +02:00
parent db774e3fd2
commit 6beb11f0a9
5 changed files with 19 additions and 19 deletions

View File

@@ -83,8 +83,8 @@ module ProposalsHelper
link_to button_text, path, remote: true, method: :patch, class: html_class
end
def css_for_proposal_info_row
if feature?(:allow_images)
def css_for_proposal_info_row(proposal)
if proposal.image.present?
if params[:selected].present?
"small-12 medium-9 column"
else

View File

@@ -12,10 +12,10 @@
alt: proposal.image.title.unicode_normalize %>
</div>
<div class="<%= css_for_proposal_info_row %>">
<div class="<%= css_for_proposal_info_row(proposal) %>">
<% else %>
<div class="row">
<div class="<%= css_for_proposal_info_row %>">
<div class="<%= css_for_proposal_info_row(proposal) %>">
<% end %>
<div class="proposal-content">
<% cache [locale_and_user_status(proposal), "index", proposal, proposal.author] do %>
@@ -66,10 +66,10 @@
<div id="<%= dom_id(proposal) %>_votes"
class="small-12 medium-3 column supports-container">
<% if proposal.successful? %>
<div class="padding text-center">
<p>
<%= t("proposals.proposal.successful") %>
</p>
<div class="padding">
<div class="supports text-center">
<%= render "proposals/supports", proposal: proposal %>
</div>
</div>
<% elsif proposal.archived? %>
<div class="padding text-center">

View File

@@ -80,9 +80,9 @@
<p class=text-center><strong><%= t('.draft') %></strong></p>
</div>
<% elsif @proposal.successful? %>
<p>
<%= t("proposals.proposal.successful") %>
</p>
<div class="supports text-center">
<%= render "supports", proposal: @proposal %>
</div>
<% elsif @proposal.archived? %>
<div class="padding text-center">
<p>

View File

@@ -9,8 +9,8 @@ feature "Proposal ballots" do
visit proposals_path
successful_proposals.each do |proposal|
within("#proposal_#{proposal.id}_votes") do
expect(page).to have_content "This proposal has reached the required supports"
within("#proposal_#{proposal.id}_votes .supports .progress") do
expect(page).to have_content "100% / 100%"
end
end
end
@@ -20,8 +20,8 @@ feature "Proposal ballots" do
successful_proposals.each do |proposal|
visit proposal_path(proposal)
within("#proposal_#{proposal.id}_votes") do
expect(page).to have_content "This proposal has reached the required supports"
within("#proposal_#{proposal.id}_votes .supports .progress") do
expect(page).to have_content "100% / 100%"
end
end
end

View File

@@ -1773,8 +1773,8 @@ feature "Successful proposals" do
successful_proposals.each do |proposal|
within("#proposal_#{proposal.id}_votes") do
expect(page).not_to have_css(".supports")
expect(page).to have_content "This proposal has reached the required supports"
expect(page).not_to have_link "Support"
expect(page).to have_content "100% / 100%"
end
end
end
@@ -1785,8 +1785,8 @@ feature "Successful proposals" do
successful_proposals.each do |proposal|
visit proposal_path(proposal)
within("#proposal_#{proposal.id}_votes") do
expect(page).not_to have_css(".supports")
expect(page).to have_content "This proposal has reached the required supports"
expect(page).not_to have_link "Support"
expect(page).to have_content "100% / 100%"
end
end
end