Addresses @iacoco comments

This commit is contained in:
Juan Salvador Pérez García
2018-06-13 18:34:56 +02:00
parent 96d5a9b5ff
commit 305a0059bd
4 changed files with 20 additions and 15 deletions

View File

@@ -1,31 +1,29 @@
<tr id="proposal_<%= proposal.id %>"> <tr id="proposal_<%= proposal.id %>">
<td class="small-9"> <td class="small-7">
<strong><%= link_to proposal.title, proposal, proposal.retired? ? { class: 'retired' } : {} %></strong> <strong><%= link_to proposal.title, proposal, proposal.retired? ? { class: 'retired' } : {} %></strong>
<br> <br>
<%= proposal.summary %> <%= proposal.summary %>
</td> </td>
<td class="small-2 text-center">
<% if proposal.retired? %>
<span class="label alert"><%= t('users.proposals.retired') %></span>
<% elsif proposal.draft? %>
<span class="label info"><%= t('users.proposals.draft') %></span>
<% else %>
<span class="label success"><%= t('users.proposals.published') %></span>
<% end %>
</td>
<% if proposal.retired? %> <% if proposal.retired? %>
<td></td>
<td class="text-center" colspan="2">
<span class="label alert"><%= t('users.proposals.retired') %></span>
</td>
<% elsif can?(:dashboard, proposal) %> <% elsif can?(:dashboard, proposal) %>
<td> <td>
<% if proposal.retired? %>
<span class="label alert"><%= t('users.proposals.retired') %></span>
<% else %>
<%= link_to t('proposals.show.dashboard_proposal_link'), <%= link_to t('proposals.show.dashboard_proposal_link'),
proposal_dashboard_index_path(proposal), class: 'button hollow expanded' %> proposal_dashboard_index_path(proposal), class: 'button hollow expanded' %>
<% end %>
</td> </td>
<% else %> <% else %>
<td class="text-center">
<td class="text-center" colspan="2">
<%= link_to t('users.proposals.see'), proposal, class: 'button hollow' %> <%= link_to t('users.proposals.see'), proposal, class: 'button hollow' %>
</td> </td>
<% end %> <% end %>
</tr> </tr>

View File

@@ -1,7 +1,8 @@
<table class="margin-top"> <table class="margin-top">
<thead> <thead>
<th scope="col"><%= t("users.show.proposals") %></th> <th scope="col"><%= t("users.show.proposals") %></th>
<th scope="col"><%= t("users.show.actions") %></th> <th scope="col" class="text-center"><%= t("users.show.proposals_status") %></th>
<th scope="col"></th>
</thead> </thead>
<tbody> <tbody>
<% @proposals.each do |proposal| %> <% @proposals.each do |proposal| %>

View File

@@ -769,6 +769,7 @@ en:
deleted_proposal: This proposal has been deleted deleted_proposal: This proposal has been deleted
deleted_budget_investment: This investment project has been deleted deleted_budget_investment: This investment project has been deleted
proposals: Proposals proposals: Proposals
proposals_status: Status
debates: Debates debates: Debates
budget_investments: Budget investments budget_investments: Budget investments
comments: Comments comments: Comments
@@ -796,6 +797,8 @@ en:
delete_alert: "Are you sure you want to delete your investment project? This action can't be undone" delete_alert: "Are you sure you want to delete your investment project? This action can't be undone"
proposals: proposals:
retired: "Retired proposal" retired: "Retired proposal"
draft: Draft
published: Published
see: "See proposal" see: "See proposal"
votes: votes:
agree: I agree agree: I agree

View File

@@ -768,6 +768,7 @@ es:
deleted_proposal: Esta propuesta ha sido eliminada deleted_proposal: Esta propuesta ha sido eliminada
deleted_budget_investment: Este proyecto de gasto ha sido eliminado deleted_budget_investment: Este proyecto de gasto ha sido eliminado
proposals: Propuestas proposals: Propuestas
proposals_status: Estado
debates: Debates debates: Debates
budget_investments: Proyectos de presupuestos participativos budget_investments: Proyectos de presupuestos participativos
comments: Comentarios comments: Comentarios
@@ -795,6 +796,8 @@ es:
delete_alert: "¿Estás seguro de que deseas borrar tu proyecto de gasto? Esta acción no se puede deshacer" delete_alert: "¿Estás seguro de que deseas borrar tu proyecto de gasto? Esta acción no se puede deshacer"
proposals: proposals:
retired: "Propuesta retirada" retired: "Propuesta retirada"
draft: Borrador
published: Publicada
see: "Ver propuesta" see: "Ver propuesta"
votes: votes:
agree: Estoy de acuerdo agree: Estoy de acuerdo