From 1977b23803eff41738d89791272463c1063492c6 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Mon, 30 Jan 2017 13:33:38 +0100
Subject: [PATCH] updates styles and i18n for officing views

---
 app/views/officing/residence/new.html.erb     | 27 +++++++-------
 .../officing/voters/_already_voted.html.erb   |  2 +-
 app/views/officing/voters/new.html.erb        | 37 +++++++++++++------
 config/locales/activemodel.en.yml             |  6 ++-
 config/locales/activemodel.es.yml             |  6 ++-
 config/locales/officing.en.yml                |  5 ++-
 config/locales/officing.es.yml                |  7 ++--
 7 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/app/views/officing/residence/new.html.erb b/app/views/officing/residence/new.html.erb
index 45290762e..4d15db993 100644
--- a/app/views/officing/residence/new.html.erb
+++ b/app/views/officing/residence/new.html.erb
@@ -1,26 +1,27 @@
 <h2><%= t("officing.residence.new.title") %></h2>
 
-<div class="row">
-  <div class="small-12 medium-6 column">
+<div class="row verification account">
+  <div class="small-12 medium-8 column">
     <%= form_for @residence, as: "residence", url: officing_residence_path do |f| %>
       <%= render "errors" %>
 
-      <%= f.label t("officing.residence.new.document_type_label") %>
-      <%= f.select :document_type, document_types, prompt: "", label: false %>
+      <div class="small-12 medium-6">
+        <%= f.select :document_type, document_types, prompt: "" %>
 
 
-      <%= f.text_field :document_number,
+        <%= f.text_field :document_number,
                        placeholder: t("officing.residence.new.document_number") %>
-
-      <div class="date-of-birth small-12 medium-6 clear">
-      <%= f.label t("verification.residence.new.date_of_birth") %>
-      <%= f.date_select :date_of_birth,
-                        prompt: true,
-                        start_year: 1900, end_year: 16.years.ago.year,
-                        label: false %>
       </div>
 
-      <input type="submit" value="<%= t("officing.residence.new.submit") %>" class="button">
+      <div class="date-of-birth small-12 medium-6">
+        <%= f.date_select :date_of_birth,
+                          prompt: true,
+                          start_year: 1900, end_year: 16.years.ago.year %>
+      </div>
+
+      <div class="small-12 medium-6">
+        <input type="submit" value="<%= t("officing.residence.new.submit") %>" class="button expanded">
+      </div>
     <% end %>
   </div>
 </div>
diff --git a/app/views/officing/voters/_already_voted.html.erb b/app/views/officing/voters/_already_voted.html.erb
index 847d8b7d7..f9e81eada 100644
--- a/app/views/officing/voters/_already_voted.html.erb
+++ b/app/views/officing/voters/_already_voted.html.erb
@@ -1,3 +1,3 @@
-<div class="callout warning">
+<div class="callout warning inline-block">
   <%= t("officing.voters.show.error_already_voted") %>
 </div>
\ No newline at end of file
diff --git a/app/views/officing/voters/new.html.erb b/app/views/officing/voters/new.html.erb
index 8fdeb512a..0f8fa2958 100644
--- a/app/views/officing/voters/new.html.erb
+++ b/app/views/officing/voters/new.html.erb
@@ -1,15 +1,30 @@
+<%= back_link_to new_officing_residence_path %>
+
 <h2><%= t("officing.voters.new.title") %></h2>
 
-<% @polls.each do |poll| %>
-  <div id="<%= dom_id(poll) %>">
-    <div><%= poll.name %></div>
-
-    <div id="actions">
-      <% if poll.votable_by?(@user) %>
-        <%= render "can_vote", poll: poll %>
-      <% else %>
-        <%= render "already_voted" %>
+<% if @polls.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("officing.voters.new.table_poll") %></th>
+        <th><%= t("officing.voters.new.table_actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @polls.each do |poll| %>
+      <tr id="<%= dom_id(poll) %>">
+        <td>
+          <%= poll.name %>
+        </td>
+        <td id="actions">
+          <% if poll.votable_by?(@user) %>
+            <%= render "can_vote", poll: poll %>
+          <% else %>
+            <%= render "already_voted" %>
+          <% end %>
+        </td>
+      </tr>
       <% end %>
-    </div>
-  </div>
+    </tbody>
+  </table>
 <% end %>
\ No newline at end of file
diff --git a/config/locales/activemodel.en.yml b/config/locales/activemodel.en.yml
index f62fd1ec6..04de6d97f 100644
--- a/config/locales/activemodel.en.yml
+++ b/config/locales/activemodel.en.yml
@@ -15,4 +15,8 @@ en:
           phone: "Telephone"
           confirmation_code: "Confirmation code"
         email:
-          recipient: "Email"
\ No newline at end of file
+          recipient: "Email"
+      officing/residence:
+        document_type: "Document type"
+        document_number: "Document number (including letters)"
+        date_of_birth: "Date of birth"
\ No newline at end of file
diff --git a/config/locales/activemodel.es.yml b/config/locales/activemodel.es.yml
index e45eade16..12d2902ff 100644
--- a/config/locales/activemodel.es.yml
+++ b/config/locales/activemodel.es.yml
@@ -15,4 +15,8 @@ es:
           phone: "Teléfono"
           confirmation_code: "Código de confirmación"
         email:
-          recipient: "Email"
\ No newline at end of file
+          recipient: "Email"
+      officing/residence:
+        document_type: "Tipo documento"
+        document_number: "Numero de documento (incluida letra)"
+        date_of_birth: "Fecha de nacimiento"
diff --git a/config/locales/officing.en.yml b/config/locales/officing.en.yml
index 54ac52edf..4f320a125 100644
--- a/config/locales/officing.en.yml
+++ b/config/locales/officing.en.yml
@@ -34,14 +34,15 @@ en:
         create: "Document verified with Census"
       new:
         title: Validate document
-        document_number: Document number
-        document_type_label: Document type
+        document_number: "Document number (including letters)"
         submit: Validate document
         error_verifying_census: "The Census was unable to verify this document."
         form_errors: prevented the verification of this document
     voters:
       new:
         title: Polls
+        table_poll: Poll
+        table_actions: Validate
       show:
         error_already_voted: Has already participated in this poll
         submit: Validate vote
diff --git a/config/locales/officing.es.yml b/config/locales/officing.es.yml
index 0aa1b419c..28fc1595d 100644
--- a/config/locales/officing.es.yml
+++ b/config/locales/officing.es.yml
@@ -34,15 +34,16 @@ es:
         create: "Documento verificado con el Padrón"
       new:
         title: Validar documento
-        document_number: Número de documento
-        document_type_label: Tipo de documento
+        document_number: "Número de documento (incluida letra)"
         submit: Validar documento
         error_verifying_census: El Padrón no pudo verificar este documento.
         form_errors: evitaron verificar este documento
     voters:
       new:
         title: Votaciones
+        table_poll: Votación
+        table_actions: Validar
       show:
-        error_already_voted: "Ya ha participado en la votación."
+        error_already_voted: "Ya ha participado en esta votación."
         submit: Validar voto
         success: Voto validado correctamente.