decidim-meetings 0.21.0 → 0.23.2

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

@@ -18,9 +18,10 @@
             <th><%= t("models.meeting.fields.start_time", scope: "decidim.meetings") %></th>
             <th><%= t("models.meeting.fields.end_time", scope: "decidim.meetings") %></th>
             <th><%= t("models.meeting.fields.closed", scope: "decidim.meetings") %></th>
-            <% if Decidim.geocoder.present? %>
+            <% if Decidim::Map.available?(:static, :geocoding) %>
               <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
             <% end %>
+            <%= th_resource_scope_label %>
             <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
           </tr>
         </thead>
@@ -43,11 +44,12 @@
               <td>
                 <%= humanize_boolean meeting.closed? %>
               </td>
-              <% if Decidim.geocoder.present? %>
+              <% if Decidim::Map.available?(:static, :geocoding) %>
                 <td>
                   <%= static_map_link(meeting) %>
                 </td>
               <% end %>
+              <%= td_resource_scope_for(meeting.scope) %>
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
 
@@ -77,7 +79,22 @@
                 <%= resource_permissions_link(meeting) %>
 
                 <% if allowed_to? :destroy, :meeting, meeting: meeting %>
-                  <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
+                  <% if present(meeting).authored_proposals.empty? %>
+                    <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
+                  <% else %>
+                    <%=
+                      content_tag(:button,
+                                  class: ["action-icon", "action-icon--remove", "destroy-meeting-alert"],
+                                  "data-invalid-destroy-message" => t("actions.invalid_destroy.proposals_count", count: present(meeting).authored_proposals.size, scope: "decidim.meetings"),
+                                  "data-proposal-titles" => present(meeting).formatted_proposals_titles) do
+                        content_tag(:span,
+                                    data: { tooltip: true, disable_hover: false, click_open: false },
+                                    title: t("actions.destroy", scope: "decidim.meetings")) do
+                          icon("circle-x")
+                        end
+                      end
+                    %>
+                  <% end %>
                 <% end %>
               </td>
             </tr>
@@ -88,3 +105,5 @@
     </div>
   </div>
 </div>
+
+<%= javascript_include_tag "decidim/meetings/admin/destroy_meeting_alert" %>

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

@@ -18,6 +18,10 @@
   </div>
 
   <div class="card-section">
+    <div class="callout alert">
+      <%= t(".recommendation_message") %>
+    </div>
+
     <div class="row column">
       <%= form.check_box :registrations_enabled %>
     </div>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".meetings")) %>
+
 <div class="wrapper">
   <div class="row">
     <h1 class="section-heading"><%= t(".meetings") %></h1>
@@ -10,10 +12,10 @@
           <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") %>
+                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search") %>
                 <div class="input-group-button">
-                  <button type="submit" class="button button--muted">
-                    <%= icon "magnifying-glass", aria_label: t(".search") %>
+                  <button type="submit" class="button">
+                    <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
                   </button>
                 </div>
               </div>

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

@@ -5,7 +5,14 @@ $meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
-window.Decidim.currentMap = window.Decidim.loadMap(
-  'map',
-  JSON.parse('<%= escape_javascript meetings_data_for_map(search.results).to_json.html_safe %>')
-);
+var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results).to_json.html_safe %>');
+
+var $map = $("#map");
+var controller = $map.data("map-controller");
+if (controller) {
+  controller.clearMarkers();
+  controller.addMarkers(markerData);
+} else {
+  // @deprecated Legacy support
+  window.Decidim.currentMap = window.Decidim.loadMap('map', markerData);
+}

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

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

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

@@ -1,11 +1,13 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "meetings" } %>
+
 <%= filter_form_for filter do |form| %>
   <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") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="meetings">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
           </button>
         </div>
       </div>
@@ -13,14 +15,18 @@
   </div>
 
   <% unless @forced_past_meetings %>
-    <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
+    <%= form.check_boxes_tree :date, filter_date_values, legend_title: t(".date") %>
   <% end %>
 
-  <% if current_participatory_space.has_subscopes? %>
-    <%= scopes_picker_filter form, :scope_id %>
+  <% if current_component.has_subscopes? %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope") %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
+    <%= form.check_boxes_tree :category_id, 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") %>
   <% end %>
 <% end %>

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

