decidim-meetings 0.27.8 → 0.28.0.rc4

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

@@ -1,180 +1,21 @@
 <% provide(:title, present(meeting).title) %>
 
 <% add_decidim_meta_tags({
-  title: present(meeting).title,
-  description: present(meeting).description,
-  url: meeting_url(meeting.id)
-}) %>
+                           title: present(meeting).title,
+                           description: present(meeting).description,
+                           url: meeting_url(meeting.id)
+                         }) %>
 
 <%
 edit_link(
   resource_locator(meeting).edit,
   :update,
   :meeting,
-  meeting: meeting
+  meeting:
 )
 %>
 
-<div class="row column view-header">
-  <div class="m-bottom">
-    <%= link_to meetings_path, class: "small hollow js-back-to-list" do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".back") %>
-    <% end %>
-  </div>
+<%= append_stylesheet_pack_tag "decidim_meetings", media: "all" %>
+<%= append_javascript_pack_tag "decidim_meetings" %>
 
-  <h2 class="heading2"><%= present(meeting).title(links: true, html_escape: true ) %></h2>
-
-  <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), has_actions: true, from: meeting, context: { extra_classes: ["author-data--small"] } %>
-
-</div>
-<div class="row">
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8
-              large-3 large-push-9">
-
-    <% if allowed_to?(:update, :meeting, meeting: meeting) %>
-      <%= link_to t(".edit_meeting"), edit_meeting_path(meeting), class: "button secondary hollow expanded button-sc button--icon follow-button" %>
-    <% end %>
-
-    <% if allowed_to?(:close, :meeting, meeting: meeting) %>
-      <% caption =  meeting.closed? ? t(".edit_close_meeting") : t(".close_meeting") %>
-      <%= link_to caption, edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "button hollow expanded button-sc button--icon follow-button" %>
-    <% end %>
-
-    <div class="card extra">
-      <div class="card__content">
-        <%= cell("decidim/date_range", { start: meeting.start_time, end: meeting.end_time }) %>
-
-        <%= cell "decidim/meetings/join_meeting_button", meeting, big_button: true, show_remaining_slots: true %>
-        <%= render partial: "decidim/shared/follow_button", locals: { followable: meeting, large: false  } %>
-      </div>
-      <% if meeting.closed? && meeting.closing_visible? %>
-        <% double = meeting.has_contributions? && meeting.has_attendees? %>
-        <div class="card card--secondary extra definition-data">
-          <% if meeting.has_contributions? %>
-            <div class="definition-data__item <%= "definition-data__item--double" if double %>">
-              <span class="definition-data__title"><%= t(".contributions") %></span>
-              <span class="definition-data__number"><%= meeting.contributions_count %></span>
-            </div>
-          <% end %>
-          <% if meeting.has_attendees? %>
-            <div class="definition-data__item <%= "definition-data__item--double" if double %>">
-              <span class="definition-data__title"><%= t(".attendees") %></span>
-              <span class="definition-data__number"><%= meeting.attendees_count %></span>
-            </div>
-          <% end %>
-          <% if meeting.attending_organizations.present? %>
-            <div class="definition-data__item">
-              <span class="definition-data__title"><%= t(".organizations") %></span>
-              <span class="definition-data__text"><%= simple_format(meeting.attending_organizations) %></span>
-            </div>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-
-    <% if registration.present? && registration.meeting.component.settings.registration_code_enabled %>
-      <div class="card extra">
-        <div class="card__content">
-            <div class="registration_code">
-              <span><%= registration_code_help_text %></span>
-              <span><strong><%= registration.code %></strong></span>
-              <div class="text-small"><%= validation_state_for(registration) %></div>
-            </div>
-        </div>
-      </div>
-    <% end %>
-
-    <% if meeting.services.any? %>
-      <div class="card card--list">
-        <% meeting.services.each do |service| %>
-          <div class="card--list__item">
-            <div class="card--list__text card--list__text--top">
-              <%= icon "actions", class: "card--list__icon alert", role: "img", "aria-hidden": true %>
-              <div>
-                <h3 class="card--list__heading heading-small"><%= translated_attribute(service["title"]) %></h3>
-                <span class="text-medium"><%= translated_attribute(service["description"]) %></span>
-              </div>
-            </div>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
-
-    <%= resource_reference(meeting) %>
-    <%= resource_version(meeting, versions_path: meeting_versions_path(meeting)) %>
-    <%= cell "decidim/meetings/cancel_registration_meeting_button", meeting %>
-    <%= render partial: "decidim/shared/share_modal" %>
-    <% if allowed_to? :embed, :meeting, meeting: @meeting %>
-      <%= embed_modal_for meeting_widget_url(meeting, format: :js) %>
-    <% end %>
-    <%= render partial: "calendar_modal", locals: { ics_url: calendar_meeting_url(meeting), google_url: google_calendar_event_url(meeting) } %>
-  </div>
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
-    <div class="section">
-      <% if meeting.private_meeting? %>
-        <span class="<%= meeting_type_badge_css_class("private") %> label proposal-status">
-          <%= 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 proposal-status">
-          <%= t("transparent", scope: "decidim.meetings.types") %>
-        </span>
-      <% end %>
-      <% if meeting.withdrawn? %>
-        <span class="<%= meeting_type_badge_css_class("withdraw") %> label proposal-status">
-          <%= t("withdraw", scope: "decidim.meetings.types") %>
-        </span>
-      <% end %>
-      <%= render_meeting_body(@meeting) %>
-
-      <% if meeting.maps_enabled? && !meeting.online_meeting? %>
-        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
-      <% end %>
-
-      <% unless meeting.in_person_meeting? || meeting.withdrawn? %>
-        <%= cell "decidim/meetings/online_meeting_link", meeting %>
-      <% end %>
-
-      <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
-    </div>
-
-    <% if meeting.agenda.present? && meeting.agenda.visible? %>
-      <%= render "meeting_agenda" %>
-    <% end %>
-
-    <%= cell "decidim/meetings/public_participants_list", meeting %>
-
-    <% if !meeting.closed? && meeting.user_group_registrations.any? %>
-      <% user_group_ids = meeting.user_group_registrations.user_group_ids %>
-      <div class="section">
-        <h4 class="section-heading"><%= t(".organizations") %></h4>
-        <div class="card card--list">
-          <% Decidim::UserGroup.where(id: user_group_ids).each do |group| %>
-            <div class="card--list__item">
-              <div class="card--list__text card--list__text--top">
-              <%= cell "decidim/author", present(group) %>
-              </div>
-            </div>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-
-    <% if meeting.closed? && meeting.closing_visible? %>
-      <div class="section">
-        <h3 class="section-heading"><%= t(".meeting_minutes") %></h3>
-        <%= decidim_sanitize_editor translated_attribute meeting.closing_report %>
-      </div>
-    <% end %>
-
-    <%= linked_resources_for meeting, :proposals, "proposals_from_meeting" %>
-    <%= linked_resources_for meeting, :results, "meetings_through_proposals" %>
-  </div>
-</div>
-<%= attachments_for meeting %>
-<%= comments_for meeting %>
-<%= pad_iframe_for meeting %>
-
-<%= cell("decidim/flag_modal", meeting) %>
+<%= render partial: "meeting", locals: { meeting: } %>

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

