From 74a361690de4be83be585b961d1050557aa2f77b Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 4 Jan 2017 17:33:09 +0100
Subject: [PATCH] improves styles for valuation budgets

---
 .../budget_investments/index.html.erb         | 50 ++++++++++++-------
 app/views/valuation/budgets/index.html.erb    | 35 ++++++++++---
 config/locales/valuation.en.yml               | 13 ++++-
 config/locales/valuation.es.yml               | 13 ++++-
 4 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/app/views/valuation/budget_investments/index.html.erb b/app/views/valuation/budget_investments/index.html.erb
index 9b82f7f5a..b44a129aa 100644
--- a/app/views/valuation/budget_investments/index.html.erb
+++ b/app/views/valuation/budget_investments/index.html.erb
@@ -1,4 +1,7 @@
-<h2><%= @budget.name %> - <%= t("valuation.budget_investments.index.title") %></h2>
+<h2>
+  <%= @budget.name %> - <%= t("valuation.budget_investments.index.title") %>
+  <small>(Asignadas a EVALUADOR)</small>
+</h2>
 
 <div class="row collapse">
   <% @heading_filters.each_slice(8) do |slice| %>
@@ -18,25 +21,34 @@
 <h3><%= page_entries_info @investments %></h3>
 
 <table>
-  <% @investments.each do |investment| %>
-    <tr id="<%= dom_id(investment) %>">
-      <td>
-        <strong><%= investment.id %></strong>
-      </td>
-      <td>
-        <%= link_to investment.title, valuation_budget_budget_investment_path(@budget, investment) %>
-      </td>
-      <td class="small">
-        <%= link_to t("valuation.budget_investments.index.edit"), edit_valuation_budget_budget_investment_path(@budget, investment) %>
-      </td>
-      <td class="small">
-        <%= assigned_valuators_info(investment.valuators) %>
-      </td>
-      <td class="small">
-        <%= investment.heading.name %>
-      </td>
+  <thead>
+    <tr>
+      <th><%= t("valuation.budget_investments.index.table_id") %></th>
+      <th><%= t("valuation.budget_investments.index.table_title") %></th>
+      <th><%= t("valuation.budget_investments.index.table_heading_name") %></th>
+      <th><%= t("valuation.budget_investments.index.table_actions") %></th>
     </tr>
-  <% end %>
+  </thead>
+  <tbody>
+    <% @investments.each do |investment| %>
+      <tr id="<%= dom_id(investment) %>">
+        <td>
+          <strong><%= investment.id %></strong>
+        </td>
+        <td>
+          <%= link_to investment.title, valuation_budget_budget_investment_path(@budget, investment) %>
+        </td>
+        <td class="small">
+          <%= investment.heading.name %>
+        </td>
+        <td class="small">
+          <%= link_to t("valuation.budget_investments.index.edit"),
+                      edit_valuation_budget_budget_investment_path(@budget, investment),
+                      class: "button hollow expanded" %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
 </table>
 
 <%= paginate @investments %>
diff --git a/app/views/valuation/budgets/index.html.erb b/app/views/valuation/budgets/index.html.erb
index 014633373..0db30c335 100644
--- a/app/views/valuation/budgets/index.html.erb
+++ b/app/views/valuation/budgets/index.html.erb
@@ -5,13 +5,34 @@
 <h3><%= page_entries_info @budgets %></h3>
 
 <table>
-  <% @budgets.each do |budget| %>
-    <tr id="<%= dom_id(budget) %>" class="budget">
-      <td>
-        <%= link_to budget.name, valuation_budget_budget_investments_path(budget_id: budget.id) %>
-      </td>
+  <thead>
+    <tr>
+      <th><%= t("valuation.budgets.index.table_name") %></th>
+      <th><%= t("valuation.budgets.index.table_phase") %></th>
+      <th><%= t("valuation.budgets.index.table_assigned_headings") %></th>
+      <th><%= t("valuation.budgets.index.table_actions") %></th>
     </tr>
-  <% end %>
+  </thead>
+  <tbody>
+    <% @budgets.each do |budget| %>
+      <tr id="<%= dom_id(budget) %>" class="budget">
+        <td>
+          <%= budget.name %>
+        </td>
+        <td>
+          <%= t("budget.phase.#{budget.phase}") %>
+        </td>
+        <td>
+          3 partidas
+        </td>
+        <td>
+          <%= link_to t("valuation.budgets.index.evaluate"),
+                      valuation_budget_budget_investments_path(budget_id: budget.id),
+                      class: "button hollow expanded" %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
 </table>
 
-<%= paginate @budgets %>
\ No newline at end of file
+<%= paginate @budgets %>
diff --git a/config/locales/valuation.en.yml b/config/locales/valuation.en.yml
index a5195deca..4aafe160b 100644
--- a/config/locales/valuation.en.yml
+++ b/config/locales/valuation.en.yml
@@ -9,8 +9,13 @@ en:
       index:
         title: Participatory budgets
         filters:
-          open: Open
+          current: Open
           finished: Finished
+        table_name: Name
+        table_phase: Phase
+        table_assigned_headings: Assigned headings
+        table_actions: Actions
+        evaluate: Evaluate
     budget_investments:
       index:
         headings_filter_all: All headings
@@ -19,11 +24,15 @@ en:
           valuating: Under valuation
           valuation_finished: Valuation finished
         title: Investment projects
-        edit: Edit
+        edit: Edit dossier
         valuators_assigned:
           one: Assigned valuator
           other: "%{count} valuators assigned"
         no_valuators_assigned: No valuators assigned
+        table_id: ID
+        table_title: Title
+        table_heading_name: Heading name
+        table_actions: Actions
       show:
         back: Back
         title: Investment project
diff --git a/config/locales/valuation.es.yml b/config/locales/valuation.es.yml
index 67302437b..641f9c003 100644
--- a/config/locales/valuation.es.yml
+++ b/config/locales/valuation.es.yml
@@ -9,8 +9,13 @@ es:
       index:
         title: Presupuestos participativos
         filters:
-          open: Abiertos
+          current: Abiertos
           finished: Terminados
+        table_name: Nombre
+        table_phase: Fase
+        table_assigned_headings: Partidas asignadas
+        table_actions: Acciones
+        evaluate: Evaluar
     budget_investments:
       index:
         headings_filter_all: Todas las partidas
@@ -19,11 +24,15 @@ es:
           valuating: En evaluación
           valuation_finished: Evaluación finalizada
         title: Propuestas de inversión
-        edit: Editar
+        edit: Editar informe
         valuators_assigned:
           one: Evaluador asignado
           other: "%{count} evaluadores asignados"
         no_valuators_assigned: Sin evaluador
+        table_id: ID
+        table_title: Título
+        table_heading_name: Nombre de la partida
+        table_actions: Acciones
       show:
         back: Volver
         title: Propuesta de inversión