decidim-meetings 0.28.5 → 0.29.0.rc1

data/app/views/decidim/meetings/admin/poll/_question.html.erb

@@ -2,11 +2,13 @@
 <% is_expanded = question.errors.any? %>
 <div class="card questionnaire-question" id="<%= id %>-field">
   <div class="form__wrapper" data-component="accordion">
-    <div class="card-divider question-divider">
+    <div class="card-divider">
       <h2 class="card-title">
         <span>
           <% if editable %>
             <%== icon("drag-move-2-fill") %>
+          <% else %>
+            <%== icon("lock-line") %>
           <% end %>
           <%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t("question", scope: "decidim.forms.admin.questionnaires.question")) %>
         </span>
@@ -22,18 +24,18 @@
             </span>
           </button>
 
-          <% if editable %>
-            <button class="button button__sm button__transparent-secondary small alert hollow move-up-question button--title">
-              <%= icon "arrow-up-line" %>
-              <span><%= t("up", scope: "decidim.forms.admin.questionnaires.question") %></span>
-            </button>
+          <button class="button button__sm button__transparent-secondary small alert move-up-question button--title">
+            <%= icon "arrow-up-line" %>
+            <span><%= t("up", scope: "decidim.forms.admin.questionnaires.question") %></span>
+          </button>
 
-            <button class="button button__sm button__transparent-secondary small alert hollow move-down-question button--title">
-              <%= icon "arrow-down-line" %>
-              <span><%= t("down", scope: "decidim.forms.admin.questionnaires.question") %></span>
-            </button>
+          <button class="button button__sm button__transparent-secondary small alert move-down-question button--title">
+            <%= icon "arrow-down-line" %>
+            <span><%= t("down", scope: "decidim.forms.admin.questionnaires.question") %></span>
+          </button>
 
-            <button class="button button__sm button__transparent-secondary small alert hollow remove-question button--title">
+          <% if editable %>
+            <button class="button button__sm button__transparent-secondary small alert remove-question button--title">
               <%= t("remove", scope: "decidim.forms.admin.questionnaires.question") %>
             </button>
           <% end %>
@@ -66,17 +68,17 @@
       </div>
 
       <% if question.persisted? %>
-        <%= form.hidden_field :id, disabled: !editable %>
+        <%= form.hidden_field :id %>
       <% end %>
 
-      <%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
+      <%= form.hidden_field :position, value: question.position || 0 %>
       <%= form.hidden_field :deleted, disabled: !editable %>
 
-      <div class="questionnaire-question-answer-options" data-template="<%= answer_option_template_selector %>">
+      <div class="questionnaire-question-answer-options<%= question.editable? ? "" : "-disabled" %>" data-template="<%= answer_option_template_selector %>">
         <div class="questionnaire-question-answer-options-list">
           <% question.answer_options.each do |answer_option| %>
             <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", answer_option do |answer_option_form| %>
-              <%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question:, editable: %>
+              <%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question:, editable: question.editable? %>
             <% end %>
           <% end %>
         </div>
@@ -87,7 +89,7 @@
         <% end %>
       </div>
 
