decidim-meetings 0.29.6 → 0.30.0.rc1

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

@@ -24,7 +24,7 @@
     <%= render "decidim/meetings/admin/poll/answer_option_template", form: question_form, editable: true, template_id: "answer-option-template-dummy" %>
   <% end %>
 
-  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0" data-draggable-table data-sort-url="#" id="questionnaire-questions-list">
+  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0">
     <% @form.questions.each_with_index do |question, index| %>
       <%= fields_for "questionnaire[questions][]", question do |question_form| %>
         <%= render "decidim/meetings/admin/poll/question",
@@ -44,35 +44,6 @@
 
 <script>
   document.addEventListener("DOMContentLoaded", function () {
-    window.Decidim.createEditableForm();
-
-    // Function to initialize the sortable functionality
-    function initializeSortable() {
-      const container = document.querySelector("#questionnaire-questions-list");
-      const questionCards = container?.querySelectorAll(".card.questionnaire-question");
-
-      if (!container || !questionCards?.length) return;
-
-      questionCards.forEach(card => {
-        card.setAttribute("draggable", "true");
-        card.setAttribute("role", "option");
-        card.setAttribute("aria-grabbed", "false");
-      });
-
-      window.Decidim?.createSortableList?.("#questionnaire-questions-list");
-    }
-
-    // Initialize on load and when new options such as questions etc are added
-    initializeSortable();
-
-    const observer = new MutationObserver(() => {
-      clearTimeout(observer.timer);
-      observer.timer = setTimeout(initializeSortable, 500);
-    });
-
-    const container = document.querySelector("#questionnaire-questions-list");
-    if (container) {
-      observer.observe(container, { childList: true, subtree: true });
-    }
-  });
+    window.Decidim.createEditableForm()
+  })
 </script>

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

@@ -24,6 +24,16 @@
             </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 move-down-question button--title">
+            <%= icon "arrow-down-line" %>
+            <span><%= t("down", scope: "decidim.forms.admin.questionnaires.question") %></span>
+          </button>
+
           <% if editable %>
             <button class="button button__sm button__transparent-secondary small alert remove-question button--title">
               <%= t("remove", scope: "decidim.forms.admin.questionnaires.question") %>

data/app/views/decidim/meetings/admin/registration_form/edit_questions.html.erb

@@ -0,0 +1,44 @@
+<% add_decidim_page_title(t("decidim.forms.admin.questionnaires.edit_questions.title")) %>
+
+<% if templates_defined? && choose_template? %>
+  <%= render partial: "decidim/templates/admin/questionnaire_templates/choose", locals: { target: questionnaire, form_title: t("decidim.forms.admin.questionnaires.edit.title") } %>
+<% else %>
+
+  <div class="questionnaire-questions">
+    <div class="item_show__header">
+      <h1 class="item_show__header-title">
+        <%= t("decidim.forms.admin.questionnaires.edit_questions.title") %>
+          <% if questionnaire.questions_editable? %>
+            <button class="button button__sm button__secondary add-question"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.edit_questions") %></button>
+            <button class="button button__sm button__secondary add-separator"><%= t("add_separator", scope: "decidim.forms.admin.questionnaires.edit_questions") %></button>
+            <button class="button button__sm button__secondary add-title-and-description"><%= t("add_title_and_description", scope: "decidim.forms.admin.questionnaires.edit_questions") %></button>
+          <% end %>
+          <% if allowed_to? :preview, :questionnaire %>
+            <%= link_to t("preview", scope: "decidim.forms.admin.questionnaires.form"), public_url, class: "button button__sm button__transparent-secondary", target: :_blank, data: { "external-link": false } %>
+          <% end %>
+          <% if questionnaire.answers.any? %>
+            <%= export_dropdown(current_component, questionnaire.id) if allowed_to? :export_answers, :questionnaire %>
+            <% if allowed_to? :show, :questionnaire_answers %>
+              <%= link_to t("actions.show", scope: "decidim.forms.admin.questionnaires"), questionnaire_participants_url, class: "button button__sm button__secondary new whitespace-nowrap" %>
+            <% end %>
+          <% else %>
+            <button class="button button__sm button__secondary whitespace-nowrap" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
+          <% end %>
+      </h1>
+    </div>
+  </div>
+
+  <div class="item__edit item__edit-1col">
+    <div class="item__edit-form">
+      <%= decidim_form_for(@form, url: update_questions_meeting_registrations_form_path(meeting_id: meeting.id), method: :patch, html: { class: "form-defaults form edit_questions_survey" }) do |form| %>
+        <%= render partial: "decidim/forms/admin/questionnaires/questions_form", object: form %>
+        <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>
+      <% end %>
+    </div>
+  </div>
+
+<% end %>

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

