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

Fixed some conflicts automatically merged that didn't realised before they were there

Browse Source
This commit is contained in:
iagirre
2017-10-18 10:27:41 +02:00
parent c896800325
commit 81b1fb1a72
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/views/polls/_show.html.erb
View File

@@ -8,7 +8,7 @@
</div>
<% else %>
<% if current_user && !@poll.votable_by?(current_user) %>
<% if current_user && @poll.voted_in_web?(current_user) %>
<div class="callout warning">
<%= t("polls.show.already_voted_in_web") %>
</div>
@@ -49,8 +49,7 @@
<div class="row padding">
<% @poll_questions_answers.each do |answer| %>
<div class="small-12 medium-6 column end" id="answer_<%= answer.id %>"
data-toggler="medium-6 answer-divider">
<div class="small-12 medium-6 column end answer <%= cycle('first', '') %>" id="answer_<%= answer.id %>">
<% if answer.description.present? %>
<h3><%= answer.title %></h3>
@@ -96,6 +95,22 @@
<% end %>
</div>
<% end %>
<% if answer.videos.present? %>
<div class="video-link">
<p>
<span class="icon-video"></span>&nbsp;
<strong><%= t("polls.show.videos") %></strong>
</p>
<% answer.videos.each do |video| %>
<%= link_to video.title,
video.url,
target: "_blank",
rel: "nofollow" %><br>
<% end %>
</div>
<% end %>
</div>
<% end %>
</div>

21
app/views/polls/show.html.erb
View File

@@ -31,28 +31,11 @@
<div class="tabs-content" data-tabs-content="polls-tabs" role="tablist">
<%= render "results_subnavigation" %>
<% if current_user && @poll.voted_in_web?(current_user) %>
<div class="small-12 medium-6 column end answer <%= cycle('first', '') %>" id="answer_<%= answer.id %>">
<div id="tab-stats" class="tabs-panel">
<%= render "polls/stats/show" %>
target: "_blank",
rel: "nofollow" %><br>
<% end %>
</div>
<% end %>
<% if answer.videos.present? %>
<div class="video-link">
<p>
<span class="icon-video"></span>&nbsp;
<strong><%= t("polls.show.videos") %></strong>
</p>
<% answer.videos.each do |video| %>
<%= link_to video.title,
video.url,
<%= render "polls/stats/show" %>
</div>
<div id="tab-information" class="tabs-panel is-active">
<%= render "show" %>
</div>