-      <div class="row column questionnaire-question-max-choices">
+      <div class="row column questionnaire-question-max-choices<%= question.editable? ? "" : "-disabled" %>">
         <%=
           form.select(
             :max_choices,

data/app/views/decidim/meetings/admin/poll/edit.html.erb

@@ -17,13 +17,11 @@
     <%= decidim_form_for(@form, url: update_url, method: :put, html: { class: "form-defaults form edit_questionnaire" }) do |form| %>
       <%= render partial: "decidim/meetings/admin/poll/form", object: form %>
 
-      <% if questionnaire.questions_editable? %>
-        <div class="item__edit-sticky">
-          <div class="item__edit-sticky-container">
-            <%= form.submit t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary" %>
-          </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary" %>
         </div>
-      <% end %>
+      </div>
     <% end %>
   </div>
 </div>

data/app/views/decidim/meetings/admin/registrations/edit.html.erb

@@ -5,16 +5,14 @@
     <div class="flex items-center gap-x-4 ml-auto">
       <%= link_to t("invites", scope: "decidim.meetings.admin.registrations.form"), meeting_registrations_invites_path(meeting), class: "button button__sm button__secondary #{"disabled" unless allowed_to? :read_invites, :meeting, meeting: meeting}" %>
       <% if allowed_to? :export_registrations, :meeting, meeting: meeting %>
-            <span class="exports tiny button button__sm button__secondary button--simple button--title" data-toggle="export-dropdown">
+            <span class="exports button button__sm button__secondary button--title" data-toggle="export-dropdown">
               <%= t "actions.export", scope: "decidim.admin" %>
               <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
             </span>
         <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
           <ul class="vertical menu add-components">
             <% %w(CSV JSON Excel).each do |format| %>
-              <%= link_to export_meeting_registrations_path(meeting_id: meeting, format:) do %>
-                <li class="exports--format--<%= format.downcase %> exports--registrations"><%= t("decidim.admin.exports.export_as", name: t("decidim.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format) %></li>
-              <% end %>
+              <li class="exports--format--<%= format.downcase %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{current_component.manifest.name}.admin.exports.registrations"), export_format: format), export_meeting_registrations_path(meeting_id: meeting, format:) %></li>
             <% end %>
           </ul>
         </div>

data/app/views/decidim/meetings/close_meeting_reminder_mailer/close_meeting_reminder.html.erb

@@ -2,4 +2,4 @@
 
 <p class="email-instructions"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.body", meeting_title: translated_attribute(@meeting.title), meeting_path: @meeting.reported_content_url).html_safe %></p>
 
-<p class="email-closing"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-closing"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.greetings", organization_name: translated_attribute(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/app/views/decidim/meetings/layouts/live_event.html.erb

@@ -14,20 +14,8 @@
     <%= render partial: "layouts/decidim/timeout_modal" %>
 
     <header class="meeting-polls__header">
-      <% if current_user && poll %>
-        <div class="flex gap-2">
-          <button class="button button__sm button__secondary meeting-polls__action-list">
-            <%= t("questions", scope: "decidim.meetings.layouts.live_event") %> <span id="visible-questions-count">(<%= questionnaire.questions.visible.count %>)</span>
-          </button>
-
-          <% if admin_allowed_to?(:update, :poll, meeting: meeting, poll: poll) %>
-            <button class="button button__sm button__secondary meeting-polls__action-administrate"><%= t("administrate", scope: "decidim.meetings.layouts.live_event") %></button>
-          <% end %>
-        </div>
-      <% end %>
-
       <div>
-        <strong class="text-secondary"><%= current_organization.name %></strong> / <strong><%= present(meeting).title(links: true, html_escape: true ) %></strong>
+        <strong class="text-secondary"><%= current_organization_name %></strong> / <strong><%= present(meeting).title(links: true, html_escape: true ) %></strong>
       </div>
 
       <div class="flex gap-10">
@@ -43,8 +31,6 @@
     </header>
 
     <main class="meeting-polls__main">
-      <aside class="meeting-polls__aside" id="meeting-poll-aside" data-decidim-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting) %>"}'></aside>
-      <aside class="meeting-polls__aside" id="admin-meeting-poll-aside" data-decidim-admin-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting, admin: true) %>"}'></aside>
       <%= yield %>
     </main>
 

data/app/views/decidim/meetings/meetings/_datetime.html.erb

@@ -1,8 +1,8 @@
-<div class="card__datetime">
-  <div class="card__datetime__date">
-    <%= l meeting.start_time, format: "%d" %> <span class="card__datetime__month"><%= l meeting.start_time, format: "%B %Y" %></span>
+<div>
+  <div>
+    <%= l meeting.start_time, format: "%d" %> <span><%= l meeting.start_time, format: "%B %Y" %></span>
   </div>
-  <div class="card__datetime__time">
+  <div>
     <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
   </div>
 </div>

data/app/views/decidim/meetings/meetings/_form.html.erb

@@ -1,35 +1,35 @@
-<div class="field hashtags__container">
+<div>
   <%= form.text_field :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
 </div>
 
-<div class="field hashtags__container">
+<div>
   <%= text_editor_for(form, :description, hashtaggable: true) %>
 </div>
 
-<div class="field">
+<div>
   <%= form.select :type_of_meeting,
                   @form.type_of_meeting_select,
                   { include_blank: t(".select_a_meeting_type") },
                   { multiple: false } %>
 </div>
 
-<div class="field" data-meeting-type="in_person">
+<div data-meeting-type="in_person">
   <%= form.geocoding_field :address, input_html: { required: false }, help_text: t(".address_help") %>
 </div>
 
-<div class="field" data-meeting-type="in_person">
+<div data-meeting-type="in_person">
   <%= form.text_area :location, help_text: t(".location_help") %>
 </div>
 
-<div class="field">
+<div>
   <%= form.text_area :location_hints, help_text: t(".location_hints_help") %>
 </div>
 
-<div class="field" data-meeting-type="online">
+<div data-meeting-type="online">
   <%= form.text_field :online_meeting_url, help_text: t(".online_meeting_url_help") %>
 </div>
 
-<div class="field" data-meeting-type="online">
+<div data-meeting-type="online">
   <%= form.select :iframe_embed_type,
                   @form.iframe_embed_type_select,
                   {
@@ -38,28 +38,28 @@
                   } %>
 </div>
 
-<div class="field iframe-fields--access-level" id="meeting_iframe_embed_type" data-meeting-type="online-access-level">
+<div class="iframe-fields--access-level" id="meeting_iframe_embed_type" data-meeting-type="online-access-level">
   <%= form.select :iframe_access_level,
                   @form.iframe_access_level_select,
                   { include_blank: t(".select_an_iframe_access_level") },
                   { multiple: false } %>
 </div>
 
-<div class="field">
+<div>
   <%= form.datetime_field :start_time %>
 </div>
 
-<div class="field">
+<div>
   <%= form.datetime_field :end_time %>
 </div>
 
 <% if current_participatory_space.has_subscopes? %>
-  <div class="field">
+  <div>
     <%= scopes_select_field form, :decidim_scope_id %>
   </div>
 <% end %>
 
-<div class="field">
+<div>
   <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: t(".select_a_category"), disable_parents: false %>
 </div>
 
@@ -74,16 +74,16 @@
   <%= form.number_field :available_slots, help_text: t(".available_slots_help") %>
 </div>
 
-<div class="field" id="meeting_registration_terms">
+<div id="meeting_registration_terms">
   <%= text_editor_for(form, :registration_terms) %>
 </div>
 
-<div class="field" id="meeting_registration_url">
+<div id="meeting_registration_url">
   <%= form.text_field :registration_url, help_text: t(".registration_url_help") %>
-  <label><%= t(".disclaimer", organization: current_component.organization.name) %></label><br>
+  <label><%= t(".disclaimer", organization: organization_name(current_component.organization)) %></label><br>
 </div>
 
-<div class="field">
+<div>
   <%= form.select(
     :user_group_id,
     Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |g| [g.name, g.id] },

data/app/views/decidim/meetings/meetings/_meeting.html.erb

@@ -1,8 +1,9 @@
-<%= render layout: "layouts/decidim/shared/layout_item", locals: nav_paths do %>
+<%= render layout: "layouts/decidim/shared/layout_item" do %>
   <section class="layout-main__section layout-main__heading">
     <h1 class="h2 decorator"><%= present(meeting).title(links: true, html_escape: true ) %></h1>
 
     <%= cell "decidim/meetings/dates_and_map", meeting %>
+    <%= render partial: "meeting_poll_actions", locals: { mobile: true } %>
 
     <div class="layout-author">
       <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), from: meeting, context_actions: nil, layout: :compact %>

data/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb

@@ -12,7 +12,7 @@
       <span><%= display_duration_agenda_items(agenda_item.id, index, agenda_items_times) %></span>
     </h3>
 
-    <div class="meeting__agenda-item__description editor-content"><%= decidim_sanitize(translated_attribute(agenda_item.description)).html_safe %></div>
+    <div class="meeting__agenda-item__description editor-content"><%= decidim_sanitize_translated(agenda_item.description).html_safe %></div>
 
     <% if agenda_item.agenda_item_children.presence %>
       <% parent_start_time = agenda_items_times[index][:start_time] %>
@@ -24,7 +24,7 @@
             <span><%= translated_attribute(agenda_item_child.title) %></span>
             <span><%= display_duration_agenda_items(agenda_item_child.id, index_child, agenda_item_children_times) %></span>
           </h4>
-          <div class="meeting__agenda-item__description"><%= decidim_sanitize(translated_attribute(agenda_item_child.description)).html_safe %></div>
+          <div class="meeting__agenda-item__description"><%= decidim_sanitize_translated(agenda_item_child.description).html_safe %></div>
         </div>
       <% end %>
     <% end %>

data/app/views/decidim/meetings/meetings/_meeting_aside.html.erb

@@ -1,5 +1,7 @@
+<%= render partial: "meeting_poll_actions" %>
+
 <% if meeting.can_be_joined_by?(current_user) || meeting.on_different_platform? %>
-  <section class="layout-aside__section layout-aside__buttons">
+  <section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-sticky-buttons>
     <%= cell "decidim/meetings/join_meeting_button", meeting, show_remaining_slots: true %>
   </section>
 <% end %>

data/app/views/decidim/meetings/meetings/_meeting_minutes.html.erb

@@ -5,7 +5,7 @@
   </div>
 
   <div class="meeting__agenda-item">
-    <div class="meeting__agenda-item__description editor-content mb-4"><%= render_meeting_sanitize_field(meeting, :closing_report) %></div>
+    <div class="meeting__agenda-item__description editor-content mb-4"><%= decidim_sanitize_editor translated_attribute meeting.closing_report %></div>
 
     <% if meeting.video_url.presence %>
       <div class="flex items-center gap-2 mt-2">

data/app/views/decidim/meetings/meetings/_meeting_poll_actions.html.erb

@@ -0,0 +1,15 @@
+<% extra_classes = local_assigns.fetch(:mobile, false) ? " block md:hidden" : " hidden md:block" %>
+<% if meeting.poll&.has_questions? %>
+  <section class="layout-aside__section layout-aside__buttons<%= extra_classes %>">
+    <%= action_authorized_link_to :reply_poll, meeting_polls_answers_path(meeting), class: "button button__xl button__secondary w-full", data: { "redirect_url" => meeting_polls_answers_path(meeting) }, resource: meeting do %>
+      <span>
+        <%= meeting.poll.has_open_questions? ? t("reply_poll", scope: "decidim.meetings.meetings.meeting") : t("view_poll", scope: "decidim.meetings.meetings.meeting") %>
+      </span>
+    <% end %>
+    <% if !allowed_to?(:reply_poll, :meeting, meeting:) && allowed_to?(:update, :poll, meeting:) %>
+      <%= link_to admin_meeting_polls_answers_path(meeting), class: "button button__sm button__transparent-secondary w-full" do %>
+        <span><%= t("administrate", scope: "decidim.meetings.polls.answers.index") %></span>
+      <% end %>
+    <% end %>
+  </section>
+<% end %>

data/app/views/decidim/meetings/polls/answers/_multiple_option.html.erb

@@ -2,16 +2,12 @@
   <% question.answer_options.each_with_index do |answer_option, idx| %>
     <% choice = answer.choices.find { |choice| choice.decidim_answer_option_id == answer_option.id } if answer %>
 
-    <div class="js-collection-input">
-      <%= label_tag do %>
-        <%= check_box_tag "answer[choices][#{idx}][body]",
-                          translated_attribute(answer_option.body),
-                          choice.present?, disabled: %>
+    <%= label_tag "answer[choices][#{answer_option.id}][answer_option_id]", nil, class: "js-collection-input" do %>
+      <%= check_box_tag "answer[choices][#{answer_option.id}][answer_option_id]",
+                        answer_option.id,
+                        choice.present?, disabled: %>
 
-        <%= translated_attribute(answer_option.body) %>
-
-        <%= hidden_field_tag "answer[choices][#{idx}][answer_option_id]", answer_option.id, disabled: %>
-      <% end %>
-    </div>
+      <%= translated_attribute(answer_option.body) %>
+    <% end %>
   <% end %>
 </div>

data/app/views/decidim/meetings/polls/answers/_single_option.html.erb

@@ -3,17 +3,11 @@
 <% question.answer_options.each_with_index do |answer_option, idx| %>
   <% choice_id = "#{field_id}_choices_#{idx}" %>
 
-  <%= label_tag "#{choice_id}_body" do %>
-    <%= radio_button_tag "answer[choices][#{question.id}][body]",
-                         translated_attribute(answer_option.body),
+  <%= label_tag "#{choice_id}_answer_option" do %>
+    <%= radio_button_tag "answer[choices][#{question.id}][answer_option_id]",
+                         answer_option.id,
                          answer_option.id == choice.try(:decidim_answer_option_id),
-                         id: "#{choice_id}_body", disabled: %>
-
+                         id: "#{choice_id}_answer_option", disabled: %>
     <%= translated_attribute(answer_option.body) %>
-
-    <%= hidden_field_tag "answer[choices][#{question.id}][answer_option_id]",
-                         answer_option.id,
-                         id: "#{choice_id}_answer_option",
-                         disabled: %>
   <% end %>
 <% end %>

data/app/views/decidim/meetings/polls/answers/admin.html.erb

@@ -0,0 +1,34 @@
+<% add_decidim_meta_tags({
+                           title: present(meeting).title,
+                           description: present(meeting).description,
+                           url: meeting_url(meeting.id)
+                         }) %>
+
+<%= append_javascript_pack_tag "decidim_meetings" %>
+<%= append_stylesheet_pack_tag "decidim_meetings" %>
+<%= append_javascript_pack_tag "decidim_forms" %>
+
+<% add_body_classes "meeting-poll__layout" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="meeting-polls__topbar is-admin">
+    <%= link_to meeting_path(meeting), class: "button button__sm button__text md:button__text-secondary" do %>
+      <%= icon "arrow-left-line" %>
+      <%= t("back_to_meeting", scope: "decidim.meetings.polls.answers.index_admin") %>
+    <% end %>
+
+    <%= action_authorized_link_to :reply_poll, meeting_polls_answers_path(meeting), class: "button button__sm button__secondary", data: { "redirect_url" => meeting_polls_answers_path(meeting) }, resource: meeting do %>
+      <%= t("view_poll", scope: "decidim.meetings.polls.answers.index_admin") %>
+    <% end %>
+  </div>
+
+  <div class="text-center">
+    <h1 class="title-decorator inline-block text-left">
+      <%= t("title", scope: "decidim.meetings.polls.answers.index_admin") %>
+    </h1>
+  </div>
+
+  <div class="meeting-polls" id="admin-meeting-poll" data-decidim-admin-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting, admin: true) %>"}'>
+    <%= render partial: "decidim/meetings/polls/questions/index_admin", locals: { open_question: nil } %>
+  </div>
+<% end %>

data/app/views/decidim/meetings/polls/answers/index.html.erb

@@ -0,0 +1,36 @@
+<% add_decidim_meta_tags({
+                           title: present(meeting).title,
+                           description: present(meeting).description,
+                           url: meeting_url(meeting.id)
+                         }) %>
+
+<%= append_javascript_pack_tag "decidim_meetings" %>
+<%= append_stylesheet_pack_tag "decidim_meetings" %>
+<%= append_javascript_pack_tag "decidim_forms" %>
+
+<% add_body_classes "meeting-poll__layout" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="meeting-polls__topbar">
+    <%= link_to meeting_path(meeting), class: "button button__sm button__text-secondary" do %>
+      <%= icon "arrow-left-line" %>
+      <%= t("back_to_meeting", scope: "decidim.meetings.polls.answers.index_admin") %>
+    <% end %>
+
+    <% if admin_allowed_to?(:update, :poll, meeting: meeting, poll: poll) %>
+      <%= link_to admin_meeting_polls_answers_path(meeting), class: "button button__sm button__primary" do %>
+        <%= t("administrate", scope: "decidim.meetings.polls.answers.index") %>
+      <% end %>
+    <% end %>
+  </div>
+
+  <div class="text-center">
+    <h1 class="title-decorator inline-block text-left">
+      <%= t("title", scope: "decidim.meetings.polls.answers.index") %>
+    </h1>
+  </div>
+
+  <div class="meeting-polls" id="meeting-poll" data-decidim-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting) %>"}'>
+    <%= render partial: "decidim/meetings/polls/questions/index" %>
+  </div>
+<% end %>

data/app/views/decidim/meetings/polls/questions/_closed_question.html.erb

@@ -1,7 +1,13 @@
-<summary><%= t(".question_results") %></summary>
+<summary>
+  <span><%= t(".question") %></span>
+  <span><%= t(".question_results") %></span>
+</summary>
 
 <div>
-  <p><%= translated_attribute(question.body) %></p>
+  <p class="h3"><%= translated_attribute(question.body) %></p>
+  <span id="<%= "closed-announcement-#{question.id}" %>" hidden>
+    <%= cell "decidim/announcement", t("announcement", scope: "decidim.meetings.polls.questions.closed_question"), callout_class: "warning" %>
+  </span>
 
   <%= cell "decidim/meetings/question_responses", question %>
 </div>

data/app/views/decidim/meetings/polls/questions/_index_admin.html.erb

@@ -1,40 +1,43 @@
-<div class="meeting-polls__admin-label"><%= t(".admin_dashboard") %></div>
-
 <% questionnaire.questions.includes([:questionnaire]).each do |question| %>
   <details class="meeting-polls__question meeting-polls__question--admin open" data-question="<%= question.id %>" <%= "open" if open_question == question.id %>>
-    <summary><%= t(".question") %></summary>
+    <summary>
+      <span><%= t(".question") %></span>
+      <span><%= t(question.status, scope: "decidim.meetings.polls.questions.index_admin.statuses") %></span>
+    </summary>
 
     <%= form_tag(meeting_polls_question_path(meeting, question), method: :patch, remote: true) do %>
-      <div>
-        <p><%= translated_attribute(question.body) %></p>
+      <p class="h3"><%= translated_attribute(question.body) %></p>
 
-        <%= link_to t(".edit"), Decidim::EngineRouter.admin_proxy(meeting.component).edit_meeting_poll_path(meeting), target: "_blank", rel: "noopener noreferrer" %>
+      <% if question.unpublished? %>
+        <%= link_to(
+          t(".edit"),
+          Decidim::EngineRouter.admin_proxy(meeting.component).edit_meeting_poll_path(meeting),
+          class: "button button__xs button__secondary mr-auto mt-2",
+          target: "_blank",
+          rel: "noopener noreferrer"
+        ) %>
+      <% end %>
 
+      <div>
         <div class="meeting-polls__admin-action meeting-polls__admin-action-question">
-          <div><%= t(".question") %></div>
-          <div>
-            <% if question.unpublished? %>
-              <button class="button button__sm button__secondary"><%= t(".send") %></button>
-            <% else %>
-              <div><strong><%= t(".sent") %></strong></div>
-              <div><%= pluralize(question.answers_count, t(".received_answer"), t(".received_answers")) %></div>
-            <% end %>
-          </div>
+          <div class="h4"><%= t(".question") %><%= " · " + t(".sent") if question.published? %></div>
+
+          <% if question.unpublished? %>
+            <button class="button button__sm button__secondary"><%= t(".send") %></button>
+          <% else %>
+            <div><%= pluralize(question.answers_count, t(".received_answer"), t(".received_answers")) %></div>
+          <% end %>
         </div>
+
         <div class="meeting-polls__admin-action meeting-polls__admin-action-results">
-          <div><%= t(".results") %></div>
+          <div class="h4"><%= t(".results") %></div>
+
+          <button class="button button__sm button__secondary" <%= question.published? ? "" : "disabled" %>><%= question.closed? ? t(".sent") : t(".send") %></button>
+
           <div>
             <% unless question.unpublished? %>
               <%= cell "decidim/meetings/question_responses", question %>
             <% end %>
-
-            <% if question.unpublished? %>
-              <button class="button button__sm button__secondary" disabled><%= t(".send") %></button>
-            <% elsif question.published? %>
-              <button class="button button__sm button__secondary"><%= t(".send") %></button>
-            <% elsif question.closed? %>
-              <div class="mt-1"><strong><%= t(".sent") %></strong></div>
-            <% end %>
           </div>
         </div>
       </div>

data/app/views/decidim/meetings/polls/questions/_published_question.html.erb

@@ -1,11 +1,15 @@
-<summary><%= t(".question") %></summary>
+<summary>
+  <span><%= t(".question") %></span>
+</summary>
 
 <div>
-  <p><%= translated_attribute(question.body) %></p>
 
   <% @form = form || Decidim::Meetings::AnswerForm.new(question_id: question.id, current_user:) %>
-  <%= decidim_form_for(@form, url: meeting_polls_answers_path(meeting), method: :post, remote: true, html: { class: "form-defaults mt-4" }, data: { "safe-path" => meeting_live_event_path(meeting) }) do |form| %>
-    <div class="answer question" data-max-choices="<%= question.max_choices %>">
+
+  <p class="h3"><%= @form.label %></p>
+
+  <%= decidim_form_for(@form, url: meeting_polls_answers_path(meeting), method: :post, remote: true, html: { class: "form-defaults" }, data: { "safe-path" => meeting_live_event_path(meeting) }) do |form| %>
+    <div class="meeting-polls__answer" data-max-choices="<%= question.max_choices %>">
       <p class="form-error max-choices-alert mt-0 mb-4"><%= t(".max_choices_alert") %></p>
 
       <%= render partial: "decidim/meetings/polls/answers/#{question.question_type}", locals: { answer: @form.answer, question:, answer_form: form, disabled: question.answered_by?(current_user), field_id: question.id } %>
@@ -15,13 +19,12 @@
       <% @form.errors.full_messages.each do |msg| %>
         <small class="form-error is-visible mt-1"><%= msg %></small>
       <% end %>
+
+      <% if question.answered_by?(current_user) %>
+        <%= cell("decidim/announcement", t(".question_replied"), callout_class: "success" ) %>
+      <% else %>
+        <button class="ml-auto mt-8 button button__lg button__secondary"><%= t(".reply_question") %></button>
+      <% end %>
     </div>
-    <% if question.answered_by?(current_user) %>
-      <%= cell("decidim/announcement", t(".question_replied"), callout_class: "success" ) %>
-    <% else %>
-      <div class="text-right">
-        <button class="ml-auto button button button__sm button__secondary"><%= t(".reply_question") %></button>
-      </div>
-    <% end %>
   <% end %>
 </div>

data/app/views/decidim/meetings/polls/questions/_question.html.erb

@@ -1,4 +1,4 @@
-<details class="meeting-polls__question" data-question="<%= question.id %>" <%= "open" if local_assigns.fetch(:open_question, nil) == question %>>
+<details class="meeting-polls__question" data-question="<%= question.id %>" data-status="<%= question.status %>" <%= "open" if local_assigns.fetch(:open_question, nil) == question %>>
   <% if question.published? %>
     <%= render partial: "decidim/meetings/polls/questions/published_question", locals: { question:, form: local_assigns.fetch(:form, nil) } %>
   <% elsif question.closed? %>

data/app/views/decidim/meetings/polls/questions/index.js.erb

@@ -1,5 +1,5 @@
-var $aside = $("#meeting-poll-aside");
+var $meetingPoll = $("[data-decidim-meetings-poll]");
 
-if($aside.length){
-  $aside.html('<%= j(render partial: "decidim/meetings/polls/questions/index").strip.html_safe %>');
+if($meetingPoll.length){
+  $meetingPoll.html('<%= j(render partial: "decidim/meetings/polls/questions/index").strip.html_safe %>');
 }

data/app/views/decidim/meetings/polls/questions/index_admin.js.erb

@@ -1,5 +1,5 @@
-var $aside = $("#admin-meeting-poll-aside");
+var $adminMeetingPoll = $("[data-decidim-admin-meetings-poll]");
 
-if($aside.length){
-  $aside.html('<%= j(render partial: "decidim/meetings/polls/questions/index_admin", locals: { open_question: }).strip.html_safe %>');
+if($adminMeetingPoll.length){
+  $adminMeetingPoll.html('<%= j(render partial: "decidim/meetings/polls/questions/index_admin", locals: { open_question: }).strip.html_safe %>');
 }

data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb

@@ -6,5 +6,5 @@
 <% if @meeting.customize_registration_email? %>
   <p><%= present(@meeting).registration_email_custom_content %></p>
 <% end %>
-<br>
+
 <p class="email-instructions"><%= t(".details") %></p>