consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improves layout and tables for polls shifts

Browse Source
This commit is contained in:
decabeza
2017-09-08 16:50:53 +02:00
parent b1abb9dbb3
commit 3b4e80a34d
8 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/admin/poll/booths/index.html.erb
View File

@@ -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>&nbsp;</th> <th class="text-right"><%= t("admin.actions.actions") %></th>
<th>&nbsp;</th>
</thead> </thead>
<tbody> <tbody>
<% @booths.each do |booth| %> <% @booths.each do |booth| %>

7
app/views/admin/poll/shifts/_form.html.erb
View File

@@ -6,8 +6,9 @@
<%= 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>
@@ -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 %>

6
app/views/admin/poll/shifts/_search_officers_results.html.erb
View File

@@ -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,10 +24,10 @@
<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 %>

6
app/views/admin/poll/shifts/new.html.erb
View File

@@ -3,7 +3,9 @@
<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" %>
@@ -11,7 +13,7 @@
<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 %>

2
config/locales/en/admin.yml
View File

@@ -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"

2
config/locales/es/admin.yml
View File

@@ -509,7 +509,7 @@ 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"