polish styles for tables, assignments and searches on polls admin

app/assets/stylesheets/admin.scss

@@ -44,11 +44,22 @@ body.admin {
 
     .button {
       margin-top: 0;
+
+      &.margin-top {
+        margin-top: $line-height;
+      }
     }
 
     input[type="text"], textarea {
       width: 100%;
     }
+
+    .fieldset {
+
+      select {
+        height: $line-height*2;
+      }
+    }
   }
 
   table {
@@ -59,6 +70,10 @@ body.admin {
       &.text-center {
         text-align: center;
       }
+
+      &.text-right {
+        text-align: right;
+      }
     }
 
     tr {

app/views/admin/poll/officer_assignments/index.html.erb

@@ -1,4 +1,8 @@
-<%= link_to @poll.name, admin_poll_path(@poll, anchor: 'tab-officers') %>
+<%= link_to admin_poll_path(@poll, anchor: 'tab-officers') do %>
+  <span class="icon-angle-left"></span>
+  <%= @poll.name %>
+<% end %>
+
 <h2><%= @officer.name %> - <%= @officer.email %></h2>
 
 <%= form_tag(admin_officer_assignments_path, {id: "officer_assignment_form"}) do %>
@@ -40,7 +44,8 @@
     <thead>
       <tr>
         <th><%= t("admin.poll_officer_assignments.index.date") %></th>
-        <th colspan="2"><%= t("admin.poll_officer_assignments.index.booth") %></th>
+        <th><%= t("admin.poll_officer_assignments.index.booth") %></th>
+        <th class="text-center"><%= t("admin.poll_officer_assignments.index.assignment") %></th>
       </tr>
     </thead>
     <tbody>
@@ -48,7 +53,7 @@
         <tr id="<%= dom_id officer_assignment %>">
           <td><%= l officer_assignment.date.to_date %></td>
           <td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></td>
-          <td class="text-right">
+          <td class="text-center">
             <%= link_to t("admin.poll_officer_assignments.index.remove_assignment"),
                         admin_officer_assignment_path(officer_assignment),
                         method: :delete,

app/views/admin/poll/polls/_booths.html.erb

@@ -5,11 +5,11 @@
     <%= t("admin.polls.show.no_booths") %>
   </div>
 <% else %>
-  <table>
+  <table class="margin">
     <thead>
-      <th><%= t("admin.polls.show.name") %></th>
+      <th><%= t("admin.polls.show.table_name") %></th>
-      <th><%= t("admin.polls.show.location") %></th>
+      <th><%= t("admin.polls.show.table_location") %></th>
-      <th>&nbsp;</th>
+      <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
     </thead>
     <tbody>
       <% @poll.booths.each do |booth| %>
@@ -22,7 +22,7 @@
           <td>
             <%= booth.location %>
           </td>
-          <td class="text-right">
+          <td class="text-center">
             <%= link_to t("admin.polls.show.remove_booth"),
                         admin_booth_assignment_path(poll: @poll, booth: booth),
                         method: :delete,

app/views/admin/poll/polls/_officers.html.erb

@@ -5,7 +5,7 @@
     <%= t("admin.polls.show.no_officers") %>
   </div>
 <% else %>
-  <table>
+  <table class="margin">
     <thead>
       <th><%= t("admin.polls.show.name") %></th>
       <th><%= t("admin.polls.show.email") %></th>

app/views/admin/poll/polls/_questions.html.erb

@@ -5,11 +5,21 @@
     <%= t('admin.polls.show.no_questions') %>
   </div>
 <% else %>
-  <table class="margin-top">
+  <table class="margin">
+    <thead>
+      <tr>
+        <th><%= t('admin.polls.show.table_title') %></th>
+        <th class="text-center"><%= t('admin.polls.show.table_assignment') %></th>
+      </tr>
+    </thead>
     <% @poll.questions.each do |question| %>
       <tr id="<%= dom_id(question) %>">
-        <td><%= link_to question.title, admin_question_path(question) %></td>
+        <td>
-        <td class="text-right">
+          <strong>
+            <%= link_to question.title, admin_question_path(question) %>
+          </strong>
+        </td>
+        <td class="text-center">
           <%= link_to t('admin.polls.show.remove_question'),
                       remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
                       class: "button hollow alert",

app/views/admin/poll/polls/_search_booths.html.erb

@@ -1,3 +1,5 @@
+<div class="row">
+  <div class="small-12 medium-6 column">
     <%= form_tag(search_booths_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
       <div class="input-group">
         <%= text_field_tag :search,
@@ -8,5 +10,7 @@
         </div>
       </div>
     <% end %>
+  </div>
+</div>
 
 <div id="search-booths-results"></div>

app/views/admin/poll/polls/_search_booths_results.html.erb

@@ -1,7 +1,18 @@
+<% if @booths.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.polls.show.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.polls.show.search_results') %></h3>
+<% end %>
+
+<% if @booths.any? %>
   <table>
     <thead>
       <tr>
-      <th colspan="3"><%= @booths.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th>
+        <th><%= t("admin.polls.show.table_name") %></th>
+        <th><%= t("admin.polls.show.table_location") %></th>
+        <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
       </tr>
     </thead>
     <tbody>
@@ -13,7 +24,7 @@
         <td>
           <%= booth.location %>
         </td>
-      <td class="text-right">
+        <td class="text-center">
           <% if @poll.booth_ids.include?(booth.id) %>
             <%= link_to t("admin.polls.show.remove_booth"),
                           admin_booth_assignment_path(poll: @poll, booth: booth),
@@ -30,3 +41,4 @@
       <% end %>
     </tbody>
   </table>
+<% end %>

app/views/admin/poll/polls/_search_officers.html.erb

@@ -1,3 +1,5 @@
+<div class="row">
+  <div class="small-12 medium-6 column">
     <%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
       <div class="input-group">
         <%= text_field_tag :search,
@@ -8,5 +10,7 @@
         </div>
       </div>
     <% end %>
+  </div>
+</div>
 
 <div id="search-officers-results"></div>

app/views/admin/poll/polls/_search_officers_results.html.erb

@@ -1,7 +1,18 @@
+<% if @officers.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.polls.show.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.polls.show.search_results') %></h3>
+<% end %>
+
+<% if @officers.any? %>
   <table>
     <thead>
       <tr>
-      <th colspan="3"><%= @officers.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th>
+        <th><%= t("admin.polls.show.table_name") %></th>
+        <th><%= t("admin.polls.show.table_email") %></th>
+        <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
       </tr>
     </thead>
     <tbody>
@@ -13,7 +24,7 @@
         <td>
           <%= user.email %>
         </td>
-      <td class="text-right">
+        <td class="text-center">
         <% if @poll.officer_ids.include?(user.poll_officer.id) %>
             <%= link_to t("admin.polls.show.edit_officer_assignments"),
                           admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
@@ -28,3 +39,4 @@
       <% end %>
     </tbody>
   </table>
+<% end %>

app/views/admin/poll/polls/_search_questions.html.erb

@@ -1,3 +1,5 @@
+<div class="row">
+  <div class="small-12 medium-6 column">
     <%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
       <div class="input-group">
         <%= text_field_tag :search,
@@ -9,5 +11,7 @@
         </div>
       </div>
     <% end %>
+  </div>
+</div>
 
 <div id="search-questions-results"></div>

app/views/admin/poll/polls/_search_questions_results.html.erb

@@ -1,7 +1,18 @@
+<% if @questions.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.polls.show.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.polls.show.search_results') %></h3>
+<% end %>
+
+<% if @questions.any? %>
   <table>
     <thead>
       <tr>
-      <th colspan="3"><%= @questions.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th>
+        <th><%= t("admin.polls.show.table_name") %></th>
+        <th><%= t("admin.polls.show.table_summary") %></th>
+        <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
       </tr>
     </thead>
     <tbody>
@@ -13,7 +24,7 @@
         <td>
           <%= question.summary %>
         </td>
-      <td class="text-right">
+        <td class="text-center">
           <%= link_to t("admin.polls.show.add_question"),
                         add_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
                         method: :patch,
@@ -23,3 +34,4 @@
       <% end %>
     </tbody>
   </table>
+<% end %>

app/views/admin/poll/polls/show.html.erb

@@ -1,39 +1,30 @@
-<h2 class="inline-block">
-  <%= @poll.name %>
-  <small><%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %></small>
-</h2>
-
 <%= link_to t("admin.actions.edit"),
             edit_admin_poll_path(@poll),
             class: "button hollow float-right" %>
 
+<h2 class="inline-block">
+  <%= @poll.name %>
+</h2>
+<br>
+<p class="inline-block">
+  (<%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %>)
+</p>
+
 <div id="poll-resources" class="tabs-content" data-tabs-content="assigned-resources-tabs">
   <%= render "filter_subnav" %>
 
   <div class="tabs-panel is-active" id="tab-questions">
-    <div class="row">
-      <div class="small-12 medium-6 column">
     <%= render "search_questions" %>
-      </div>
-    </div>
     <%= render "questions" %>
   </div>
 
   <div class="tabs-panel" id="tab-booths">
-    <div class="row">
-      <div class="small-12 medium-6 column">
     <%= render "search_booths" %>
-      </div>
-    </div>
     <%= render "booths" %>
   </div>
 
   <div class="tabs-panel" id="tab-officers">
-    <div class="row">
-      <div class="small-12 medium-6 column">
     <%= render "search_officers" %>
-      </div>
-    </div>
     <%= render 'officers' %>
   </div>
 </div>

app/views/admin/poll/questions/show.html.erb

@@ -7,14 +7,17 @@
 
 <div class="row">
   <div class="small-12 medium-9 column">
-    <% if @question.proposal.present? %>
-      <%= t("admin.questions.show.proposal") %>
-      <%= link_to @question.proposal.title, proposal_path(@question.proposal) %>
-    <% end %>
-
     <strong><%= t("admin.questions.show.title") %></strong>
     <h1><%= @question.title %></h1>
 
+    <% if @question.proposal.present? %>
+      <p>
+        <strong><%= t("admin.questions.show.proposal") %></strong>
+        <br>
+        <%= link_to @question.proposal.title, proposal_path(@question.proposal) %>
+      </p>
+    <% end %>
+
     <p>
       <strong><%= t("admin.questions.show.author") %></strong>
       <br>

config/locales/admin.en.yml

@@ -173,12 +173,13 @@ en:
         new_assignment: "New shift"
         date: "Date"
         booth: "Booth"
+        assignment: "Assignment"
         select_date: "Select day"
         select_booth: "Select booth"
         add_assignment: "Add shift"
         remove_assignment: "Remove"
         assignments: "Officing shifts in this poll"
-        no_assignments: "This user has no officing shifts in this poll"
+        no_assignments: "This user has no officing shifts in this poll."
     polls:
       index:
         title: "List of polls"
@@ -200,8 +201,8 @@ en:
         questions_tab: Questions
         booths_tab: Booths
         officers_tab: Officers
-        no_booths: "There are no booths in this poll."
+        no_booths: "There are no booths assigned to this poll."
-        no_questions: "There are no questions assigned to this poll yet."
+        no_questions: "There are no questions assigned to this poll."
         no_officers: "There are no officers assigned to this poll."
         remove_booth: "Remove booth from poll"
         booths_title: "List of booths"
@@ -212,11 +213,14 @@ en:
         add_question: "Include question"
         add_officer_assignments: "Add shifts as officer"
         edit_officer_assignments: "Edit officing shifts"
-        name: "Name"
-        location: "Location"
-        email: "Email"
         search_results: "Search results"
-        no_search_results: "No results found"
+        no_search_results: "No results found."
+        table_title: "Title"
+        table_summary: "Summary"
+        table_assignment: "Assignment"
+        table_name: "Name"
+        table_location: "Location"
+        table_email: "Email"
       flash:
         question_added: "Question added to this poll"
         error_on_question_added: "Question could not be assigned to this poll"

config/locales/admin.es.yml

@@ -173,12 +173,13 @@ es:
         new_assignment: "Nuevo turno"
         date: "Fecha"
         booth: "Urna"
+        assignment: "Asignación"
         select_date: "Seleccionar día"
         select_booth: "Seleccionar urna"
         add_assignment: "Añadir turno"
         remove_assignment: "Eliminar turno"
         assignments: "Turnos como presidente de mesa en esta votación"
-        no_assignments: "No tiene turnos como presidente de mesa en esta votación"
+        no_assignments: "No tiene turnos como presidente de mesa en esta votación."
     polls:
       index:
         title: "Listado de votaciones"
@@ -200,9 +201,9 @@ es:
         questions_tab: Preguntas
         booths_tab: Urnas
         officers_tab: Presidentes de mesa
-        no_booths: "No hay urnas en esta votación."
+        no_booths: "No hay urnas asignadas a esta votación."
-        no_questions: "No hay preguntas asignadas a esta votación todavía."
+        no_questions: "No hay preguntas asignadas a esta votación."
-        no_officers: "No hay presidentes de mesa asignados."
+        no_officers: "No hay presidentes de mesa asignados a esta votación."
         remove_booth: "Desasignar urna"
         booths_title: "Listado de urnas asignadas"
         officers_title: "Listado de presidentes de mesa asignados"
@@ -212,11 +213,14 @@ es:
         add_question: "Incluir pregunta"
         add_officer_assignments: "Añadir turnos como presidente de mesa"
         edit_officer_assignments: "Editar turnos"
-        name: "Nombre"
-        location: "Ubicación"
-        email: "Email"
         search_results: "Resultados de la búsqueda"
-        no_search_results: "No se han encontrado resultados"
+        no_search_results: "No se han encontrado resultados."
+        table_title: "Título"
+        table_summary: "Resumen"
+        table_assignment: "Asignación"
+        table_name: "Nombre"
+        table_location: "Ubicación"
+        table_email: "Email"
       flash:
         question_added: "Pregunta añadida a esta votación"
         error_on_question_added: "No se pudo asignar la pregunta"