decidim-meetings 0.26.2 → 0.27.0.rc2

data/app/services/decidim/meetings/calendar_renderer.rb

@@ -3,14 +3,14 @@
 module Decidim
   module Meetings
     class CalendarRenderer
-      def self.for(resource)
+      def self.for(resource, filters = nil)
         case resource
         when Decidim::Organization
-          Calendar::OrganizationCalendar.for(resource)
+          Calendar::OrganizationCalendar.for(resource, filters)
         when Decidim::Component
-          Calendar::ComponentCalendar.for(resource)
+          Calendar::ComponentCalendar.for(resource, filters)
         when Decidim::Meetings::Meeting
-          Calendar::MeetingCalendar.for(resource)
+          Calendar::MeetingCalendar.for(resource, filters)
         end
       end
     end

data/app/services/decidim/meetings/close_meeting_reminder_generator.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class is the generator class which creates and updates meetings related reminders,
+    # after reminder is generated it is send to user who have not closed past meetings.
+    class CloseMeetingReminderGenerator
+      attr_reader :reminder_jobs_queued
+
+      def initialize
+        @reminder_manifest = Decidim.reminders_registry.for(:close_meeting)
+        @reminder_jobs_queued = 0
+      end
+
+      # Creates reminders and updates them if they already exists.
+      def generate
+        Decidim::Component.where(manifest_name: "meetings").published.each do |component|
+          send_reminders(component)
+        end
+      end
+
+      private
+
+      attr_reader :reminder_manifest
+
+      def finder_query(component_id, interval)
+        Decidim::Meetings::Meeting
+          .published
+          .not_hidden
+          .except_withdrawn
+          .where(
+            "decidim_component_id = ? AND end_time >= ? AND end_time <= ? AND closed_at IS NULL",
+            component_id,
+            interval.ago.beginning_of_day,
+            interval.ago.end_of_day
+          )
+      end
+
+      def send_reminders(component)
+        intervals = Array(reminder_manifest.settings.attributes[:reminder_times].default)
+        space_admins = Decidim::ParticipatoryProcessUserRole.where(decidim_participatory_process_id: component.participatory_space_id, role: "admin").collect(&:user)
+        space_admins = (global_admins + space_admins).uniq
+        intervals.each do |interval|
+          finder_query(component.id, interval).find_each do |meeting|
+            authors = meeting.official? ? space_admins : [meeting.author]
+            authors.each do |author|
+              send_notif = author.notification_settings.fetch("close_meeting_reminder", "1")
+              next unless send_notif == "1"
+
+              reminder = Decidim::Reminder.find_or_create_by(user: author, component: component)
+              record = Decidim::ReminderRecord.find_or_create_by(reminder: reminder, remindable: meeting)
+              record.update(state: "active") unless record.active?
+              reminder.records << record
+              reminder.save!
+
+              Decidim::Meetings::SendCloseMeetingReminderJob.perform_later(record)
+              @reminder_jobs_queued += 1
+            end
+          end
+        end
+      end
+
+      def global_admins
+        @global_admins ||= Decidim::User.where(admin: true).all
+      end
+    end
+  end
+end

data/app/services/decidim/meetings/meeting_iframe_embedder.rb

@@ -30,28 +30,31 @@ module Decidim
       def embeddable?
         return nil if parsed_online_meeting_uri.nil?
 
-        EMBEDDABLE_SERVICES.include?(parsed_online_meeting_uri.host)
+        embeddable_services.include?(parsed_online_meeting_uri.host)
       end
 
       def embed_code(request_host)
         return nil if parsed_online_meeting_uri.nil?
 
-        %(
-<iframe
-  allow="camera; microphone; fullscreen; display-capture; autoplay"
-  loading="lazy"
-  src="#{embed_transformed_url(request_host)}"
-  style="height: 100%; width: 100%; border: 0px;"
-></iframe>
-        )
+        <<~HTML
+          <div class="disabled-iframe">
+            <!-- <iframe
+              allow="camera; microphone; fullscreen; display-capture; autoplay"
+              loading="lazy"
+              src="#{embed_transformed_url(request_host)}"
+              style="height: 100%; width: 100%; border: 0px;"></iframe> -->
+          </div>
+        HTML
       end
 
       private
 
