Add booth location on booth assigment management list, plus poll links on list
This commit is contained in:
@@ -1,6 +1,9 @@
|
|||||||
<td>
|
<td>
|
||||||
<%= link_to booth.name, admin_booth_path(booth) %>
|
<%= link_to booth.name, admin_booth_path(booth) %>
|
||||||
</td>
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= booth.location || t("admin.booths.index.no_location") %>
|
||||||
|
</td>
|
||||||
<% if booth_assignment.present? %>
|
<% if booth_assignment.present? %>
|
||||||
<td>
|
<td>
|
||||||
<span class="verified"><%= t("admin.booth_assignments.manage.status.assigned") %></span>
|
<span class="verified"><%= t("admin.booth_assignments.manage.status.assigned") %></span>
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<%= render "/admin/poll/polls/poll_header" %>
|
<%= render "/admin/poll/polls/poll_header" %>
|
||||||
|
|
||||||
|
|
||||||
<div id="poll-resources">
|
<div id="poll-resources">
|
||||||
<%= render "/admin/poll/polls/subnav" %>
|
<%= render "/admin/poll/polls/subnav" %>
|
||||||
<%= render "search_booths" %>
|
<%= render "search_booths" %>
|
||||||
@@ -30,7 +29,7 @@
|
|||||||
</strong>
|
</strong>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<%= booth_assignment.booth.location %>
|
<%= booth_assignment.booth.location || t("admin.booths.index.no_location") %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
<table>
|
<table>
|
||||||
<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.booth_assignments.manage.status.assign_status") %></th>
|
<th><%= t("admin.booth_assignments.manage.status.assign_status") %></th>
|
||||||
<th class="text-right"><%= t("admin.actions.actions") %></th>
|
<th class="text-right"><%= t("admin.actions.actions") %></th>
|
||||||
</thead>
|
</thead>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<% @polls.each do |poll| %>
|
<% @polls.each do |poll| %>
|
||||||
<tr id="<%= dom_id(poll) %>" class="poll">
|
<tr id="<%= dom_id(poll) %>" class="poll">
|
||||||
<td>
|
<td>
|
||||||
<strong><%= poll.name %></strong>
|
<strong><%= link_to poll.name, admin_poll_path(poll) %></strong>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<%= l poll.starts_at.to_date %> - <%= l poll.ends_at.to_date %>
|
<%= l poll.starts_at.to_date %> - <%= l poll.ends_at.to_date %>
|
||||||
|
|||||||
@@ -675,6 +675,7 @@ en:
|
|||||||
add_booth: "Add booth"
|
add_booth: "Add booth"
|
||||||
name: "Name"
|
name: "Name"
|
||||||
location: "Location"
|
location: "Location"
|
||||||
|
no_location: "No Location"
|
||||||
new:
|
new:
|
||||||
title: "New booth"
|
title: "New booth"
|
||||||
name: "Name"
|
name: "Name"
|
||||||
|
|||||||
@@ -677,6 +677,7 @@ es:
|
|||||||
add_booth: "Añadir urna"
|
add_booth: "Añadir urna"
|
||||||
name: "Nombre"
|
name: "Nombre"
|
||||||
location: "Ubicación"
|
location: "Ubicación"
|
||||||
|
no_location: "Sin Ubicación"
|
||||||
new:
|
new:
|
||||||
title: "Nueva urna"
|
title: "Nueva urna"
|
||||||
name: "Nombre"
|
name: "Nombre"
|
||||||
|
|||||||
Reference in New Issue
Block a user