prints a button to redirect to the poll when a question is answerable

This commit is contained in:
kikito
2017-01-25 17:58:09 +01:00
parent 480f92bdd9
commit d9351b123d
4 changed files with 31 additions and 13 deletions

View File

@@ -46,9 +46,23 @@
<div class="row margin-top">
<div class="small-12 column">
<% if @question.poll.current? %>
<% if current_user.nil? %>
<% if can? :answer, @question %>
<div class="text-center">
<%= link_to t('poll_questions.show.answer_this_question'),
@question.poll,
class: 'large button'
%>
</div>
<% else %>
<% if @question.poll.incoming? %>
<div class="callout alert">
<%= t('poll_questions.show.cant_answer_incoming') %>
</div>
<% elsif @question.poll.expired? %>
<div class="callout primary">
<%= t('poll_questions.show.cant_answer_expired') %>
</div>
<% elsif current_user.nil? %>
<div class="callout primary">
<%= t("poll_questions.show.not_logged_in",
signin: link_to(t("poll_questions.show.signin"), new_user_session_path, class: "probe-message"),
@@ -70,15 +84,6 @@
<%= render "answers", question: @question %>
</div>
</div>
<% elsif @question.poll.incoming? %>
<div class="callout alert">
<%= t('poll_questions.show.cant_answer_expired') %>
</div>
<% elsif @question.poll.expired? %>
<div class="callout primary">
<%= t('poll_questions.show.cant_answer_incoming') %>
</div>
<% end %>
</div>
</div>

View File

@@ -416,6 +416,7 @@ en:
create_question: "Create question"
default_valid_answers: "Yes, No"
show:
answer_this_question: "Answer this question"
original_proposal: "Original proposal"
author: "Created by"
dates_title: "Participation dates"

View File

@@ -416,6 +416,7 @@ es:
create_question: "Crear pregunta para votación"
default_valid_answers: "Sí, No"
show:
answer_this_question: "Responder a esta pregunta"
original_proposal: "Propuesta original"
author: "Creado por"
dates_title: "Fechas de participación"

View File

@@ -467,7 +467,14 @@ end
puts "Creating polls"
puts "Active Polls"
(1..5).each do |i|
(1..3).each do |i|
poll = Poll.create(name: "Active Poll #{i}",
starts_at: 1.month.ago,
ends_at: 1.month.from_now,
geozone_restricted: false)
puts " #{poll.name}"
end
(4..5).each do |i|
poll = Poll.create(name: "Active Poll #{i}",
starts_at: 1.month.ago,
ends_at: 1.month.from_now,
@@ -477,6 +484,10 @@ puts "Active Polls"
puts " #{poll.name}"
end
puts "Upcoming Poll"
poll = Poll.create(name: "Upcoming Poll",
starts_at: 1.month.from_now,