diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb index d197112f5..17ebde59d 100644 --- a/app/views/admin/poll/questions/_form.html.erb +++ b/app/views/admin/poll/questions/_form.html.erb @@ -12,13 +12,19 @@ label: t("admin.questions.new.poll_label") %> - <%= f.text_field :title, maxlength: Poll::Question.title_max_length %> + <%= f.text_field :title %>
<%= f.label :video_url, t("proposals.form.proposal_video_url") %> -

<%= t("proposals.form.proposal_video_url_note") %>

- <%= f.text_field :video_url, placeholder: t("proposals.form.proposal_video_url"), label: false, - aria: {describedby: "video-url-help-text"} %> + +

+ <%= t("proposals.form.proposal_video_url_note") %> +

+ + <%= f.text_field :video_url, + placeholder: t("proposals.form.proposal_video_url"), + label: false, + aria: {describedby: "video-url-help-text"} %>
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 1eb128333..ed64b20f0 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -66,29 +66,40 @@
-
-
+ <% @poll.questions.map(&:question_answers).flatten.each do |answer| %> + <% if answer.description.present? || answer.images.any? || answer.documents.present? %> +
+
- <% @poll.questions.map(&:question_answers).flatten.each do |answer| %> -
- <% if answer.description.present? %>

<%= answer.title %>

- <% end %> - <% if answer.images.any? %> - <%= render "gallery", answer: answer %> - <% end %> + <% if answer.description.present? %> +
+ <%= safe_html_with_links simple_format(answer.description) %> +
+ <% end %> - <% if answer.description.present? %> -
- <%= safe_html_with_links simple_format(answer.description) %> -
- <% end %> + <% if answer.images.any? %> + <%= render "gallery", answer: answer %> + <% end %> + + <% if answer.documents.present? %> + <% answer.documents.each do |document| %> + + <%= link_to document.title, + document.attachment.url, + target: "_blank", + rel: "nofollow" %> + + <% end %> + <% end %> +
- <% end %> -
-
+
+ <% end %> + <% end %>