Merge pull request #1805 from consul/users-proposal

Users proposal list
This commit is contained in:
BertoCQ
2017-08-29 10:14:27 +02:00
committed by GitHub
3 changed files with 15 additions and 7 deletions

View File

@@ -7,28 +7,34 @@
<% if proposal.retired? %> <% if proposal.retired? %>
<td class="text-center"> <td class="text-center" colspan="2">
<span class="label alert"><%= t('users.proposals.retired') %></span> <span class="label alert"><%= t('users.proposals.retired') %></span>
</td> </td>
<% elsif author?(proposal) %> <% elsif author?(proposal) %>
<td class="text-center"> <td>
<%= link_to t("users.proposals.send_notification"), <%= link_to t("users.proposals.send_notification"),
new_proposal_notification_path(proposal_id: proposal.id), new_proposal_notification_path(proposal_id: proposal.id),
class: 'button hollow' %> class: 'button hollow expanded' %>
</td> </td>
<td class="text-center"> <td>
<% if proposal.retired? %> <% if proposal.retired? %>
<span class="label alert"><%= t('users.proposals.retired') %></span> <span class="label alert"><%= t('users.proposals.retired') %></span>
<% else %> <% else %>
<%= link_to t('users.proposals.retire'), <%= link_to t('users.proposals.retire'),
retire_form_proposal_path(proposal), retire_form_proposal_path(proposal),
class: 'button hollow alert' %> class: 'button hollow alert expanded' %>
<% end %> <% end %>
</td> </td>
<% else %>
<td class="text-center" colspan="2">
<%= link_to t('users.proposals.see'), proposal, class: 'button hollow' %>
</td>
<% end %> <% end %>
</tr> </tr>

View File

@@ -676,7 +676,8 @@ en:
proposals: proposals:
send_notification: "Send notification" send_notification: "Send notification"
retire: "Retire" retire: "Retire"
retired: "Retired" retired: "Retired proposal"
see: "See proposal"
votes: votes:
agree: I agree agree: I agree
anonymous: Too many anonymous votes to admit vote %{verify_account}. anonymous: Too many anonymous votes to admit vote %{verify_account}.

View File

@@ -676,7 +676,8 @@ es:
proposals: proposals:
send_notification: "Enviar notificación" send_notification: "Enviar notificación"
retire: "Retirar" retire: "Retirar"
retired: "Retirada" retired: "Propuesta retirada"
see: "Ver propuesta"
votes: votes:
agree: Estoy de acuerdo agree: Estoy de acuerdo
anonymous: Demasiados votos anónimos, para poder votar %{verify_account}. anonymous: Demasiados votos anónimos, para poder votar %{verify_account}.