consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactors manager proposal votes

Browse Source
This commit is contained in:
rgarcia
2015-10-08 14:40:47 +02:00
parent c5a7ff7501
commit a3503c7eb3
7 changed files with 10 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/management/proposals_controller.rb
View File

@@ -11,7 +11,7 @@ class Management::ProposalsController < Management::BaseController
def vote
@proposal.register_vote(current_user, 'yes')
redirect_to management_proposals_url, notice: "Succesfully voted"
set_proposal_votes(@proposal)
end
def print

36
app/views/management/proposals/_proposal.html.erb
View File

@@ -1,35 +1 @@
<div id="<%= dom_id(proposal) %>" class="proposal clear">
<div class="panel">
<div class="row">
<div class="small-12 medium-9 column">
<div class="proposal-content">
<span class="label-proposal left"><%= t("proposals.proposal.proposal") %></span>
<i class="icon-proposals"></i>
<h3><%= link_to proposal.title, "#" %></h3>
<p class="proposal-info">
<i class="icon-comments"></i>&nbsp;
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= l proposal.created_at.to_date %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<span class="author">
<%= proposal.try(:author).try(:name) %>
</span>
</p>
<div class="proposal-description">
<p><%= proposal.summary %></p>
<div class="truncate"></div>
</div>
<%= render "shared/tags", taggable: proposal, limit: 5 %>
</div>
</div>
<div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column text-center">
<%= render 'votes', proposal: proposal %>
</div>
</div>
</div>
</div>
<%= render partial: 'proposals/proposal', locals: {proposal: proposal} %>

33
app/views/management/proposals/_votes.html.erb
View File

@@ -1,31 +1,2 @@
<div class="supports">
<% if action_name == 'print' %>
<div class="progress small-12 round">
<span class="meter" style="width: <%= progress_bar_percentage(proposal) %>%;"></span>
<span class="percentage">
<%= supports_percentage(proposal) %>&nbsp;/&nbsp;<%= t("proposals.proposal.total_percent") %>
</span>
</div>
<span class="total-supports">
<%= t("proposals.proposal.supports", count: proposal.total_votes) %>&nbsp;
<span>
<abbr title="<%= t("proposals.proposal.census_percent") %>">
<%= t("proposals.proposal.supports_necessary") %>
</abbr>
</span>
</span>
<% else %>
<div class="in-favor">
<%= link_to vote_management_proposal_path(proposal, value: 'yes'),
class: "button button-support tiny radius expand",
title: t('proposals.proposal.support_title'), method: "post" do %>
<%= t("proposals.proposal.support") %>
<% end %>
</div>
<% end %>
</div>
<%= render 'proposals/votes',
{ proposal: proposal, vote_url: vote_management_proposal_path(proposal, value: 'yes') } %>

1
app/views/management/proposals/vote.js.erb Normal file
View File

@@ -0,0 +1 @@
<%= render template: 'proposals/vote' %>

3
app/views/proposals/_proposal.html.erb
View File

@@ -47,7 +47,8 @@
</div>
<div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column text-center">
<%= render 'proposals/votes', proposal: proposal %>
<%= render 'votes',
{ proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %>
</div>
</div>

2
app/views/proposals/_votes.html.erb
View File

@@ -22,7 +22,7 @@
<%= t("proposals.proposal.already_supported") %>
</div>
<% else %>
<%= link_to vote_proposal_path(proposal, value: 'yes'),
<%= link_to vote_url,
class: "button button-support tiny radius expand",
title: t('proposals.proposal.support_title'), method: "post", remote: true do %>
<%= t("proposals.proposal.support") %>

3
app/views/proposals/show.html.erb
View File

@@ -97,7 +97,8 @@
<h3><%= t("votes.supports") %></h3>
<div class="text-center">
<div id="<%= dom_id(@proposal) %>_votes">
<%= render 'proposals/votes', proposal: @proposal %>
<%= render 'votes',
{ proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %>
</div>
</div>
<div class="sidebar-divider"></div>