@@ -20,6 +20,7 @@
         </div>
       <% end %>
       <%= link_to t("registration_form" , scope: "decidim.meetings.admin.registrations.form"), edit_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__secondary" %>
+      <%= link_to t("manage_questions" , scope: "decidim.meetings.admin.registrations.form"), edit_questions_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__secondary" %>
     </div>
   </h1>
 </div>

data/app/views/decidim/meetings/directory/meetings/index.html.erb

@@ -6,8 +6,7 @@
       filter_options: {
         date: !@forced_past_meetings,
         type: true,
-        directory_scopes: true,
-        directory_categories: true,
+        taxonomies: true,
         origin: true,
         space_type: true,
         activity: current_user.present?

data/app/views/decidim/meetings/live_events/show.html.erb

@@ -1,10 +1,10 @@
 <% provide(:title, present(meeting).title) %>
 
-<% add_decidim_meta_tags({
-                           title: present(meeting).title,
-                           description: present(meeting).description,
-                           url: meeting_url(meeting.id)
-                         }) %>
+<% add_decidim_meta_tags(
+  title: present(meeting).title,
+  description: present(meeting).description,
+  url: meeting_url(meeting.id),
+  resource: meeting) %>
 
 <div class="meeting-polls__iframe">
   <%== live_meeting_embed_code %>

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

@@ -53,16 +53,12 @@
   <%= form.datetime_field :end_time %>
 </div>
 
-<% if current_participatory_space.has_subscopes? %>
-  <div>
-    <%= scopes_select_field form, :decidim_scope_id %>
-  </div>
+<% if @form.taxonomy_filters&.any? %>
+  <% @form.taxonomy_filters.each do |filter| %>
+    <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+  <% end %>
 <% end %>
 
-<div>
-  <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: t(".select_a_category"), disable_parents: false %>
-</div>
-
 <div class="row column">
   <%= form.select :registration_type,
                   @form.registration_type_select,

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

@@ -1,31 +1,48 @@
 <%= render layout: "layouts/decidim/shared/layout_item" do %>
+
+  <%= render partial: "schema_org_event_meeting" %>
+
   <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 %>
-
-      <% if meeting.private_meeting? %>
-        <span class="<%= meeting_type_badge_css_class("private") %> label">
-          <%= t("private_meeting", scope: "decidim.meetings.types") %>
-        </span>
-      <% end %>
-      <% if meeting.private_meeting? and meeting.transparent? %>
-        <span class="<%= meeting_type_badge_css_class("transparent") %> label">
-          <%= t("transparent", scope: "decidim.meetings.types") %>
-        </span>
-      <% end %>
-      <% if meeting.withdrawn? %>
-        <span class="<%= meeting_type_badge_css_class("withdraw") %> label">
-          <%= t("withdraw", scope: "decidim.meetings.types") %>
-        </span>
-      <% end %>
+      <h1 class="h2 decorator"><%= present(meeting).title(links: true, html_escape: true ) %></h1>
+      <%= cell "decidim/meetings/dates_and_map", meeting %>
+      <div class="block md:hidden">
+        <%= render partial: "meeting_aside", locals: { hide_modal: true } %>
+      </div>
+
+      <%= render partial: "meeting_poll_actions", locals: { mobile: true } %>
+
+    <% if meeting.private_meeting? || meeting.withdrawn? %>
+      <div class="layout-author has_status">
+        <% if meeting.private_meeting? %>
+          <span class="<%= meeting_type_badge_css_class("private") %> label">
+            <%= t("private_meeting", scope: "decidim.meetings.types") %>
+          </span>
+        <% end %>
+        <% if meeting.private_meeting? and meeting.transparent? %>
+          <span class="<%= meeting_type_badge_css_class("transparent") %> label">
+            <%= t("transparent", scope: "decidim.meetings.types") %>
+          </span>
+        <% end %>
+        <% if meeting.withdrawn? %>
+          <span class="<%= meeting_type_badge_css_class("withdraw") %> label">
+            <%= t("withdraw", scope: "decidim.meetings.types") %>
+          </span>
+        <% end %>
+      </div>
+    <% end %>
+
+    <div class="layout-author <%= "has_status" if meeting.private_meeting? || meeting.withdrawn? %>">
+      <div class="relative flex items-center justify-center w-full">
+        <div class="w-10/12 flex items-center gap-4">
+          <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), from: meeting, context_actions: nil, layout: :compact %>
+        </div>
+        <%= render "decidim/shared/resource_actions", resource: meeting do %>
+          <%= render "decidim/meetings/meetings/meeting_actions" %>
+        <% end %>
+      </div>
     </div>
-  </section>
 
+  </section>
   <section class="layout-main__section">
     <div class="editor-content">
       <%= render_meeting_body(@meeting) %>
@@ -52,14 +69,22 @@
     </section>
   <% end %>
 
+  <%= cell("decidim/tags", meeting) %>
+
   <section class="layout-main__section layout-main__buttons" data-buttons>
-    <%= render partial: "actions" %>
+    <%= cell "decidim/comments_button", nil %>
+
+    <div class="ml-auto lg:ml-0">
+      <%= cell "decidim/share_widget", meeting %>
+    </div>
   </section>
 
   <%= pad_iframe_for meeting %>
 
   <% content_for :aside do %>
-    <%= render partial: "meeting_aside" %>
+    <div class="hidden md:block">
+      <%= render partial: "meeting_aside" %>
+    </div>
   <% end %>
 
   <% content_for :item_footer do %>

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

@@ -0,0 +1,34 @@
+<% if allowed_to?(:update, :meeting, meeting: meeting) %>
+  <li role="menuitem">
+    <%= link_to edit_meeting_path(meeting), class: "button button__sm button__text button__text-secondary"  do %>
+      <span><%= t("edit_meeting", scope: "decidim.meetings.meetings.meeting") %></span>
+      <%= icon "pencil-line" %>
+    <% end %>
+  </li>
+<% end %>
+
+<% if allowed_to?(:close, :meeting, meeting: meeting) %>
+  <% caption = meeting.closed? ? t("edit_close_meeting", scope: "decidim.meetings.meetings.meeting") : t("close_meeting", scope: "decidim.meetings.meetings.meeting") %>
+  <li role="menuitem">
+    <%= link_to edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "button button__sm button__text button__text-secondary"  do %>
+      <span><%= caption %></span>
+      <%= icon "lock-line" %>
+    <% end %>
+  </li>
+<% end %>
+
+<% if meeting.withdrawable_by?(current_user) %>
+  <li role="menuitem">
+    <%= action_authorized_link_to(
+          :withdraw,
+          withdraw_meeting_path(meeting),
+          method: :put,
+          class: "button button__sm button__text button__text-secondary" ,
+          title: t("withdraw_btn_hint", scope: "decidim.meetings.meetings.show"),
+          data: { confirm: t("withdraw_confirmation_html", scope: "decidim.meetings.meetings.show") }
+        ) do %>
+      <span><%= t("withdraw_meeting", scope:"decidim.meetings.meetings.show") %></span>
+      <%= icon "arrow-go-back-line" %>
+    <% end %>
+  </li>
+<% end %>

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

@@ -2,40 +2,7 @@
 
 <% if meeting.can_be_joined_by?(current_user) || meeting.on_different_platform? %>
   <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 %>
