Merge pull request #1375 from consul/officer-document-check

updates styles and i18n for officing views

app/views/officing/residence/new.html.erb

@@ -1,26 +1,27 @@
 <h2><%= t("officing.residence.new.title") %></h2>
 
-<div class="row">
+<div class="row verification account">
-  <div class="small-12 medium-6 column">
+  <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") %>
+      <div class="small-12 medium-6">
-      <%= f.select :document_type, document_types, prompt: "", label: false %>
+        <%= f.select :document_type, document_types, prompt: "" %>
 
 
         <%= 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>

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>

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>
 
+<% 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| %>
-  <div id="<%= dom_id(poll) %>">
+      <tr id="<%= dom_id(poll) %>">
-    <div><%= poll.name %></div>
+        <td>
-
+          <%= poll.name %>
-    <div id="actions">
+        </td>
+        <td id="actions">
           <% if poll.votable_by?(@user) %>
             <%= render "can_vote", poll: poll %>
           <% else %>
             <%= render "already_voted" %>
           <% end %>
-    </div>
+        </td>
-  </div>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
 <% end %>

config/locales/activemodel.en.yml

@@ -16,3 +16,7 @@ en:
           confirmation_code: "Confirmation code"
         email:
           recipient: "Email"
+      officing/residence:
+        document_type: "Document type"
+        document_number: "Document number (including letters)"
+        date_of_birth: "Date of birth"

config/locales/activemodel.es.yml

@@ -16,3 +16,7 @@ es:
           confirmation_code: "Código de confirmación"
         email:
           recipient: "Email"
+      officing/residence:
+        document_type: "Tipo documento"
+        document_number: "Numero de documento (incluida letra)"
+        date_of_birth: "Fecha de nacimiento"

config/locales/officing.en.yml

@@ -34,14 +34,15 @@ en:
         create: "Document verified with Census"
       new:
         title: Validate document
-        document_number: Document number
+        document_number: "Document number (including letters)"
-        document_type_label: Document type
         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

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_number: "Número de documento (incluida letra)"
-        document_type_label: Tipo de documento
         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.