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

Merge branch 'master' into poll_results_and_stats_tests

Browse Source
This commit is contained in:
decabeza
2017-10-23 20:15:33 +02:00
parent 2081114628 f9458b9ef0
commit 1ea8727668
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/participation.scss
View File

@@ -1807,7 +1807,13 @@
.polls-results-stats {
.sidebar {
border-right: 1px solid $border;
border-bottom: 1px solid $border;
margin-bottom: $line-height;
@include breakpoint(medium) {
border-bottom: 0;
border-right: 1px solid $border;
}
.menu {
padding: 0;

2
app/models/poll/booth.rb
View File

@@ -12,7 +12,7 @@ class Poll
end
def self.available
where(polls: { id: Poll.current_or_incoming }).includes(:polls)
where(polls: { id: Poll.current_or_recounting_or_incoming }).includes(:polls)
end
def assignment_on_poll(poll)

8
app/views/polls/results.html.erb
View File

@@ -5,9 +5,9 @@
<%= render "poll_subnav" %>
<div class="row margin">
<div class="small-12 medium-3 column sidebar">
<h4><%= t("polls.show.results.title") %></h4>
<div class="row margin" data-equalizer data-equalize-on="medium">
<div class="small-12 medium-3 column sidebar" data-equalizer-watch>
<p><strong><%= t("polls.show.results.title") %></strong></p>
<ul class="menu vertical">
<%- @poll.questions.each do |question| %>
<li><%=link_to question.title, "##{question.title.parameterize}" %></li>
@@ -15,7 +15,7 @@
</ul>
</div>
<div class="small-12 medium-9 column">
<div class="small-12 medium-9 column" data-equalizer-watch>
<%- @poll.questions.each do |question| %>
<table id="question_<%= question.id %>_results_table">
<h3 id="<%= question.title.parameterize %>"><%= question.title %></h3>

2
app/views/polls/stats.html.erb
View File

@@ -5,7 +5,7 @@
<%= render "poll_subnav" %>
<div class="row margin" data-equalizer>
<div class="row margin" data-equalizer data-equalize-on="medium">
<div class="small-12 medium-3 column sidebar" data-equalizer-watch>
<p><strong><%= t("polls.show.stats.title") %></strong></p>