-
-<% if allowed_to?(:update, :meeting, meeting: meeting) || allowed_to?(:close, :meeting, meeting: meeting) || meeting.withdrawable_by?(current_user) %>
-  <section class="layout-aside__section layout-aside__buttons">
-    <% if allowed_to?(:update, :meeting, meeting: meeting) %>
-      <%= link_to edit_meeting_path(meeting), class: "button button__sm button__transparent-secondary w-full" do %>
-        <span><%= t("edit_meeting", scope: "decidim.meetings.meetings.meeting") %></span>
-        <%= icon "pencil-line" %>
-      <% end %>
-    <% end %>
-
-    <% if allowed_to?(:close, :meeting, meeting: meeting) %>
-      <% caption = meeting.closed? ? t("edit_close_meeting", scope: "decidim.meetings.meetings.meeting") : t("close_meeting", scope: "decidim.meetings.meetings.meeting") %>
-
-      <%= link_to edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "button button__sm button__transparent-secondary w-full" do %>
-        <span><%= caption %></span>
-        <%= icon "pencil-line" %>
-      <% end %>
-    <% end %>
-
-    <% if meeting.withdrawable_by?(current_user) %>
-      <%= action_authorized_link_to(
-            :withdraw,
-            withdraw_meeting_path(meeting),
-            method: :put,
-            class: "button button__sm button__transparent-secondary w-full",
-            title: t("withdraw_btn_hint", scope: "decidim.meetings.meetings.show"),
-            data: { confirm: t("withdraw_confirmation_html", scope: "decidim.meetings.meetings.show") }
-          ) do %>
-          <span><%= t("withdraw_meeting", scope:"decidim.meetings.meetings.show") %></span>
-      <% end %>
-    <% end %>
+    <%= cell "decidim/meetings/join_meeting_button", meeting, show_remaining_slots: true, hide_modal: local_assigns[:hide_modal] %>
   </section>
 <% end %>
 
@@ -63,37 +30,31 @@
           <% meeting.attending_organizations.split("\n").each do |organizations| %>
           <li><%= organizations %></li>
           <% end %>
-        </ul>
+          </ul>
+        <% end %>
       <% end %>
     <% end %>
-  <% end %>
 
-  <% if registration.present? && registration.meeting.component.settings.registration_code_enabled %>
-    <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "coupon-line" } do %>
-      <h3 class="meeting__aside-block__title"><%= registration_code_help_text %></h3>
-      <div class="meeting__aside-block__large"><%= registration.code %></div>
-      <% if registration.validated? %>
-        <div class="label success"><%= t("validated", scope: "decidim.meetings.meetings.show.registration_state") %></div>
-        <% else %>
-        <div class="label warning"><%= t("validation_pending", scope: "decidim.meetings.meetings.show.registration_state") %></div>
+    <% if registration.present? && registration.meeting.component.settings.registration_code_enabled %>
+      <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "coupon-line" } do %>
+        <h3 class="meeting__aside-block__title"><%= registration_code_help_text %></h3>
+        <div class="meeting__aside-block__large"><%= registration.code %></div>
+        <% if registration.validated? %>
+          <div class="label success"><%= t("validated", scope: "decidim.meetings.meetings.show.registration_state") %></div>
+          <% else %>
+          <div class="label warning"><%= t("validation_pending", scope: "decidim.meetings.meetings.show.registration_state") %></div>
+        <% end %>
       <% end %>
     <% end %>
-  <% end %>
 
-  <% if meeting.services.any? %>
-    <% meeting.services.each do |service| %>
-      <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "star-line" } do %>
-        <h3 class="meeting__aside-block__title"><%= translated_attribute(service["title"]) %></h3>
-        <div class="meeting__aside-block__text"><%= translated_attribute(service["description"]) %></div>
+    <% if meeting.services.any? %>
+      <% meeting.services.each do |service| %>
+        <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "star-line" } do %>
+          <h3 class="meeting__aside-block__title"><%= translated_attribute(service["title"]) %></h3>
+          <div class="meeting__aside-block__text"><%= translated_attribute(service["description"]) %></div>
+        <% end %>
       <% end %>
     <% end %>