@@ -1,17 +1,13 @@
-<div class="answer-questionnaire__single-option js-check-box-collection">
-  <% 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 %>
+<% 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: disabled %>
+  <%= label_tag do %>
+    <%= check_box_tag "answer[choices][#{idx}][body]",
+                      translated_attribute(answer_option.body),
+                      choice.present?, disabled: %>
 
-        <%= translated_attribute(answer_option.body) %>
+    <%= translated_attribute(answer_option.body) %>
 
-        <%= hidden_field_tag "answer[choices][#{idx}][answer_option_id]", answer_option.id, disabled: disabled %>
-      <% end %>
-    </div>
+    <%= hidden_field_tag "answer[choices][#{idx}][answer_option_id]", answer_option.id, disabled: %>
   <% end %>
-</div>
+<% end %>

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

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

data/app/views/decidim/meetings/polls/answers/create.js.erb

@@ -1,5 +1,5 @@
 var $question = $("[data-question=\"<%= question.id %>\"]");
 
 if($question.length){
-  $question.replaceWith('<%= j(render partial: "decidim/meetings/polls/questions/question", locals: { form: @form, question: question, open_question: question }).strip.html_safe %>');
+  $question.replaceWith('<%= j(render partial: "decidim/meetings/polls/questions/question", locals: { form: @form, question:, open_question: question }).strip.html_safe %>');
 }

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

@@ -1,5 +1,5 @@
 <% if questionnaire.all_questions_unpublished? %>
-  <p class="padding-1"><%= t(".empty_questions") %></p>
+  <p class="p-4"><%= t(".empty_questions") %></p>
 <% else %>
   <%= render partial: "decidim/meetings/polls/questions/question", collection: questionnaire.questions.includes([:questionnaire]).visible %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div class="meeting-polls__admin-label"><%= t(".admin_dashboard") %></div>
 
 <% questionnaire.questions.includes([:questionnaire]).each do |question| %>
-  <details class="meeting-polls__question--admin text-medium open" data-question="<%= question.id %>" <%= "open" if open_question == question.id %>>
+  <details class="meeting-polls__question meeting-polls__question--admin open" data-question="<%= question.id %>" <%= "open" if open_question == question.id %>>
     <summary><%= t(".question") %></summary>
 
     <%= form_tag(meeting_polls_question_path(meeting, question), method: :patch, remote: true) do %>
@@ -14,7 +14,7 @@
           <div><%= t(".question") %></div>
           <div>
             <% if question.unpublished? %>
-              <button class="button button--nomargin primary small"><%= t(".send") %></button>
+              <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>
@@ -29,11 +29,11 @@
             <% end %>
 
             <% if question.unpublished? %>
-              <button class="button button--nomargin primary small margin-top-1" disabled><%= t(".send") %></button>
+              <button class="button button__sm button__secondary" disabled><%= t(".send") %></button>
             <% elsif question.published? %>
-              <button class="button button--nomargin primary small margin-top-1"><%= t(".send") %></button>
+              <button class="button button__sm button__secondary"><%= t(".send") %></button>
             <% elsif question.closed? %>
-              <div class="margin-top-1"><strong><%= t(".sent") %></strong></div>
+              <div class="mt-1"><strong><%= t(".sent") %></strong></div>
             <% end %>
           </div>
         </div>

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

@@ -3,26 +3,24 @@
 <div>
   <p><%= translated_attribute(question.body) %></p>
 
-  <% @form = form || Decidim::Meetings::AnswerForm.new(question_id: question.id, current_user: current_user) %>
-  <%= decidim_form_for(@form, url: meeting_polls_answers_path(meeting), method: :post, remote: true, html: { class: "form answer-questionnaire" }, data: { "safe-path" => meeting_live_event_path(meeting) }) do |form| %>
-    <div class="row column answer question" data-max-choices="<%= question.max_choices %>">
-      <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
-
-      <%= render partial: "decidim/meetings/polls/answers/#{question.question_type}", locals: { answer: @form.answer, question: question, answer_form: form, disabled: question.answered_by?(current_user), field_id: question.id  } %>
+  <% @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 %>">
+      <%= 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 } %>
 
       <%= form.hidden_field :question_id %>
 
+      <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
+
       <% @form.errors.full_messages.each do |msg| %>
-        <small class="form-error is-visible margin-top-1"><%= msg %></small>
+        <small class="form-error is-visible mt-1"><%= msg %></small>
       <% end %>
     </div>
     <% if question.answered_by?(current_user) %>
-      <div class="callout success margin-top-1">
-        <%= t(".question_replied") %>
-      </div>
+      <%= cell("decidim/announcement", t(".question_replied"), callout_class: "success" ) %>
     <% else %>
       <div class="text-right">
-        <button class="button button--nomargin primary small margin-top-1"><%= t(".reply_question") %></button>
+        <button class="ml-auto button button button__sm button__secondary"><%= t(".reply_question") %></button>
       </div>
     <% end %>
   <% end %>

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

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

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

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

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

@@ -0,0 +1,20 @@
+<% 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 partial: "decidim/meetings/calendar_modal", locals: {
+        path: short_url(
+          route_name: "calendar",
+          params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }
+        )
+      } %>
+<% end %>

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

@@ -0,0 +1,24 @@
+<% add_decidim_page_title(t("decidim.meetings.directory.meetings.index.meetings")) %>
+
+<%= append_stylesheet_pack_tag "decidim_meetings", media: "all" %>
+<%= append_javascript_pack_tag "decidim_meetings" %>
+
+<% content_for :aside do %>
+  <%= render partial: "decidim/meetings/shared/meetings_aside", locals: { main_action: true, search_variable:, filter_options:, component: } %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+  <% if display_map %>
+    <div class="meeting-list__map">
+      <%= cell "decidim/meetings/meetings_map", search.result %>
+    </div>
+  <% end %>
+
+  <% if display_announcement %>
+    <%= render partial: "decidim/shared/component_announcement" %>
+  <% end %>
+
+  <section id="meetings" class="layout-main__section layout-main__heading">
+    <%= render partial: "decidim/meetings/shared/meetings", locals: { component: } %>
+  </section>
+<% end %>

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

@@ -0,0 +1,16 @@
+var $meetings = $('#meetings');
+$meetings.html('<%= j(render partial: "decidim/meetings/shared/meetings", locals: { component: }).strip.html_safe %>');
+
+var $urlCalendarUrl = $('#urlCalendarUrl');
+$urlCalendarUrl.val("<%= short_url(route_name: "calendar", params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }) %>");
+
+var meeting_frame = document.getElementById("meeting_frame");
+meeting_frame.dataset.filteredPath = "<%= request.fullpath %>"
+
+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 %>');
+  controller.clearMarkers();
+  controller.addMarkers(markerData);
+}

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