@@ -0,0 +1,51 @@
+<div class="field hashtags__container">
+  <%= form.text_field :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
+</div>
+
+<div class="field hashtags__container">
+  <%= text_editor_for(form, :description, hashtaggable: true) %>
+</div>
+
+<div class="field">
+  <%= form.geocoding_field :address %>
+  <p class="help-text"><%= t(".address_help") %></p>
+</div>
+
+<div class="field">
+  <%= form.text_area :location %>
+  <p class="help-text"><%= t(".location_help") %></p>
+</div>
+
+<div class="field">
+  <%= form.text_area :location_hints %>
+  <p class="help-text"><%= t(".location_hints_help") %></p>
+</div>
+
+<div class="field">
+  <%= form.datetime_field :start_time %>
+</div>
+
+<div class="field">
+  <%= form.datetime_field :end_time %>
+</div>
+
+<% if current_participatory_space.has_subscopes? %>
+  <div class="field">
+    <%= scopes_picker_field form, :decidim_scope_id %>
+  </div>
+<% end %>
+
+<div class="field">
+  <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: t(".select_a_category"), disable_parents: false %>
+</div>
+
+<div class="field">
+  <%= form.select(
+    :user_group_id,
+    Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map{|g| [g.name, g.id]},
+    prompt: current_user.name,
+    label: t(".create_as")
+  ) %>
+</div>
+
+<%= javascript_include_tag "decidim/meetings/meetings_form" %>

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

@@ -1,7 +1,7 @@
 <div class="row small-up-1 medium-up-2 card-grid">
   <% resources.each do |meeting| %>
     <div class="column">
-      <article class="card card--meeting">
+      <div class="card card--meeting">
         <div class="card__content">
           <%= link_to resource_locator(meeting).path, class: "card__link" do %>
             <h5 class="card__title"><%= present(meeting).title %></h5>
@@ -16,7 +16,7 @@
           </div>
           <%= decidim_sanitize( present(meeting).description ) %>
         </div>
-      </article>
+      </div>
     </div>
   <% end %>
 </div>

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

@@ -7,7 +7,7 @@
       <% 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 class="text-uppercase"><%= translated_attribute(agenda_item.title) %></strong>&nbsp;
+          <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">
@@ -19,7 +19,7 @@
 
           <% agenda_item.agenda_item_children.each_with_index do |agenda_item_child, index_child| %>
             <h6 class="heading6">
-              <strong class="text-uppercase"><%= translated_attribute(agenda_item_child.title) %></strong>&nbsp;
+              <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><%= translated_attribute(agenda_item_child.description).html_safe %></p>

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

@@ -18,12 +18,12 @@
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to meeting.minutes.video_url, meeting.minutes.video_url, target: "_blank", rel: "noopener" %>
+                <%= link_to decidim_url_escape(meeting.minutes.video_url), decidim_html_escape(meeting.minutes.video_url), target: "_blank", rel: "noopener" %>
               </div>
             </div>
-            <div class="card--list__data">
-              <%= link_to meeting.minutes.video_url, target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
-                <%= icon "external-link" %>
+            <div class="card--list__data" aria-hidden="true">
+              <%= link_to decidim_url_escape(meeting.minutes.video_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
+                <%= icon "external-link", role: "img", "aria-hidden": true %>
               <% end %>
             </div>
           </div>
@@ -32,12 +32,12 @@
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to meeting.minutes.audio_url, meeting.minutes.audio_url, target: "_blank", rel: "noopener" %>
+                <%= link_to decidim_url_escape(meeting.minutes.audio_url), decidim_html_escape(meeting.minutes.audio_url), target: "_blank", rel: "noopener" %>
               </div>
             </div>
-            <div class="card--list__data">
-              <%= link_to meeting.minutes.audio_url, target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
-                <%= icon "external-link" %>
+            <div class="card--list__data" aria-hidden="true">
+              <%= link_to decidim_url_escape(meeting.minutes.audio_url), target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
+                <%= icon "external-link", role: "img", "aria-hidden": true %>
               <% end %>
             </div>
           </div>

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

@@ -0,0 +1,25 @@
+<div class="row">
+  <div class="columns large-3">
+    <%= link_to :back do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img" %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
+
+  <div class="columns large-6">
+    <h2 class="section-heading"><%= t(".title") %></h2>
+    <div class="card">
+      <div class="card__content">
+        <%= decidim_form_for(@form) do |f| %>
+          <%= render partial: "form", object: f %>
+
+          <div class="actions">
+            <%= f.submit t(".update"), class: "button expanded", data: { disable: true } %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="columns large-3"></div>
+</div>

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

@@ -2,6 +2,21 @@
 
 <%= cell "decidim/meetings/meetings_map", search.results %>
 
+<div class="row columns">
+  <div class="title-action">
+    <h3 id="meetings-count" class="title-action__title section-heading">
+      <%= render partial: "count" %>
+    </h3>
+
+    <% 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" %>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
     <%= render partial: "filters_small_view" %>
@@ -9,7 +24,7 @@
       <%= render partial: "filters" %>
     </div>
   </div>
-  <div id="meetings" class="columns mediumlarge-8 large-9">
+  <div id="meetings" class="columns mediumlarge-8 large-9" aria-live="polite">
     <%= render partial: "meetings" %>
   </div>
 </div>

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

@@ -1,11 +1,20 @@
 var $meetings = $('#meetings');
+var $meetingsCount = $('#meetings-count');
 
 $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();
 
-window.Decidim.currentMap = window.Decidim.loadMap(
-  'map',
-  JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.select(&:geocoded?)).to_json.html_safe %>')
-);
+var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.select(&:geocoded?)).to_json.html_safe %>');
+
+var $map = $("#map");
+var controller = $map.data("map-controller");
+if (controller) {
+  controller.clearMarkers();
+  controller.addMarkers(markerData);
+} else {
+  // @deprecated Legacy support
+  window.Decidim.currentMap = window.Decidim.loadMap('map', markerData);
+}

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

@@ -0,0 +1,25 @@
+<div class="row">
+  <div class="columns large-3">
+    <%= link_to :back do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img" %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
+
+  <div class="columns large-6">
+    <h2 class="section-heading"><%= t(".title") %></h2>
+    <div class="card">
+      <div class="card__content">
+        <%= decidim_form_for(@form) do |f| %>
+          <%= render partial: "form", object: f %>
+
+          <div class="actions">
+            <%= f.submit t(".create"), class: "button expanded", data: { disable: true } %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="columns large-3"></div>
+</div>

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

@@ -16,18 +16,33 @@ edit_link(
 %>
 
 <div class="row column view-header">
+  <div class="m-bottom">
+    <%= link_to meetings_path(filter_link_params), class: "small hollow" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
+
   <h2 class="heading2"><%= present(meeting).title(links: true) %></h2>
-  <% if meeting.organizer.present? %>
-    <%= cell "decidim/author", present(meeting.organizer) %>
-  <% end %>
+
+  <%= 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 %>
+
     <div class="card extra">
       <div class="card__content">
         <div class="extra__date">
-          <%= l meeting.start_time, format: "%d" %> <span class="extra__month"><%= l meeting.start_time, format: "%B" %></span>
+          <%= l meeting.start_time, format: "%d" %>
+          <span class="extra__month"><%= l meeting.start_time, format: "%B" %>
+            <%= l(meeting.start_time, format: "%Y") if meeting.start_time.year != Date.current.year %>
+          </span>
         </div>
         <div class="extra__time">
           <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
@@ -77,9 +92,9 @@ edit_link(
         <% 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" %>
+              <%= icon "actions", class: "card--list__icon alert", role: "img", "aria-hidden": true %>
               <div>
-                <h5 class="card--list__heading heading-small"><%= translated_attribute(service["title"]) %></h5>
+                <h3 class="card--list__heading heading-small"><%= translated_attribute(service["title"]) %></h3>
                 <span class="text-medium"><%= translated_attribute(service["description"]) %></span>
               </div>
             </div>
@@ -89,8 +104,9 @@ edit_link(
     <% end %>
 
     <%= resource_reference(meeting) %>
+    <%= resource_version(meeting, versions_path: meeting_versions_path(meeting)) %>
     <%= render partial: "decidim/shared/share_modal" %>
-    <%= embed_modal_for meeting_meeting_widget_url(meeting, format: :js) %>
+    <%= embed_modal_for meeting_widget_url(meeting, format: :js) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -104,7 +120,7 @@ edit_link(
           <%= t("transparent", scope: "decidim.meetings.types") %>
         </span>
       <% end %>
-      <p><%= decidim_sanitize(present(meeting).description(links: true)) %></p>
+      <%= decidim_sanitize(present(meeting).description(links: true)) %>
       <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
       <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
     </div>
@@ -146,3 +162,11 @@ edit_link(
 <%= attachments_for meeting %>
 <%= comments_for meeting %>
 <%= pad_iframe_for meeting %>
+
+<%=
+  render partial: "decidim/shared/flag_modal", locals: {
+    reportable: meeting,
+    form: @report_form,
+    url: decidim.report_path(sgid: meeting.to_sgid.to_s)
+  }
+%>