-  <% end %>
-</section>
+    <%= cell "decidim/meetings/cancel_registration_meeting_button", meeting, hide_modal: local_assigns[:hide_modal] %>
+  </section>
 <% end %>
-
-<section class="layout-aside__section actions__secondary">
-  <%= cell "decidim/meetings/cancel_registration_meeting_button", meeting %>
-  <%= follow_button_for(meeting) %>
-  <%= cell "decidim/share_button", nil %>
-  <%= cell "decidim/report_button", meeting %>
-</section>

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

@@ -1,11 +1,8 @@
 <% 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 %>
+    <% reply_text = meeting.poll.has_open_questions? ? t("reply_poll", scope: "decidim.meetings.meetings.meeting") : t("view_poll", scope: "decidim.meetings.meetings.meeting") %>
+    <%= action_authorized_link_to :reply_poll, reply_text, meeting_polls_answers_path(meeting), class: "button button__xl button__secondary w-full", data: { "redirect_url" => meeting_polls_answers_path(meeting) }, resource: meeting %>
     <% 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>

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

@@ -0,0 +1,3 @@
+<script type="application/ld+json">
+<%== render_schema_org_event_meeting(meeting) %>
+</script>

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

@@ -15,8 +15,7 @@
       filter_options: {
         date: !@forced_past_meetings,
         type: true,
-        scopes: current_component.has_subscopes?,
-        categories: current_component.categories.any?,
+        taxonomies: true,
         origin: component_settings.creation_enabled_for_participants?,
         space_type: false,
         activity: current_user.present?

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("title", scope: "decidim.meetings.meetings.new")) %>
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
   <div class="text-center py-10">
     <h1 class="title-decorator inline-block text-left">

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

@@ -1,10 +1,10 @@
 <% provide(:title, present(meeting).title) %>
 
-<% add_decidim_meta_tags({
-                           title: present(meeting).title,
-                           description: present(meeting).description,
-                           url: meeting_url(meeting.id)
-                         }) %>
+<% add_decidim_meta_tags(
+  title: present(meeting).title,
+  description: present(meeting).description,
+  url: meeting_url(meeting.id),
+  resource: meeting) %>
 
 <%
 edit_link(

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

@@ -1,8 +1,8 @@
-<% add_decidim_meta_tags({
-                           title: present(meeting).title,
-                           description: present(meeting).description,
-                           url: meeting_url(meeting.id)
-                         }) %>
+<% add_decidim_meta_tags(
+  title: present(meeting).title,
+  description: present(meeting).description,
+  url: meeting_url(meeting.id),
+  resource: meeting) %>
 
 <%= append_javascript_pack_tag "decidim_meetings" %>
 <%= append_stylesheet_pack_tag "decidim_meetings" %>

data/app/views/decidim/meetings/shared/_filters.html.erb

@@ -1,16 +1,4 @@
-<% filter_sections = [].tap do |f|
-    f.append(method: :with_any_date, collection: filter_date_values, label_scope: "decidim.meetings.meetings.filters", id: "date", type: :radio_buttons) if filter_options[:date]
-    f.append(method: :with_any_type, collection: filter_type_values, label_scope: "decidim.meetings.meetings.filters", id: "type") if filter_options[:type]
-    f.append(method: :with_any_scope, collection: filter_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope") if filter_options[:scopes]
-    f.append(method: :with_any_scope, collection: filter_global_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope") if filter_options[:directory_scopes]
-    f.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.meetings.meetings.filters", id: "category") if filter_options[:categories]
-    f.append(method: :with_any_global_category, collection: directory_filter_categories_values, label_scope: "decidim.meetings.meetings.filters", id: "category") if filter_options[:directory_categories]
-    f.append(method: :with_any_origin, collection: filter_origin_values, label_scope: "decidim.meetings.meetings.filters", id: "origin") if filter_options[:origin]
-    f.append(method: :with_any_space, collection: directory_meeting_spaces_values, label_scope: "decidim.meetings.directory.meetings.index", id: "space_type") if filter_options[:space_type]
-    f.append(method: :activity, collection: activity_filter_values, label_scope: "decidim.meetings.meetings.filters", id: "activity", type: :radio_buttons) if filter_options[:activity]
-  end %>
-
-<%= render layout: "decidim/shared/filters", locals: { filter_sections:, search_variable:, skip_to_id: "meetings" } do %>
+<%= render layout: "decidim/shared/filters", locals: { filter_sections: filter_sections(**filter_options), search_variable:, skip_to_id: "meetings" } do %>
   <%= render partial: "decidim/meetings/calendar_modal", locals: {
         path: short_url(
           route_name: "calendar",

data/app/views/decidim/meetings/shared/_index.html.erb

@@ -10,7 +10,7 @@
 <%= render layout: "layouts/decidim/shared/layout_two_col" do %>
   <% if display_map %>
     <div class="meeting-list__map">
-      <%= cell "decidim/meetings/meetings_map", search.result %>
+      <%= cell "decidim/map", search.result, metadata_card: "decidim/meetings/meeting_card_metadata" %>
     </div>
   <% end %>
 

data/app/views/decidim/meetings/shared/_index.js.erb

@@ -7,9 +7,10 @@ $urlCalendarUrl.val("<%= short_url(route_name: "calendar", params: { filter: par
 var $map = $("#map");
 var controller = $map.data("map-controller");
 if (controller) {
-  var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result).to_json.html_safe %>');
+  var markerData = JSON.parse('<%= escape_javascript cell("decidim/map", search.result, metadata_card: "decidim/meetings/meeting_card_metadata").geocoded_data.to_json.html_safe %>');
   controller.clearMarkers();
-  if (markerData.length > 0){
+
+  if (markerData.length > 0) {
     controller.addMarkers(markerData);
   }
 }

data/app/views/decidim/meetings/shared/_meetings.html.erb

@@ -11,7 +11,7 @@
 <% if meetings.length.zero? %>
   <%= cell("decidim/announcement", t("decidim.meetings.meetings.meetings.no_meetings_warning"), callout_class: "warning" ) %>
 <% else %>
-  <h2 class="h5 md:h3 decorator" aria-live="polite" aria-atomic="true"><%= t("meetings_count", scope: "decidim.meetings.meetings.count", count: meetings.total_count) %></h2>
+  <h2 class="h5 md:h3 decorator"><%= t("meetings_count", scope: "decidim.meetings.meetings.count", count: meetings.total_count) %></h2>
 
   <%= cell("decidim/announcement", t("decidim.meetings.meetings.meetings.upcoming_meetings_warning"), callout_class: "warning" ) if @forced_past_meetings %>
 

data/app/views/decidim/meetings/shared/_meetings_aside.html.erb

@@ -5,8 +5,8 @@
   <h2 class="title-decorator"><%= t("decidim.components.meetings.name") %></h2>
 <% end %>
 
-<% if try(:component_settings) && component_settings&.creation_enabled_for_participants? && current_component.participatory_space.can_participate?(current_user) %>
-  <%= action_authorized_link_to :create, new_meeting_path, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_meeting_path } do %>
+<% if allowed_to?(:create, :meeting) %>
+  <%= action_authorized_link_to :create, new_meeting_path, permissions_holder: current_component, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_meeting_path } do %>
     <span><%= t("new_meeting", scope: "decidim.meetings.meetings.index") %></span>
     <%= icon "add-line" %>
   <% end %>

data/app/views/decidim/participatory_spaces/_conference_venues.html.erb

@@ -15,7 +15,7 @@
           <% end %>
         <% end %>
       </div>
-      <%= cell "decidim/meetings/meetings_map", meetings_geocoded %>
+      <%= cell "decidim/map", meetings_geocoded, metadata_card: "decidim/meetings/meeting_card_metadata" %>
     </div>
   </section>
 <% end %>