From a08d5bdba9defd0a29192d4c1b3ae25b5c8e6e00 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Sat, 7 Oct 2017 17:00:26 +0200
Subject: [PATCH] fixes conflict in merge

---
 app/views/polls/show.html.erb | 106 ++++++++++++++++------------------
 1 file changed, 51 insertions(+), 55 deletions(-)

diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb
index ad8b9b0c5..126617684 100644
--- a/app/views/polls/show.html.erb
+++ b/app/views/polls/show.html.erb
@@ -74,64 +74,60 @@
     </div>
   </div>
 
-  <% @poll.questions.map(&:question_answers).flatten.each do |answer| %>
-    <% if answer.description.present? || answer.images.any? || answer.documents.present? %>
-      <div class="expanded poll-more-info-answers">
-        <div class="row padding">
+  <div class="expanded poll-more-info-answers">
+    <div class="row padding">
 
-          <% @poll.questions.map(&:question_answers).flatten.each do |answer| %>
-            <div class="small-12 medium-6 column end" id="answer_<%= answer.id %>"
-                 data-toggler="medium-6 answer-divider">
-              <h3><%= answer.title %></h3>
+      <% @poll.questions.map(&:question_answers).flatten.each do |answer| %>
+        <div class="small-12 medium-6 column end" id="answer_<%= answer.id %>"
+             data-toggler="medium-6 answer-divider">
+          <h3><%= answer.title %></h3>
 
-              <% if answer.description.present? %>
-                <div class="margin-top">
-                  <%= safe_html_with_links simple_format(answer.description) %>
-                </div>
-              <% end %>
-
-              <% if answer.images.any? %>
-                <%= render "gallery", answer: answer %>
-              <% end %>
-
-              <% if answer.description.present? %>
-                <div class="margin-top">
-                  <div id="answer_description_<%= answer.id %>" class="answer-description short" data-toggler="short">
-                    <%= safe_html_with_links simple_format(answer.description) %>
-                  </div>
-                  <a id="read_more_<%= answer.id %>"
-                     data-toggle="answer_description_<%= answer.id %> read_more_<%= answer.id %> read_less_<%= answer.id %>"
-                     data-toggler="hide">
-                    <%= t("polls.show.read_more", answer: answer.title) %>
-                  </a>
-                  <a id="read_less_<%= answer.id %>"
-                     data-toggle="answer_description_<%= answer.id %> read_more_<%= answer.id %> read_less_<%= answer.id %>"
-                     data-toggler="hide"
-                     class="hide">
-                    <%= t("polls.show.read_less", answer: answer.title) %>
-                  </a>
-                </div>
-              <% end %>
-
-              <% if answer.documents.present? %>
-              <div class="document-link">
-                <p>
-                  <span class="icon-document"></span>&nbsp;
-                  <strong><%= t("polls.show.documents") %></strong>
-                </p>
-
-                <% answer.documents.each do |document| %>
-                    <%= link_to document.title,
-                                document.attachment.url,
-                                target: "_blank",
-                                rel: "nofollow" %><br>
-                <% end %>
-              </div>
-              <% end %>
+          <% if answer.description.present? %>
+            <div class="margin-top">
+              <%= safe_html_with_links simple_format(answer.description) %>
             </div>
           <% end %>
+
+          <% if answer.images.any? %>
+            <%= render "gallery", answer: answer %>
+          <% end %>
+
+          <% if answer.description.present? %>
+            <div class="margin-top">
+              <div id="answer_description_<%= answer.id %>" class="answer-description short" data-toggler="short">
+                <%= safe_html_with_links simple_format(answer.description) %>
+              </div>
+              <a id="read_more_<%= answer.id %>"
+                 data-toggle="answer_description_<%= answer.id %> read_more_<%= answer.id %> read_less_<%= answer.id %>"
+                 data-toggler="hide">
+                <%= t("polls.show.read_more", answer: answer.title) %>
+              </a>
+              <a id="read_less_<%= answer.id %>"
+                 data-toggle="answer_description_<%= answer.id %> read_more_<%= answer.id %> read_less_<%= answer.id %>"
+                 data-toggler="hide"
+                 class="hide">
+                <%= t("polls.show.read_less", answer: answer.title) %>
+              </a>
+            </div>
+          <% end %>
+
+          <% if answer.documents.present? %>
+          <div class="document-link">
+            <p>
+              <span class="icon-document"></span>&nbsp;
+              <strong><%= t("polls.show.documents") %></strong>
+            </p>
+
+            <% answer.documents.each do |document| %>
+                <%= link_to document.title,
+                            document.attachment.url,
+                            target: "_blank",
+                            rel: "nofollow" %><br>
+            <% end %>
+          </div>
+          <% end %>
         </div>
-      </div>
-    <% end %>
-  <% end %>
+      <% end %>
+    </div>
+  </div>
 </div>