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

polish styles for tables, assignments and searches on polls admin

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-12-28 13:45:36 +01:00
parent 69ab67a81f
commit 241ddcb163
15 changed files with 247 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/stylesheets/admin.scss
View File

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

11
app/views/admin/poll/officer_assignments/index.html.erb
View File

@@ -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> <h2><%= @officer.name %> - <%= @officer.email %></h2>
<%= form_tag(admin_officer_assignments_path, {id: "officer_assignment_form"}) do %> <%= form_tag(admin_officer_assignments_path, {id: "officer_assignment_form"}) do %>
@@ -40,7 +44,8 @@
<thead> <thead>
<tr> <tr>
<th><%= t("admin.poll_officer_assignments.index.date") %></th> <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> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -48,7 +53,7 @@
<tr id="<%= dom_id officer_assignment %>"> <tr id="<%= dom_id officer_assignment %>">
<td><%= l officer_assignment.date.to_date %></td> <td><%= l officer_assignment.date.to_date %></td>
<td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></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"), <%= link_to t("admin.poll_officer_assignments.index.remove_assignment"),
admin_officer_assignment_path(officer_assignment), admin_officer_assignment_path(officer_assignment),
method: :delete, method: :delete,

10
app/views/admin/poll/polls/_booths.html.erb
View File

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

2
app/views/admin/poll/polls/_officers.html.erb
View File

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

16
app/views/admin/poll/polls/_questions.html.erb
View File

@@ -5,11 +5,21 @@
<%= t('admin.polls.show.no_questions') %> <%= t('admin.polls.show.no_questions') %>
</div> </div>
<% else %> <% 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| %> <% @poll.questions.each do |question| %>
<tr id="<%= dom_id(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'), <%= link_to t('admin.polls.show.remove_question'),
remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id), remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
class: "button hollow alert", class: "button hollow alert",

22
app/views/admin/poll/polls/_search_booths.html.erb
View File

@@ -1,12 +1,16 @@
<%= form_tag(search_booths_admin_poll_path(@poll), method: :get, remote: true) do |f| %> <div class="row">
<div class="input-group"> <div class="small-12 medium-6 column">
<%= text_field_tag :search, <%= form_tag(search_booths_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
@search, <div class="input-group">
placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %> <%= text_field_tag :search,
<div class="input-group-button"> @search,
<%= submit_tag t("admin.shared.booths_search.button"), class: "button" %> placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %>
</div> <div class="input-group-button">
<%= submit_tag t("admin.shared.booths_search.button"), class: "button" %>
</div>
</div>
<% end %>
</div> </div>
<% end %> </div>
<div id="search-booths-results"></div> <div id="search-booths-results"></div>

76
app/views/admin/poll/polls/_search_booths_results.html.erb
View File

@@ -1,32 +1,44 @@
<table> <% if @booths.blank? %>
<thead> <div class="callout alert margin-bottom">
<tr> <%= t('admin.polls.show.no_search_results') %>
<th colspan="3"><%= @booths.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th> </div>
</tr> <% else %>
</thead> <h3><%= t('admin.polls.show.search_results') %></h3>
<tbody> <% end %>
<% @booths.each do |booth| %>
<tr> <% if @booths.any? %>
<td> <table>
<%= booth.name %> <thead>
</td> <tr>
<td> <th><%= t("admin.polls.show.table_name") %></th>
<%= booth.location %> <th><%= t("admin.polls.show.table_location") %></th>
</td> <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
<td class="text-right"> </tr>
<% if @poll.booth_ids.include?(booth.id) %> </thead>
<%= link_to t("admin.polls.show.remove_booth"), <tbody>
admin_booth_assignment_path(poll: @poll, booth: booth), <% @booths.each do |booth| %>
method: :delete, <tr>
class: "button hollow alert" %> <td>
<% else %> <%= booth.name %>
<%= link_to t("admin.polls.show.add_booth"), </td>
admin_booth_assignments_path(poll: @poll, booth: booth), <td>
method: :post, <%= booth.location %>
class: "button hollow" %> </td>
<% end %> <td class="text-center">
</td> <% if @poll.booth_ids.include?(booth.id) %>
</tr> <%= link_to t("admin.polls.show.remove_booth"),
<% end %> admin_booth_assignment_path(poll: @poll, booth: booth),
</tbody> method: :delete,
</table> class: "button hollow alert" %>
<% else %>
<%= link_to t("admin.polls.show.add_booth"),
admin_booth_assignments_path(poll: @poll, booth: booth),
method: :post,
class: "button hollow" %>
<% end %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% end %>

22
app/views/admin/poll/polls/_search_officers.html.erb
View File

@@ -1,12 +1,16 @@
<%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %> <div class="row">
<div class="input-group"> <div class="small-12 medium-6 column">
<%= text_field_tag :search, <%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
@search, <div class="input-group">
placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %> <%= text_field_tag :search,
<div class="input-group-button"> @search,
<%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %> placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %>
</div> <div class="input-group-button">
<%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %>
</div>
</div>
<% end %>
</div> </div>
<% end %> </div>
<div id="search-officers-results"></div> <div id="search-officers-results"></div>

72
app/views/admin/poll/polls/_search_officers_results.html.erb
View File

@@ -1,30 +1,42 @@
<table> <% if @officers.blank? %>
<thead> <div class="callout alert margin-bottom">
<tr> <%= t('admin.polls.show.no_search_results') %>
<th colspan="3"><%= @officers.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th> </div>
</tr> <% else %>
</thead> <h3><%= t('admin.polls.show.search_results') %></h3>
<tbody> <% end %>
<% @officers.each do |user| %>
<tr> <% if @officers.any? %>
<td> <table>
<%= user.name %> <thead>
</td> <tr>
<td> <th><%= t("admin.polls.show.table_name") %></th>
<%= user.email %> <th><%= t("admin.polls.show.table_email") %></th>
</td> <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
<td class="text-right"> </tr>
<% if @poll.officer_ids.include?(user.poll_officer.id) %> </thead>
<%= link_to t("admin.polls.show.edit_officer_assignments"), <tbody>
admin_officer_assignments_path(poll: @poll, officer: user.poll_officer), <% @officers.each do |user| %>
class: "button hollow alert" %> <tr>
<% else %> <td>
<%= link_to t("admin.polls.show.add_officer_assignments"), <%= user.name %>
admin_officer_assignments_path(poll: @poll, officer: user.poll_officer), </td>
class: "button hollow" %> <td>
<% end %> <%= user.email %>
</td> </td>
</tr> <td class="text-center">
<% end %> <% if @poll.officer_ids.include?(user.poll_officer.id) %>
</tbody> <%= link_to t("admin.polls.show.edit_officer_assignments"),
</table> admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
class: "button hollow alert" %>
<% else %>
<%= link_to t("admin.polls.show.add_officer_assignments"),
admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
class: "button hollow" %>
<% end %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% end %>

22
app/views/admin/poll/polls/_search_questions.html.erb
View File

@@ -1,13 +1,17 @@
<%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %> <div class="row">
<div class="input-group"> <div class="small-12 medium-6 column">
<%= text_field_tag :search, <%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
@search, <div class="input-group">
placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %> <%= text_field_tag :search,
@search,
placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %>
<div class="input-group-button"> <div class="input-group-button">
<%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %> <%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %>
</div> </div>
</div>
<% end %>
</div> </div>
<% end %> </div>
<div id="search-questions-results"></div> <div id="search-questions-results"></div>

62
app/views/admin/poll/polls/_search_questions_results.html.erb
View File

@@ -1,25 +1,37 @@
<table> <% if @questions.blank? %>
<thead> <div class="callout alert margin-bottom">
<tr> <%= t('admin.polls.show.no_search_results') %>
<th colspan="3"><%= @questions.blank? ? t('admin.polls.show.no_search_results') : t('admin.polls.show.search_results') %></th> </div>
</tr> <% else %>
</thead> <h3><%= t('admin.polls.show.search_results') %></h3>
<tbody> <% end %>
<% @questions.each do |question| %>
<tr> <% if @questions.any? %>
<td> <table>
<%= question.title %> <thead>
</td> <tr>
<td> <th><%= t("admin.polls.show.table_name") %></th>
<%= question.summary %> <th><%= t("admin.polls.show.table_summary") %></th>
</td> <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
<td class="text-right"> </tr>
<%= link_to t("admin.polls.show.add_question"), </thead>
add_question_admin_poll_path(poll_id: @poll.id, question_id: question.id), <tbody>
method: :patch, <% @questions.each do |question| %>
class: "button hollow" %> <tr>
</td> <td>
</tr> <%= question.title %>
<% end %> </td>
</tbody> <td>
</table> <%= question.summary %>
</td>
<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,
class: "button hollow" %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% end %>

31
app/views/admin/poll/polls/show.html.erb
View File

@@ -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"), <%= link_to t("admin.actions.edit"),
edit_admin_poll_path(@poll), edit_admin_poll_path(@poll),
class: "button hollow float-right" %> 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"> <div id="poll-resources" class="tabs-content" data-tabs-content="assigned-resources-tabs">
<%= render "filter_subnav" %> <%= render "filter_subnav" %>
<div class="tabs-panel is-active" id="tab-questions"> <div class="tabs-panel is-active" id="tab-questions">
<div class="row"> <%= render "search_questions" %>
<div class="small-12 medium-6 column">
<%= render "search_questions" %>
</div>
</div>
<%= render "questions" %> <%= render "questions" %>
</div> </div>
<div class="tabs-panel" id="tab-booths"> <div class="tabs-panel" id="tab-booths">
<div class="row"> <%= render "search_booths" %>
<div class="small-12 medium-6 column">
<%= render "search_booths" %>
</div>
</div>
<%= render "booths" %> <%= render "booths" %>
</div> </div>
<div class="tabs-panel" id="tab-officers"> <div class="tabs-panel" id="tab-officers">
<div class="row"> <%= render "search_officers" %>
<div class="small-12 medium-6 column">
<%= render "search_officers" %>
</div>
</div>
<%= render 'officers' %> <%= render 'officers' %>
</div> </div>
</div> </div>

13
app/views/admin/poll/questions/show.html.erb
View File

@@ -7,14 +7,17 @@
<div class="row"> <div class="row">
<div class="small-12 medium-9 column"> <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> <strong><%= t("admin.questions.show.title") %></strong>
<h1><%= @question.title %></h1> <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> <p>
<strong><%= t("admin.questions.show.author") %></strong> <strong><%= t("admin.questions.show.author") %></strong>
<br> <br>

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

@@ -173,12 +173,13 @@ en:
new_assignment: "New shift" new_assignment: "New shift"
date: "Date" date: "Date"
booth: "Booth" booth: "Booth"
assignment: "Assignment"
select_date: "Select day" select_date: "Select day"
select_booth: "Select booth" select_booth: "Select booth"
add_assignment: "Add shift" add_assignment: "Add shift"
remove_assignment: "Remove" remove_assignment: "Remove"
assignments: "Officing shifts in this poll" 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: polls:
index: index:
title: "List of polls" title: "List of polls"
@@ -200,8 +201,8 @@ en:
questions_tab: Questions questions_tab: Questions
booths_tab: Booths booths_tab: Booths
officers_tab: Officers 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." no_officers: "There are no officers assigned to this poll."
remove_booth: "Remove booth from poll" remove_booth: "Remove booth from poll"
booths_title: "List of booths" booths_title: "List of booths"
@@ -212,11 +213,14 @@ en:
add_question: "Include question" add_question: "Include question"
add_officer_assignments: "Add shifts as officer" add_officer_assignments: "Add shifts as officer"
edit_officer_assignments: "Edit officing shifts" edit_officer_assignments: "Edit officing shifts"
name: "Name"
location: "Location"
email: "Email"
search_results: "Search results" 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: flash:
question_added: "Question added to this poll" question_added: "Question added to this poll"
error_on_question_added: "Question could not be assigned to this poll" error_on_question_added: "Question could not be assigned to this poll"

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

@@ -173,12 +173,13 @@ es:
new_assignment: "Nuevo turno" new_assignment: "Nuevo turno"
date: "Fecha" date: "Fecha"
booth: "Urna" booth: "Urna"
assignment: "Asignación"
select_date: "Seleccionar día" select_date: "Seleccionar día"
select_booth: "Seleccionar urna" select_booth: "Seleccionar urna"
add_assignment: "Añadir turno" add_assignment: "Añadir turno"
remove_assignment: "Eliminar turno" remove_assignment: "Eliminar turno"
assignments: "Turnos como presidente de mesa en esta votación" 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: polls:
index: index:
title: "Listado de votaciones" title: "Listado de votaciones"
@@ -200,9 +201,9 @@ es:
questions_tab: Preguntas questions_tab: Preguntas
booths_tab: Urnas booths_tab: Urnas
officers_tab: Presidentes de mesa 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" remove_booth: "Desasignar urna"
booths_title: "Listado de urnas asignadas" booths_title: "Listado de urnas asignadas"
officers_title: "Listado de presidentes de mesa asignados" officers_title: "Listado de presidentes de mesa asignados"
@@ -212,11 +213,14 @@ es:
add_question: "Incluir pregunta" add_question: "Incluir pregunta"
add_officer_assignments: "Añadir turnos como presidente de mesa" add_officer_assignments: "Añadir turnos como presidente de mesa"
edit_officer_assignments: "Editar turnos" edit_officer_assignments: "Editar turnos"
name: "Nombre"
location: "Ubicación"
email: "Email"
search_results: "Resultados de la búsqueda" 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: flash:
question_added: "Pregunta añadida a esta votación" question_added: "Pregunta añadida a esta votación"
error_on_question_added: "No se pudo asignar la pregunta" error_on_question_added: "No se pudo asignar la pregunta"