decidim-meetings 0.26.9 → 0.27.0.rc1

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

@@ -0,0 +1,5 @@
+<p class="email-greeting"><%= t "decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.hello", username: @user.name %></p>
+
+<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>

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

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t("decidim.meetings.meetings.filters.search"), title: t("decidim.meetings.meetings.filters.search"), "aria-label": t("decidim.meetings.meetings.filters.search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :title_or_description_cont, label: false, class: "input-group-field", placeholder: t("decidim.meetings.meetings.filters.search"), title: t("decidim.meetings.meetings.filters.search"), "aria-label": t("decidim.meetings.meetings.filters.search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="meetings">
             <%= icon "magnifying-glass", aria_label: t("decidim.meetings.meetings.filters.search"), role: "img" %>
@@ -15,18 +15,18 @@
   </div>
 
   <% unless @forced_past_meetings %>
-    <%= form.collection_radio_buttons :date, filter_date_values, :first, :last, legend_title: t("decidim.meetings.meetings.filters.date") %>
+    <%= form.check_boxes_tree :with_any_date, filter_date_values, legend_title: t("decidim.meetings.meetings.filters.date") %>
   <% end %>
 
-  <%= form.check_boxes_tree :type, filter_type_values, legend_title: t("decidim.meetings.meetings.filters.type") %>
+  <%= form.check_boxes_tree :with_any_type, filter_type_values, legend_title: t("decidim.meetings.meetings.filters.type") %>
 
-  <%= form.check_boxes_tree :scope_id, directory_filter_scopes_values, legend_title: t("decidim.meetings.meetings.filters.scope") %>
+  <%= form.check_boxes_tree :with_any_scope, directory_filter_scopes_values, legend_title: t("decidim.meetings.meetings.filters.scope") %>
 
-  <%= form.check_boxes_tree :category_id, directory_filter_categories_values, legend_title: t("decidim.meetings.meetings.filters.category") %>
+  <%= form.check_boxes_tree :with_any_global_category, directory_filter_categories_values, legend_title: t("decidim.meetings.meetings.filters.category") %>
 
-  <%= form.check_boxes_tree :origin, directory_filter_origin_values, legend_title: t("decidim.meetings.meetings.filters.origin") %>
+  <%= form.check_boxes_tree :with_any_origin, directory_filter_origin_values, legend_title: t("decidim.meetings.meetings.filters.origin") %>
 
-  <%= form.check_boxes_tree :space, directory_meeting_spaces_values, legend_title: t("decidim.meetings.directory.meetings.index.space_type") %>
+  <%= form.check_boxes_tree :with_any_space, directory_meeting_spaces_values, legend_title: t("decidim.meetings.directory.meetings.index.space_type") %>
 
   <% if current_user %>
     <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t("decidim.meetings.meetings.filters.activity") }, "aria-controls": "meetings" %>

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

@@ -8,7 +8,12 @@
       <%= render partial: "decidim/shared/results_per_page" %>
     </div>
     <div class="column">
-      <%= render partial: "decidim/meetings/calendar_modal", locals: { path: calendar_url } %>
+      <%= render partial: "decidim/meetings/calendar_modal", locals: {
+        path: short_url(
+          route_name: "calendar",
+          params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }
+        )
+      } %>
     </div>
   </div>
 

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

@@ -6,7 +6,7 @@
       <%= render partial: "decidim/meetings/meetings/count" %>
     </h1>
 
-    <%= cell "decidim/meetings/meetings_map", search.results %>
+    <%= cell "decidim/meetings/meetings_map", search.result %>
 
     <div class="columns mediumlarge-4 large-3">
       <div class="card card--secondary show-for-mediumlarge">

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

@@ -1,13 +1,19 @@
 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: "decidim/meetings/meetings/count").strip.html_safe %>');
 
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
-var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results).to_json.html_safe %>');
+$("#calendarShare").foundation(); // initialize export calendar on the page
+
+var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result).to_json.html_safe %>');
 
 var $map = $("#map");
 var controller = $map.data("map-controller");

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

@@ -3,12 +3,13 @@
   <head>
     <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/head" %>
-    <%= javascript_pack_tag "decidim_meetings" %>
-    <%= render partial: "layouts/decidim/js_configuration" %>
   </head>
 
   <body>
     <%= render partial: "layouts/decidim/timeout_modal" %>
+    <%= render partial: "layouts/decidim/cookie_warning" %>
+    <%= cell("decidim/data_consent", current_organization) %>
+
     <header class="meeting-polls__header">
       <% if current_user && poll %>
         <div class="flex--cc">
@@ -47,5 +48,8 @@
       <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>
+
+    <%= render partial: "layouts/decidim/decidim_javascript" %>
+    <%= javascript_pack_tag "decidim_meetings" %>
   </body>
 </html>

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

@@ -1 +1 @@
-<%= t(".meetings_count", count: search.results.count) %>
+<%= t(".meetings_count", count: search.result.count) %>

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

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="meetings">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -14,24 +14,24 @@
     </div>
   </div>
 
-  <%= form.hidden_field "state", value: params.dig("filter", "state") %>
+  <%= form.hidden_field "with_availability", value: params.dig("filter", "with_availability") %>
 
   <% unless @forced_past_meetings %>
-    <%= form.collection_radio_buttons :date, filter_date_values, :first, :last, legend_title: t(".date") %>
+    <%= form.check_boxes_tree :with_any_date, filter_date_values, legend_title: t(".date") %>
   <% end %>
 
-  <%= form.check_boxes_tree :type, filter_type_values, legend_title: t(".type") %>
+  <%= form.check_boxes_tree :with_any_type, filter_type_values, legend_title: t(".type") %>
 
   <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope") %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope") %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category") %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category") %>
   <% end %>
 
   <% if component_settings.creation_enabled_for_participants? %>
-    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin") %>
+    <%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin") %>
   <% end %>
 
   <% if current_user %>

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

@@ -38,7 +38,7 @@
     <%= form.select :iframe_embed_type,
       @form.iframe_embed_type_select,
       { multiple: false } %>
-    <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+    <p class="help-text"><%= t(".show_embedded_iframe_help", domains: Decidim::Meetings.embeddable_services&.join(" ")) %></p>
   </div>
 
   <div class="field iframe-fields--access-level" id="meeting_iframe_embed_type" data-meeting-type="online-access-level">
@@ -98,4 +98,6 @@
   ) %>
 </div>
 
-<%= javascript_pack_tag "decidim_meetings" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_meetings" %>
+<% end %>

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

@@ -14,7 +14,7 @@
               <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
             </div>
           </div>
-          <%= decidim_sanitize_editor present(meeting).description(strip_tags: true) %>
+          <%= decidim_sanitize_editor(present(meeting).description) %>
         </div>
       </div>
     </div>

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

@@ -1,7 +1,7 @@
-<% if params.dig("filter", "state").present? && params["filter"]["state"] == "withdrawn" %>
+<% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
   <div class="callout warning">
     <%= t("decidim.meetings.meetings.index.text_banner",
-          go_back_link: link_to(t("decidim.meetings.meetings.index.click_here"), meetings_path("filter[state]" => nil)),
+          go_back_link: link_to(t("decidim.meetings.meetings.index.click_here"), meetings_path("filter[with_availability]" => nil)),
           ).html_safe %>
   </div>
 <% end %>
@@ -21,7 +21,12 @@
     <%= render partial: "decidim/shared/results_per_page" %>
   </div>
   <div class="column">
-    <%= render partial: "decidim/meetings/calendar_modal", locals: { path: calendar_url } %>
+    <%= render partial: "decidim/meetings/calendar_modal", locals: {
+      path: short_url(
+        route_name: "calendar",
+        params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }
+      )
+    } %>
   </div>
 </div>
 
@@ -34,10 +39,10 @@
 
 <div class="row">
   <div class="text-right">
-    <% if params.dig("filter", "state").present? && params["filter"]["state"] == "withdrawn" %>
-      <%= link_to t("decidim.meetings.meetings.index.see_all"), meetings_path("filter[state]" => nil) %>
+    <% 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) %>
     <% else %>
-      <%= link_to t("decidim.meetings.meetings.index.see_all_withdrawn"), meetings_path("filter[state]" => "withdrawn") %>
+      <%= link_to t("decidim.meetings.meetings.index.see_all_withdrawn"), meetings_path("filter[with_availability]" => "withdrawn") %>
     <% end %>
   </div>
 </div>

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

@@ -1,7 +1,7 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
-<% if current_component.settings.maps_enabled? && search.results.not_online.exists? %>
-  <%= cell "decidim/meetings/meetings_map", search.results %>
+<% if current_component.settings.maps_enabled? && search.result.not_online.exists? %>
+  <%= cell "decidim/meetings/meetings_map", search.result %>
 <% end %>
 
 <div class="row columns">
@@ -10,7 +10,7 @@
       <%= render partial: "count" %>
     </h2>
 
-    <% if try(:component_settings) && component_settings&.creation_enabled_for_participants? && current_component.participatory_space.can_participate?(current_user) %>
+    <% if allowed_to?(:create, :meeting) %>
       <%= 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 %>

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

@@ -11,9 +11,9 @@ $meetingsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
-$("#calendarShare").foundation(); // initialize export calendar on the page
+var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result.select(&:geocoded_and_valid?)).to_json.html_safe %>');
 
-var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.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");

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

@@ -5,11 +5,8 @@
   <div class="row">
     <div class="column medium-4">
       <% meetings.each do |meeting_block| %>
-        <% next if meeting_block.first.empty? %>
-
         <% meeting_block.last.each_with_index do |meeting, index| %>
           <% next if index != 0 %>
-
           <%== cell("decidim/conferences/conference_address", meeting) %>
         <% end %>
       <% end %>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am: