decidim-meetings 0.27.8 → 0.28.0.rc4

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

@@ -0,0 +1,74 @@
+<%= render layout: "layouts/decidim/shared/layout_item", locals: nav_paths 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 %>
+
+    <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 %>
+    </div>
+  </section>
+
+  <section class="layout-main__section">
+    <div class="editor-content">
+      <%= render_meeting_body(@meeting) %>
+    </div>
+  </section>
+
+  <section class="layout-main__section">
+    <% unless meeting.in_person? || meeting.withdrawn? %>
+      <%= cell "decidim/meetings/online_meeting_link", meeting %>
+    <% end %>
+  </section>
+
+  <%= cell "decidim/tab_panels", tab_panel_items %>
+
+  <% if meeting.agenda.present? && meeting.agenda.visible? %>
+    <section class="layout-main__section">
+      <%= render "meeting_agenda" %>
+    </section>
+  <% end %>
+
+  <% if meeting.closed? && meeting.closing_visible? %>
+    <section class="layout-main__section">
+      <%= render "meeting_minutes" %>
+    </section>
+  <% end %>
+
+  <section class="layout-main__section layout-main__buttons" data-buttons>
+    <%= render partial: "actions" %>
+  </section>
+
+  <%= pad_iframe_for meeting %>
+
+  <% content_for :aside do %>
+    <%= render partial: "meeting_aside" %>
+  <% end %>
+
+  <% content_for :item_footer do %>
+    <%= comments_for meeting %>
+    <ul class="metadata__container layout-main__section" data-metadata-footer>
+      <%= content_tag :li, resource_reference(meeting), class: "metadata__item" %>
+      <%= content_tag :li, resource_version(meeting, versions_path: meeting_version_path(meeting, meeting.versions.count)), class: "metadata__item" %>
+      <%= content_tag :li, link_to(t("add_to_calendar", scope: "decidim.meetings.meetings.calendar_modal"), nil, remote: true, data: { dialog_open: "calendarShare_#{meeting.id}" }), class: "metadata__item" %>
+    </ul>
+  <% end %>
+<% end %>
+
+<%= render partial: "add_to_calendar_modal", locals: { ics_url: calendar_meeting_url(meeting), google_url: google_calendar_event_url(meeting), id: meeting.id } %>

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

@@ -1,31 +1,33 @@
-<div class="section agenda-section">
-  <div class="flex--sbe">
-    <h2 class="section-heading"><%= translated_attribute(meeting.agenda.title) %></h2>
+<section data-meeting-agenda>
+  <div class="meeting__agenda-title">
+    <%= icon "list-ordered" %>
+    <h2 class="h4"><%= translated_attribute(meeting.agenda.title) %></h2>
   </div>
-  <div class="card">
-    <div class="card__content scroll">
-      <% agenda_items_times = calculate_start_and_end_time_of_agenda_items(meeting.agenda.agenda_items.first_class, meeting) %>
-      <% meeting.agenda.agenda_items.first_class.each_with_index do |agenda_item, index| %>
-        <h5 class="agenda-item--title heading5">
-          <strong><%= translated_attribute(agenda_item.title) %></strong>&nbsp;
-          <span class="text-small"><%= display_duration_agenda_items(agenda_item.id, index, agenda_items_times) %></span>
-        </h5>
-        <hr class="reset m-none mb-s">
-        <p><%= decidim_sanitize_translated(agenda_item.description).html_safe %></p>
 
-        <% if agenda_item.agenda_item_children.presence %>
-          <% parent_start_time = agenda_items_times[index][:start_time] %>
-          <% agenda_item_children_times = calculate_start_and_end_time_of_agenda_items(agenda_item.agenda_item_children, meeting, parent_start_time) %>
+  <% agenda_items_times = calculate_start_and_end_time_of_agenda_items(meeting.agenda.agenda_items.first_class, meeting) %>
+  <% meeting.agenda.agenda_items.first_class.each_with_index do |agenda_item, index| %>
+  <div class="meeting__agenda-item">
+    <h3 class="meeting__agenda-item__title">
+      <span><%= translated_attribute(agenda_item.title) %></span>
+      <span><%= display_duration_agenda_items(agenda_item.id, index, agenda_items_times) %></span>
+    </h3>
 
-          <% agenda_item.agenda_item_children.each_with_index do |agenda_item_child, index_child| %>
-            <h6 class="heading6">
-              <strong><%= translated_attribute(agenda_item_child.title) %></strong>&nbsp;
-              <span class="text-small"><%= display_duration_agenda_items(agenda_item_child.id, index_child, agenda_item_children_times) %></span>
-            </h6>
-            <p><%= decidim_sanitize_translated(agenda_item_child.description).html_safe %></p>
-          <% end %>
-        <% end %>
+    <div class="meeting__agenda-item__description editor-content"><%= decidim_sanitize(translated_attribute(agenda_item.description)).html_safe %></div>
+
+    <% if agenda_item.agenda_item_children.presence %>
+      <% parent_start_time = agenda_items_times[index][:start_time] %>
+      <% agenda_item_children_times = calculate_start_and_end_time_of_agenda_items(agenda_item.agenda_item_children, meeting, parent_start_time) %>
+
+      <% agenda_item.agenda_item_children.each_with_index do |agenda_item_child, index_child| %>
+        <div class="meeting__agenda-subitem">
+          <h4 class="meeting__agenda-item__title">
+            <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>
       <% end %>
-    </div>
+    <% end %>
   </div>
-</div>
+  <% end %>
+</section>

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

@@ -0,0 +1,98 @@
+<% if meeting.can_be_joined_by?(current_user) || meeting.on_different_platform? %>
+  <section class="layout-aside__section layout-aside__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>
+          <%= icon "pencil-line" %>
+      <% end %>
+    <% end %>
+  </section>
+<% end %>
+
+<% if (meeting.closed? && meeting.closing_visible?) || (registration.present? && registration.meeting.component.settings.registration_code_enabled) || (meeting.services.any?) %>
+<section class="layout-aside__section layout-aside__buttons">
+  <% if meeting.closed? && meeting.closing_visible? %>
+    <% if meeting.has_contributions? %>
+      <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "add-box-line" } do %>
+        <h3 class="meeting__aside-block__title"><%= t("contributions", scope: "decidim.meetings.meetings.show") %></h3>
+        <div class="meeting__aside-block__large"><%= meeting.contributions_count %></div>
+      <% end %>
+    <% end %>
+
+    <% if meeting.has_attendees? %>
+      <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "group-line" } do %>
+        <h3 class="meeting__aside-block__title"><%= t("attendees", scope: "decidim.meetings.meetings.show") %></h3>
+        <div class="meeting__aside-block__large"><%= meeting.attendees_count %></div>
+      <% end %>
+    <% end %>
+
+    <% if meeting.attending_organizations.present? %>
+      <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "community-line" } do %>
+        <h3 class="meeting__aside-block__title"><%= t("organizations", scope: "decidim.meetings.meetings.show") %></h3>
+        <ul class="meeting__aside-block__list">
+          <% meeting.attending_organizations.split("\n").each do |organizations| %>
+          <li><%= organizations %></li>
+          <% end %>
+        </ul>
+      <% 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>
+      <% 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>
+      <% end %>
+    <% end %>
+  <% end %>
+</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_minutes.html.erb

@@ -1,37 +1,24 @@
-<div class="section minutes-section">
-  <% if meeting.video_url.presence || meeting.audio_url.presence %>
-    <div class="section">
-      <h4 class="section-heading"><%= t(".related_information") %></h4>
-      <div class="card card--list">
-        <% if meeting.video_url.presence %>
-          <div class="card--list__item">
-            <div class="card--list__text">
-              <div>
-                <%= link_to decidim_url_escape(meeting.video_url), decidim_html_escape(meeting.video_url), target: "_blank", rel: "noopener" %>
-              </div>
-            </div>
-            <div class="card--list__data" aria-hidden="true">
-              <%= link_to decidim_url_escape(meeting.video_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
-                <%= icon "external-link", role: "img", "aria-hidden": true %>
-              <% end %>
-            </div>
-          </div>
-        <% end %>
-        <% if meeting.audio_url.presence %>
-          <div class="card--list__item">
-            <div class="card--list__text">
-              <div>
-                <%= link_to decidim_url_escape(meeting.audio_url), decidim_html_escape(meeting.audio_url), target: "_blank", rel: "noopener" %>
-              </div>
-            </div>
-            <div class="card--list__data" aria-hidden="true">
-              <%= link_to decidim_url_escape(meeting.audio_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
-                <%= icon "external-link", role: "img", "aria-hidden": true %>
-              <% end %>
-            </div>
-          </div>
-        <% end %>
+<section>
+  <div class="meeting__agenda-title">
+    <%= icon "bill-line" %>
+    <h2 class="h4"><%= t("meeting_minutes", scope: "decidim.meetings.meetings.show") %></h2>
+  </div>
+
+  <div class="meeting__agenda-item">
+    <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">
+        <%= icon "video-line", class: "w-4 h-4 text-tertiary fill-current" %>
+        <%= link_to decidim_url_escape(meeting.video_url), decidim_html_escape(meeting.video_url), target: "_blank", rel: "noopener" %>
       </div>
-    </div>
-  <% end %>
-</div>
+      <% end %>
+
+    <% if meeting.audio_url.presence %>
+      <div class="flex items-center gap-2 mt-2">
+        <%= icon "headphone-line", class: "w-4 h-4 text-tertiary fill-current" %>
+        <%= link_to decidim_url_escape(meeting.audio_url), decidim_html_escape(meeting.audio_url), target: "_blank", rel: "noopener" %>
+      </div>
+    <% end %>
+  </div>
+</section>

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

@@ -1,25 +1,21 @@
-<div class="row">
-  <div class="columns large-3">
-    <%= link_to :back do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria--hidden": true %>
-      <%= t(".back") %>
-    <% end %>
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="text-center py-10">
+    <h1 class="title-decorator inline-block text-left">
+      <%= t("title", scope: "decidim.meetings.meetings.edit") %>
+    </h1>
   </div>
 
-  <div class="columns large-6">
-    <h2 class="section-heading"><%= t(".title") %></h2>
-    <div class="card">
-      <div class="card__content">
-        <%= decidim_form_for(@form, html: { class: "meetings_form edit_meeting" }) do |f| %>
-          <%= render partial: "form", object: f %>
-
-          <div class="actions">
-            <%= f.submit t(".update"), class: "button expanded", data: { disable: true } %>
-          </div>
-        <% end %>
-      </div>
+  <%= decidim_form_for(@form, html: { class: "meetings_form new_meeting" }) do |f| %>
+    <div class="form__wrapper">
+      <%= render partial: "form", object: f %>
     </div>
-  </div>
 
-  <div class="columns large-3"></div>
-</div>
+    <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+      <%= link_to :back, class: "button button__sm md:button__lg button__text-secondary" do %>
+        <%= icon "arrow-left-line" %>
+        <%= t("back", scope: "decidim.meetings.meetings.edit") %>
+      <% end %>
+      <%= f.submit t("update", scope: "decidim.meetings.meetings.edit"), class: "button button__sm md:button__lg button__secondary", data: { disable: true } %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -1,33 +1,15 @@
-<%= render partial: "decidim/shared/component_announcement" %>
-
-<% if current_component.settings.maps_enabled? && search.result.not_online.exists? %>
-  <%= cell "decidim/meetings/meetings_map", search.result %>
-<% end %>
-
-<div class="row columns">
-  <div class="title-action">
-    <h2 id="meetings-count" class="title-action__title section-heading">
-      <%= render partial: "count" %>
-    </h2>
-
-    <% 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: "title-action__action button small", data: { "redirect_url" => new_meeting_path } do %>
-        <%= t("new_meeting", scope: "decidim.meetings.meetings.index") %>
-        <%= icon "plus", role: "img", "aria-hidden": true %>
-      <% end %>
-    <% end %>
-  </div>
-</div>
-
-<div class="row">
-  <div class="columns mediumlarge-4 large-3">
-    <%= render partial: "filters_small_view" %>
-    <div class="card card--secondary show-for-mediumlarge">
-      <%= render partial: "filters" %>
-    </div>
-  </div>
-  <div id="meetings" class="columns mediumlarge-8 large-9" aria-live="polite">
-
-    <%= render partial: "meetings" %>
-  </div>
-</div>
+<%= render partial: "decidim/meetings/shared/index", locals: {
+      display_map: Decidim::Map.available?(:geocoding, :dynamic) && current_component.settings.maps_enabled? && search.result.not_online.exists?,
+      display_announcement: true,
+      component: current_component,
+      search_variable: :search_text_cont,
+      filter_options: {
+        date: !@forced_past_meetings,
+        type: true,
+        scopes: current_component.has_subscopes?,
+        categories: current_component.categories.any?,
+        origin: component_settings.creation_enabled_for_participants?,
+        space_type: false,
+        activity: current_user.present?
+      }
+    } %>

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

@@ -1,23 +1 @@
-var $meetings = $('#meetings');
-var $meetingsCount = $('#meetings-count');
-
-// make sure that calendar modal will use the updated filter values
-var $calendarShare = $('#calendarShare');
-$calendarShare.remove();
-
-$meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
-$meetingsCount.html('<%= j(render partial: "count").strip.html_safe %>');
-
-var $dropdownMenu = $('.dropdown.menu', $meetings);
-$dropdownMenu.foundation();
-
-var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result.select(&:geocoded_and_valid?)).to_json.html_safe %>');
-
-$("#calendarShare").foundation(); // initialize export calendar on the page
-
-var $map = $("#map");
-var controller = $map.data("map-controller");
-if (controller) {
-  controller.clearMarkers();
-  controller.addMarkers(markerData);
-}
+<%= render partial: "decidim/meetings/shared/index", formats: [:js], locals: { component: current_component } %>

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

@@ -1,25 +1,21 @@
-<div class="row">
-  <div class="columns large-3">
-    <%= link_to :back do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".back") %>
-    <% end %>
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="text-center py-10">
+    <h1 class="title-decorator inline-block text-left">
+      <%= t("title", scope: "decidim.meetings.meetings.new") %>
+    </h1>
   </div>
 
-  <div class="columns large-6">
-    <h2 class="section-heading"><%= t(".title") %></h2>
-    <div class="card">
-      <div class="card__content">
-        <%= decidim_form_for(@form, html: { class: "meetings_form new_meeting" }) do |f| %>
-          <%= render partial: "form", object: f %>
-
-          <div class="actions">
-            <%= f.submit t(".create"), class: "button expanded", data: { disable: true } %>
-          </div>
-        <% end %>
-      </div>
+  <%= decidim_form_for(@form, html: { class: "meetings_form new_meeting" }) do |f| %>
+    <div class="form__wrapper">
+      <%= render partial: "form", object: f %>
     </div>
-  </div>
 
-  <div class="columns large-3"></div>
-</div>
+    <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+      <%= link_to :back, class: "button button__sm md:button__lg button__text-secondary" do %>
+        <%= icon "arrow-left-line" %>
+        <%= t("back", scope: "decidim.meetings.meetings.new") %>
+      <% end %>
+      <%= f.submit t("create", scope: "decidim.meetings.meetings.new"), class: "button button__sm md:button__lg button__secondary", data: { disable: true } %>
+    </div>
+  <% end %>
+<% end %>