@@ -0,0 +1,33 @@
+<% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
+  <%= cell(
+        "decidim/announcement",
+        t("decidim.meetings.meetings.index.text_banner",
+          go_back_link: link_to(t("decidim.meetings.meetings.index.click_here"), meetings_path("filter[with_availability]" => nil))
+         ).html_safe,
+        callout_class: "info"
+      ) %>
+<% end %>
+
+<% 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"><%= t("meetings_count", scope: "decidim.meetings.meetings.count", count: meetings.length) %></h2>
+
+  <%= cell("decidim/announcement", t("decidim.meetings.meetings.meetings.upcoming_meetings_warning"), callout_class: "warning" ) if @forced_past_meetings %>
+
+  <div class="card__list-list">
+    <% meetings.each do |meeting| %>
+      <%= card_for meeting %>
+    <% end %>
+  </div>
+
+  <%= decidim_paginate meetings, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>
+<% end %>
+
+<% if component.present? %>
+  <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
+    <%= link_to t("decidim.meetings.meetings.index.see_all"), meetings_path("filter[with_availability]" => nil), class: "button button__sm button__text-secondary" %>
+  <% else %>
+    <%= link_to t("decidim.meetings.meetings.index.see_all_withdrawn"), meetings_path("filter[with_availability]" => "withdrawn"), class: "button button__sm button__text-secondary" %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,18 @@
+<% title = component.present? ? translated_attribute(component.name) : t("decidim.components.meetings.name") %>
+<% if local_assigns[:main_action] %>
+  <h1 class="title-decorator"><%= title %></h1>
+<% else %>
+  <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 %>
+    <span><%= t("new_meeting", scope: "decidim.meetings.meetings.index") %></span>
+    <%= icon "add-line" %>
+  <% end %>
+<% end %>
+
+<%= render partial: "decidim/meetings/shared/filters", locals: {
+      search_variable:,
+      filter_options: filter_options || {}
+    } %>

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

@@ -1,10 +1,20 @@
-<div class="row">
+<% content_for :aside do %>
+  <%= cell(
+    "decidim/versions_list",
+    versioned_resource,
+    version_path: proc { |version_index| url_for(action: :show, id: version_index) },
+    i18n_scope: "decidim.meetings.versions"
+  ) %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_item" do %>
   <%= cell(
     "decidim/version",
     current_version,
-    index: params[:id].to_i,
-    versioned_resource: versioned_resource,
+    index: params[:id],
+    versioned_resource:,
+    path: proc { |extra_params| url_for(action: :show, id: params[:id], **extra_params) },
     versions_path: proc { url_for(action: :index) },
     i18n_scope: "decidim.meetings.versions"
   ) %>
-</div>
+<% end %>

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

@@ -1,23 +1,21 @@
 <% if meetings.any? %>
-<hr class="reset mt-none mb-m">
-<section class="section" id="venues">
-  <h3 class="section-heading"><%= t("conference_venues", scope: "decidim.meetings") %></h3>
-  <div class="row">
-    <div class="column medium-4">
-      <% meetings.each do |meeting_block| %>
-        <% next if meeting_block.first.empty? %>
+  <section id="venues" class="content-block">
+    <h2 class="h2 decorator"><%= t("conference_venues", scope: "decidim.meetings") %></h2>
+    <div class="conference__map">
+      <div>
+        <% meetings.each do |meeting_block| %>
+          <% next if meeting_block.first.empty? %>
 
-        <% meeting_block.last.each_with_index do |meeting, index| %>
-          <% next if index != 0 %>
+          <% meeting_block.last.each_with_index do |meeting, index| %>
+            <% next if index != 0 %>
 
-          <%== cell("decidim/conferences/conference_address", meeting) %>
+            <div class="conference__map-address">
+              <%== cell("decidim/address", meeting) %>
+            </div>
+          <% end %>
         <% end %>
-      <% end %>
-
       </div>
-    <div class="column medium-8">
       <%= cell "decidim/meetings/meetings_map", meetings_geocoded %>
     </div>
-  </div>
-</section>
+  </section>
 <% end %>

data/config/assets.rb

@@ -7,5 +7,3 @@ Decidim::Webpacker.register_entrypoints(
   decidim_meetings: "#{base_path}/app/packs/entrypoints/decidim_meetings.js",
   decidim_meetings_admin: "#{base_path}/app/packs/entrypoints/decidim_meetings_admin.js"
 )
-
-Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/meetings/meetings")