From 305a0059bd2dcf8caf66e0133f5b4eafca199395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Salvador=20P=C3=A9rez=20Garc=C3=ADa?=
 <jsperezg@gmail.com>
Date: Wed, 13 Jun 2018 18:34:56 +0200
Subject: [PATCH] Addresses @iacoco comments

---
 app/views/users/_proposal.html.erb  | 26 ++++++++++++--------------
 app/views/users/_proposals.html.erb |  3 ++-
 config/locales/en/general.yml       |  3 +++
 config/locales/es/general.yml       |  3 +++
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/views/users/_proposal.html.erb b/app/views/users/_proposal.html.erb
index d3c5c5763..1d688308b 100644
--- a/app/views/users/_proposal.html.erb
+++ b/app/views/users/_proposal.html.erb
@@ -1,31 +1,29 @@
 <tr id="proposal_<%= proposal.id %>">
-  <td class="small-9">
+  <td class="small-7">
     <strong><%= link_to proposal.title, proposal, proposal.retired? ? { class: 'retired' } : {} %></strong>
     <br>
     <%= proposal.summary %>
   </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? %>
-
-    <td class="text-center" colspan="2">
-      <span class="label alert"><%= t('users.proposals.retired') %></span>
-    </td>
-
+    <td></td>
   <% elsif can?(:dashboard, proposal) %>
     <td>
-      <% if proposal.retired? %>
-        <span class="label alert"><%= t('users.proposals.retired') %></span>
-      <% else %>
         <%= link_to t('proposals.show.dashboard_proposal_link'), 
                     proposal_dashboard_index_path(proposal), class: 'button hollow expanded' %>
-      <% end %>
     </td>
   <% else %>
-
-    <td class="text-center" colspan="2">
+    <td class="text-center">
       <%= link_to t('users.proposals.see'), proposal, class: 'button hollow' %>
     </td>
-
   <% end %>
-
 </tr>
diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb
index 2cb451748..7c9467ef5 100644
--- a/app/views/users/_proposals.html.erb
+++ b/app/views/users/_proposals.html.erb
@@ -1,7 +1,8 @@
 <table class="margin-top">
   <thead>
     <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>
   <tbody>
     <% @proposals.each do |proposal| %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 28a2d8551..033bc0f05 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -769,6 +769,7 @@ en:
       deleted_proposal: This proposal has been deleted
       deleted_budget_investment: This investment project has been deleted
       proposals: Proposals
+      proposals_status: Status
       debates: Debates
       budget_investments: Budget investments
       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"
     proposals:
       retired: "Retired proposal"
+      draft: Draft
+      published: Published
       see: "See proposal"
   votes:
     agree: I agree
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 5ac4f1b1c..6529ee239 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -768,6 +768,7 @@ es:
       deleted_proposal: Esta propuesta ha sido eliminada
       deleted_budget_investment: Este proyecto de gasto ha sido eliminado
       proposals: Propuestas
+      proposals_status: Estado
       debates: Debates
       budget_investments: Proyectos de presupuestos participativos
       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"
     proposals:
       retired: "Propuesta retirada"
+      draft: Borrador
+      published: Publicada
       see: "Ver propuesta"
   votes:
     agree: Estoy de acuerdo