-      EMBEDDABLE_SERVICES = %( www.youtube.com www.twitch.tv meet.jit.si )
-
       attr_accessor :online_meeting_service_url
 
+      def embeddable_services
+        @embeddable_services ||= Meetings.embeddable_services
+      end
+
       # Youtube transformation consists on:
       # 1. extract the video id from the parameter v
       # 2. Create a new URL using the domain youtube-nocookie.com, converting it to an embed
@@ -59,7 +62,8 @@ module Decidim
       def transform_youtube_url(uri)
         return online_meeting_service_url if uri.query.blank?
 
-        video_id = CGI.parse(uri.query).fetch("v")&.first
+        parsed_query = CGI.parse(uri.query)
+        video_id = parsed_query.has_key?("v") ? CGI.parse(uri.query).fetch("v")&.first : nil
 
         return online_meeting_service_url if video_id.blank?
 

data/app/services/decidim/meetings/meeting_search.rb

@@ -2,63 +2,17 @@
 
 module Decidim
   module Meetings
-    # This class handles search and filtering of meetings. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the meetings.
+    # This service scopes the meeting searches with parameters that cannot be
+    # passed from the user interface.
     class MeetingSearch < ResourceSearch
-      text_search_fields :title, :description
+      attr_reader :activity
 
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the meetings from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of meetings to return per page.
-      def initialize(options = {})
-        options[:scope] = options.fetch(:scope, Meeting.published)
-        options[:scope] = options[:state] == "withdrawn" ? options[:scope].withdrawn : options[:scope].except_withdrawn
-        options[:scope] = options[:scope].includes(:component, :attachments)
-        super(options[:scope], options)
-      end
-
-      # Handle the date filter
-      def search_date
-        apply_scopes(%w(upcoming past), date)
-      end
-
-      def search_space
-        return query if options[:space].blank? || options[:space] == "all"
-
-        query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].classify })
-      end
+      def build(params)
+        @activity = params[:activity]
 
-      def search_type
-        fields = Decidim::Meetings::Meeting::TYPE_OF_MEETING
-        filtered = []
-        options[:type].each do |inquiry|
-          filtered.push(inquiry) if fields.include?(inquiry)
-        end
-        filtered.size.positive? ? query.where(decidim_meetings_meetings: { type_of_meeting: filtered }) : query
-      end
-
-      # Handle the activity filter
-      def search_activity
-        case activity
-        when "my_meetings"
-          query
-            .where(decidim_author_id: user.id)
-        else
-          query
-        end
-      end
-
-      # Handle the state filter
-      def search_state
-        return query.withdrawn if state == "withdrawn"
-
-        query.except_withdrawn
-      end
+        add_scope(:authored_by, user) if params[:activity] == "my_meetings" && user
 
-      def results
-        super.includes(attachments: :file_attachment, component: { participatory_space: :organization })
+        super
       end
     end
   end

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

@@ -2,12 +2,29 @@
   <%= t(".export_calendar") %>
   <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
 </button>
+
 <div class="reveal" id="calendarShare" data-reveal>
   <div class="reveal__header">
-    <h2 class="reveal__title"><%= t(".calendar_url") %>:</h2>
+    <h3 class="reveal__title"><%= t(".calendar_url") %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <input type="text" value="<%= "#{path}" %>" readonly title="<%= t(".calendar_url") %>">
+
+  <div class="calendar-url-description"><%= t(".copy_calendar_url_description") %></div>
+  <div class="calendar-url-explanation"><%= t(".copy_calendar_url_explanation") %></div>
+
+  <div class="input-group calendar_url_input">
+    <input id="urlCalendarUrl" class="input-group-field" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>
+    <div class="input-group-button">
+      <button class="button primary"
+              data-clipboard-copy="#urlCalendarUrl"
+              data-clipboard-copy-label="<%= t(".copy_calendar_url_copied") %>"
+              data-clipboard-copy-message="<%= t(".copy_calendar_url_message") %>"
+              aria-label="<%= t(".copy_calendar_url_clarification") %>">
+        <%= icon "clipboard", role: "img", "aria-hidden": true %>
+        <%= t(".copy_calendar_url") %>
+      </button>
+    </div>
+  </div>
 </div>

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

@@ -43,7 +43,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="row column field iframe-fields--access-level" data-meeting-type="online-access-level">
@@ -82,15 +82,12 @@
         { multiple: false } %>
     </div>
 
-    <div class="row column" id="meeting_available_slots">
-      <%= form.number_field :available_slots %>
-      <p class="help-text"><%= t(".available_slots_help") %></p>
-    </div>
-
     <div class="field" id="meeting_registration_url">
       <%= form.text_field :registration_url %>
       <p class="help-text"><%= t(".registration_url_help") %></p>
-      <label><%= t(".disclaimer", organization: current_component.organization.name) %></label><br>
+      <div class="callout alert">
+        <%= t(".disclaimer", organization: current_component.organization.name) %>
+      </div>
     </div>
 
     <div class="row column" id="private_meeting">
@@ -101,15 +98,6 @@
       <%= form.check_box :transparent %>
     </div>
 
-    <div class="row column">
-      <%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
-    </div>
-
-    <div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
-      <%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
-      <p class="help-text"><%= t(".registration_email_help") %></p>
-    </div>
-
     <%= render partial: "decidim/comments/admin/shared/availability_fields", locals: { form: form } %>
   </div>
 </div>

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

@@ -41,6 +41,15 @@
       <p class="help-text"><%= t(".reserved_slots_help") %></p>
     </div>
 
+    <div class="row column">
+      <%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
+    </div>
+
+    <div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
+      <%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
+      <p class="help-text"><%= t(".registration_email_help") %></p>
+    </div>
+
     <div class="row column">
       <%= form.translated :editor, :registration_terms %>
     </div>

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.check_boxes_tree :date, filter_date_values, legend_title: t("decidim.meetings.meetings.filters.date") %>
+    <%= form.collection_radio_buttons :with_any_date, filter_date_values, :first, :last, 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/data_consent_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.check_boxes_tree :date, filter_date_values, legend_title: t(".date") %>
+    <%= form.collection_radio_buttons :with_any_date, filter_date_values, :first, :last, 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/_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">

data/app/views/decidim/meetings/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: "count").strip.html_safe %>');
 
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
-var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.select(&:geocoded_and_valid?)).to_json.html_safe %>');
+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");

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -76,11 +77,10 @@ ar:
         meetings:
           category_id_eq:
             label: الفئة
-          origin_eq:
+          with_any_origin:
             values:
-              citizen: المواطن
               user_group: مجموعات المستخدمين
-          type_eq:
+          with_any_type:
             label: نوع الاجتماع
             values:
               in_person: وجهًا لوجه
@@ -251,8 +251,6 @@ ar:
             success: تم حذف الاجتماع بنجاح
           edit:
             update: تحديث
-          form:
-            registration_email_help: سيظهر هذا النص في منتصف البريد الإلكتروني الخاص بتأكيد التسجيل مباشرة بعد رمز التسجيل.
           index:
             title: اجتماعات
           new:
@@ -282,6 +280,7 @@ ar:
           form:
             available_slots_help: اتركه إلى 0 إذا كان لديك فتحات غير محدودة المتاحة.
             invites: دعوات
+            registration_email_help: سيظهر هذا النص في منتصف البريد الإلكتروني الخاص بتأكيد التسجيل مباشرة بعد رمز التسجيل.
             registration_form: إستمارة تسجيل
             registrations_count:
               zero: كان هناك %{count} التسجيلات.
@@ -344,8 +343,6 @@ ar:
         filters:
           category: الفئة
           date: تاريخ
-          origin_values:
-            citizens: المواطنون
           search: بحث
         filters_small_view:
           close_modal: إغلاق مشروط

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes: