improves layout and tables for polls shifts
This commit is contained in:
@@ -15,8 +15,7 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<th><%= t("admin.booths.index.name") %></th>
|
<th><%= t("admin.booths.index.name") %></th>
|
||||||
<th><%= t("admin.booths.index.location") %></th>
|
<th><%= t("admin.booths.index.location") %></th>
|
||||||
<th> </th>
|
<th class="text-right"><%= t("admin.actions.actions") %></th>
|
||||||
<th> </th>
|
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<% @booths.each do |booth| %>
|
<% @booths.each do |booth| %>
|
||||||
|
|||||||
@@ -34,4 +34,4 @@
|
|||||||
|
|
||||||
<%= paginate @officers %>
|
<%= paginate @officers %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -5,12 +5,13 @@
|
|||||||
<legend>
|
<legend>
|
||||||
<%= t("admin.poll_shifts.new.new_shift") %>
|
<%= t("admin.poll_shifts.new.new_shift") %>
|
||||||
</legend>
|
</legend>
|
||||||
|
|
||||||
<div class="small-12 medium-4 column">
|
<div class="small-12 medium-4 column highlight padding">
|
||||||
Officer: <%= @officer.name %>
|
<strong><%= t("admin.poll_shifts.new.officer") %></strong>
|
||||||
|
<br><%= @officer.name %>
|
||||||
<%= f.hidden_field :officer_id, value: @officer.id %>
|
<%= f.hidden_field :officer_id, value: @officer.id %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="small-12 medium-4 column">
|
<div class="small-12 medium-4 column">
|
||||||
<label><%= t("admin.poll_shifts.new.date") %></label>
|
<label><%= t("admin.poll_shifts.new.date") %></label>
|
||||||
<%= f.select :date,
|
<%= f.select :date,
|
||||||
@@ -23,7 +24,7 @@
|
|||||||
|
|
||||||
<div class="small-12 medium-4 column">
|
<div class="small-12 medium-4 column">
|
||||||
<%= f.submit t("admin.poll_shifts.new.add_shift"),
|
<%= f.submit t("admin.poll_shifts.new.add_shift"),
|
||||||
class: "button expanded hollow margin-top" %>
|
class: "button expanded margin-top" %>
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="small-12 medium-6 column">
|
<div class="small-12 medium-6 column">
|
||||||
<%= form_tag search_officers_admin_booth_shifts_path,
|
<%= form_tag search_officers_admin_booth_shifts_path,
|
||||||
method: :get, remote: true do |f| %>
|
method: :get, remote: true do |f| %>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<%= text_field_tag :search,
|
<%= text_field_tag :search,
|
||||||
@search,
|
@search,
|
||||||
placeholder: t("admin.poll_shifts.new.search_officer_placeholder"),
|
placeholder: t("admin.poll_shifts.new.search_officer_placeholder"),
|
||||||
id: "search-officers" %>
|
id: "search-officers" %>
|
||||||
<div class="input-group-button">
|
<div class="input-group-button">
|
||||||
<%= submit_tag t("admin.poll_shifts.new.search_officer_button"),
|
<%= submit_tag t("admin.poll_shifts.new.search_officer_button"),
|
||||||
class: "button" %>
|
class: "button" %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th><%= t("admin.poll_shifts.new.table_name") %></th>
|
<th><%= t("admin.poll_shifts.new.table_name") %></th>
|
||||||
<th><%= t("admin.poll_shifts.new.table_email") %></th>
|
<th><%= t("admin.poll_shifts.new.table_email") %></th>
|
||||||
<th class="text-center">
|
<th class="text-right">
|
||||||
<%= t("admin.poll_shifts.new.table_shift") %>
|
<%= t("admin.poll_shifts.new.table_shift") %>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -24,13 +24,13 @@
|
|||||||
<td>
|
<td>
|
||||||
<%= user.email %>
|
<%= user.email %>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-right">
|
||||||
<%= link_to t("admin.poll_shifts.new.edit_shifts"),
|
<%= link_to t("admin.poll_shifts.new.edit_shifts"),
|
||||||
new_admin_booth_shift_path(officer_id: user.poll_officer.id),
|
new_admin_booth_shift_path(officer_id: user.poll_officer.id),
|
||||||
class: "button hollow alert" %>
|
class: "button hollow" %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -3,18 +3,20 @@
|
|||||||
<h2><%= @booth.name %></h2>
|
<h2><%= @booth.name %></h2>
|
||||||
|
|
||||||
<% if @officer.blank? %>
|
<% if @officer.blank? %>
|
||||||
<%= t("admin.poll_shifts.new.search_officer_text") %>
|
<p>
|
||||||
|
<%= t("admin.poll_shifts.new.search_officer_text") %>
|
||||||
|
</p>
|
||||||
<%= render "search_officers" %>
|
<%= render "search_officers" %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= render "form" %>
|
<%= render "form" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<div id="shifts">
|
<div id="shifts">
|
||||||
<% if @shifts.empty? %>
|
<% if @shifts.empty? %>
|
||||||
<div class="callout primary margin-top">
|
<div class="callout primary">
|
||||||
<%= t("admin.poll_shifts.new.no_shifts") %>
|
<%= t("admin.poll_shifts.new.no_shifts") %>
|
||||||
</div>
|
</div>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= render "shifts" %>
|
<%= render "shifts" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -509,7 +509,7 @@ en:
|
|||||||
remove_shift: "Remove"
|
remove_shift: "Remove"
|
||||||
search_officer_button: Search
|
search_officer_button: Search
|
||||||
search_officer_placeholder: Search officer
|
search_officer_placeholder: Search officer
|
||||||
search_officer_text: Please search for an officer to assign a new shift
|
search_officer_text: Search for an officer to assign a new shift
|
||||||
select_date: "Select day"
|
select_date: "Select day"
|
||||||
table_shift: "Shift"
|
table_shift: "Shift"
|
||||||
table_email: "Email"
|
table_email: "Email"
|
||||||
|
|||||||
@@ -509,13 +509,13 @@ es:
|
|||||||
remove_shift: "Eliminar turno"
|
remove_shift: "Eliminar turno"
|
||||||
search_officer_button: Buscar
|
search_officer_button: Buscar
|
||||||
search_officer_placeholder: Buscar presidentes de mesa
|
search_officer_placeholder: Buscar presidentes de mesa
|
||||||
search_officer_text: Por favor busca al presidente de mesa para asignar un turno
|
search_officer_text: Busca al presidente de mesa para asignar un turno
|
||||||
select_date: "Seleccionar día"
|
select_date: "Seleccionar día"
|
||||||
table_shift: "Turno"
|
table_shift: "Turno"
|
||||||
table_email: "Email"
|
table_email: "Email"
|
||||||
table_name: "Nombre"
|
table_name: "Nombre"
|
||||||
flash:
|
flash:
|
||||||
create: "Añadido turno de presidente de mesa"
|
create: "Añadido turno de presidente de mesa"
|
||||||
destroy: "Eliminado turno de presidente de mesa"
|
destroy: "Eliminado turno de presidente de mesa"
|
||||||
poll_booth_assignments:
|
poll_booth_assignments:
|
||||||
flash:
|
flash:
|
||||||
|
|||||||
Reference in New Issue
Block a user