decidim-core 0.28.0 → 0.28.1

data/app/packs/stylesheets/decidim/legacy/leaflet.scss

@@ -22,8 +22,6 @@
 .leaflet-tile,
 .leaflet-marker-icon,
 .leaflet-marker-shadow {
-  -webkit-user-select: none;
-  -moz-user-select: none;
   user-select: none;
   -webkit-user-drag: none;
 }
@@ -48,31 +46,50 @@
 /* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
 
 /* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
-.leaflet-container .leaflet-overlay-pane svg,
+.leaflet-container .leaflet-overlay-pane svg {
+  max-width: none !important;
+  max-height: none !important;
+}
+
 .leaflet-container .leaflet-marker-pane img,
 .leaflet-container .leaflet-shadow-pane img,
 .leaflet-container .leaflet-tile-pane img,
-.leaflet-container img.leaflet-image-layer {
+.leaflet-container img.leaflet-image-layer,
+.leaflet-container .leaflet-tile {
   max-width: none !important;
+  max-height: none !important;
+  width: auto;
+  padding: 0;
+}
+
+.leaflet-container img.leaflet-tile {
+  /* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
+  mix-blend-mode: plus-lighter;
 }
 
 .leaflet-container.leaflet-touch-zoom {
-  -ms-touch-action: pan-x pan-y;
   touch-action: pan-x pan-y;
 }
 
 .leaflet-container.leaflet-touch-drag {
-  -ms-touch-action: pinch-zoom;
+  /* Fallback for FF which does not support pinch-zoom */
+  touch-action: none;
   touch-action: pinch-zoom;
 }
 
 .leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
-  -ms-touch-action: none;
   touch-action: none;
 }
 
+.leaflet-container {
+  -webkit-tap-highlight-color: transparent;
+}
+
+.leaflet-container a {
+  -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
+}
+
 .leaflet-tile {
-  filter: inherit;
   visibility: hidden;
 }
 
@@ -83,7 +100,6 @@
 .leaflet-zoom-box {
   width: 0;
   height: 0;
-  -moz-box-sizing: border-box;
   box-sizing: border-box;
   z-index: 800;
 }
@@ -130,23 +146,11 @@
   z-index: 200;
 }
 
-.leaflet-vml-shape {
-  width: 1px;
-  height: 1px;
-}
-
-.lvml {
-  behavior: url(#default#VML);
-  display: inline-block;
-  position: absolute;
-}
-
 /* control positioning */
 
 .leaflet-control {
   position: relative;
   z-index: 800;
-  pointer-events: visiblePainted; /* IE 9-10 does not have auto */
   pointer-events: auto;
 }
 
@@ -200,15 +204,8 @@
 
 /* zoom and fade animations */
 
-.leaflet-fade-anim .leaflet-tile {
-  will-change: opacity;
-}
-
 .leaflet-fade-anim .leaflet-popup {
   opacity: 0;
-  -webkit-transition: opacity 0.2s linear;
-  -moz-transition: opacity 0.2s linear;
-  -o-transition: opacity 0.2s linear;
   transition: opacity 0.2s linear;
 }
 
@@ -217,8 +214,6 @@
 }
 
 .leaflet-zoom-animated {
-  -webkit-transform-origin: 0 0;
-  -ms-transform-origin: 0 0;
   transform-origin: 0 0;
 }
 
@@ -227,17 +222,11 @@
 }
 
 .leaflet-zoom-anim .leaflet-zoom-animated {
-  -webkit-transition: -webkit-transform 0.25s cubic-bezier(0, 0, 0.25, 1);
-  -moz-transition: -moz-transform 0.25s cubic-bezier(0, 0, 0.25, 1);
-  -o-transition: -o-transform 0.25s cubic-bezier(0, 0, 0.25, 1);
   transition: transform 0.25s cubic-bezier(0, 0, 0.25, 1);
 }
 
 .leaflet-zoom-anim .leaflet-tile,
 .leaflet-pan-anim .leaflet-tile {
-  -webkit-transition: none;
-  -moz-transition: none;
-  -o-transition: none;
   transition: none;
 }
 
@@ -252,8 +241,7 @@
 }
 
 .leaflet-grab {
-  cursor: -webkit-grab;
-  cursor: -moz-grab;
+  cursor: grab;
 }
 
 .leaflet-crosshair,
@@ -269,9 +257,7 @@
 .leaflet-dragging .leaflet-grab,
 .leaflet-dragging .leaflet-grab .leaflet-interactive,
 .leaflet-dragging .leaflet-marker-draggable {
-  cursor: move;
-  cursor: -webkit-grabbing;
-  cursor: -moz-grabbing;
+  cursor: grabbing;
 }
 
 /* marker & overlays interactivity */
@@ -286,7 +272,6 @@
 .leaflet-marker-icon.leaflet-interactive,
 .leaflet-image-layer.leaflet-interactive,
 .leaflet-pane > svg path.leaflet-interactive {
-  pointer-events: visiblePainted; /* IE 9-10 does not have auto */
   pointer-events: auto;
 }
 
@@ -301,10 +286,6 @@
   color: #0078a8;
 }
 
-.leaflet-container a.leaflet-active {
-  outline: 2px solid orange;
-}
-
 .leaflet-zoom-box {
   border: 2px dotted #38f;
   background: rgba(255, 255, 255, 0.5);
@@ -312,7 +293,10 @@
 
 /* general typography */
 .leaflet-container {
-  font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  font-size: 0.75rem;
+  line-height: 1.5;
 }
 
 /* general toolbar styles */
@@ -342,7 +326,8 @@
   display: block;
 }
 
-.leaflet-bar a:hover {
+.leaflet-bar a:hover,
+.leaflet-bar a:focus {
   background-color: #f4f4f4;
 }
 
@@ -369,6 +354,16 @@
   line-height: 30px;
 }
 
+.leaflet-touch .leaflet-bar a:first-child {
+  border-top-left-radius: 2px;
+  border-top-right-radius: 2px;
+}
+
+.leaflet-touch .leaflet-bar a:last-child {
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
 /* zoom control */
 
 .leaflet-control-zoom-in,
@@ -377,16 +372,9 @@
   text-indent: 1px;
 }
 
-.leaflet-control-zoom-out {
-  font-size: 20px;
-}
-
-.leaflet-touch .leaflet-control-zoom-in {
-  font-size: 22px;
-}
-
+.leaflet-touch .leaflet-control-zoom-in,
 .leaflet-touch .leaflet-control-zoom-out {
-  font-size: 24px;
+  font-size: 22px;
 }
 
 /* layers control */
@@ -423,6 +411,12 @@
   position: relative;
 }
 
+.leaflet-control-layers-list {
+  border: 0;
+  margin: 0;
+  padding: 0;
+}
+
 .leaflet-control-layers-expanded {
   padding: 6px 10px 6px 6px;
   color: #333;
@@ -430,7 +424,7 @@
 }
 
 .leaflet-control-layers-scrollbar {
-  overflow-y: scroll;
+  overflow: hidden scroll;
   padding-right: 5px;
 }
 
@@ -442,6 +436,8 @@
 
 .leaflet-control-layers label {
   display: block;
+  font-size: 13px;
+  font-size: 1.08333em;
 }
 
 .leaflet-control-layers-separator {
@@ -467,19 +463,24 @@
 .leaflet-control-scale-line {
   padding: 0 5px;
   color: #333;
+  line-height: 1.4;
 }
 
 .leaflet-control-attribution a {
   text-decoration: none;
 }
 
-.leaflet-control-attribution a:hover {
+.leaflet-control-attribution a:hover,
+.leaflet-control-attribution a:focus {
   text-decoration: underline;
 }
 
-.leaflet-container .leaflet-control-attribution,
-.leaflet-container .leaflet-control-scale {
-  font-size: 11px;
+.leaflet-attribution-flag {
+  display: inline !important;
+  vertical-align: baseline !important;
+  width: 1em;
+  height: 0.6669em;
+  margin-right: 0.277em;
 }
 
 .leaflet-left .leaflet-control-scale {
@@ -495,13 +496,10 @@
   border-top: none;
   line-height: 1.1;
   padding: 2px 5px 1px;
-  font-size: 11px;
   white-space: nowrap;
-  overflow: hidden;
-  -moz-box-sizing: border-box;
   box-sizing: border-box;
-  background: #fff;
   background: rgba(255, 255, 255, 0.5);
+  text-shadow: 1px 1px #fff;
 }
 
 .leaflet-control-scale-line:not(:first-child) {
@@ -541,8 +539,11 @@
 }
 
 .leaflet-popup-content {
-  margin: 13px 19px;
-  line-height: 1.4;
+  margin: 13px 24px 13px 20px;
+  line-height: 1.3;
+  font-size: 13px;
+  font-size: 1.08333em;
+  min-height: 1px;
 }
 
 .leaflet-popup-content p {
@@ -554,6 +555,7 @@
   height: 20px;
   position: absolute;
   left: 50%;
+  margin-top: -1px;
   margin-left: -20px;
   overflow: hidden;
   pointer-events: none;
@@ -564,10 +566,7 @@
   height: 17px;
   padding: 1px;
   margin: -10px auto 0;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
+  pointer-events: auto;
   transform: rotate(45deg);
 }
 
@@ -582,48 +581,23 @@
   position: absolute;
   top: 0;
   right: 0;
-  padding: 4px 4px 0 0;
   border: none;
   text-align: center;
-  width: 18px;
-  height: 14px;
+  width: 24px;
+  height: 24px;
   font: 16px/14px Tahoma, Verdana, sans-serif;
-  color: #c3c3c3;
+  color: #757575;
   text-decoration: none;
-  font-weight: bold;
   background: transparent;
 }
 
-.leaflet-container a.leaflet-popup-close-button:hover {
-  color: #999;
+.leaflet-container a.leaflet-popup-close-button:hover,
+.leaflet-container a.leaflet-popup-close-button:focus {
+  color: #585858;
 }
 
 .leaflet-popup-scrolled {
   overflow: auto;
-  border-bottom: 1px solid #ddd;
-  border-top: 1px solid #ddd;
-}
-
-.leaflet-oldie .leaflet-popup-content-wrapper {
-  zoom: 1;
-}
-
-.leaflet-oldie .leaflet-popup-tip {
-  width: 24px;
-  margin: 0 auto;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
-  filter: progid:dximagetransform.microsoft.matrix(M11=.70710678, M12=.70710678, M21=-.70710678, M22=.70710678);
-}
-
-.leaflet-oldie .leaflet-popup-tip-container {
-  margin-top: -1px;
-}
-
-.leaflet-oldie .leaflet-control-zoom,
-.leaflet-oldie .leaflet-control-layers,
-.leaflet-oldie .leaflet-popup-content-wrapper,
-.leaflet-oldie .leaflet-popup-tip {
-  border: 1px solid #999;
 }
 
 /* div icon */
@@ -644,15 +618,12 @@
   border-radius: 3px;
   color: #222;
   white-space: nowrap;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   pointer-events: none;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
 }
 
-.leaflet-tooltip.leaflet-clickable {
+.leaflet-tooltip.leaflet-interactive {
   cursor: pointer;
   pointer-events: auto;
 }
@@ -722,3 +693,13 @@
   margin-left: -12px;
   border-right-color: #fff;
 }
+
+/* Printing */
+
+@media print {
+  /* Prevent printers from removing background-images of controls. */
+  .leaflet-control {
+    -webkit-print-color-adjust: exact;
+    print-color-adjust: exact;
+  }
+}

data/app/presenters/decidim/admin_log/oauth_application_resource_presenter.rb

@@ -11,7 +11,7 @@ module Decidim
       #
       # Returns an HTML-safe String.
       def resource_path
-        @resource_path ||= h.decidim_admin.oauth_application_path(resource)
+        @resource_path ||= h.decidim_system.oauth_application_path(resource)
       end
     end
   end

data/app/presenters/decidim/log/diff_presenter.rb

@@ -42,7 +42,7 @@ module Decidim
       def present_diff
         return "".html_safe if changeset.blank?
 
-        h.content_tag(:div, class: "logs__log__diff", id: "panel-#{h.dom_id(action_log)}") do
+        h.content_tag(:div, class: "logs__log__diff", id: "panel-#{h.dom_id(action_log)}", "aria-hidden": true) do
           changeset.each do |attribute|
             h.concat(present_new_value(attribute[:label], attribute[:new_value], attribute[:type]))
             h.concat(present_previous_value(attribute[:previous_value], attribute[:type])) if options[:show_previous_value?]

data/app/presenters/decidim/notification_to_mailer_presenter.rb

@@ -7,11 +7,16 @@ module Decidim
   class NotificationToMailerPresenter < SimpleDelegator
     include Decidim::TranslatableAttributes
 
+    EXTENDED_NOTIFICATIONS_CLASSES = [
+      "Decidim::Comments::CommentCreatedEvent"
+    ].freeze
+
     delegate :url_helpers, to: "Decidim::Core::Engine.routes"
     delegate :resource_title, to: :event
     delegate :resource_url, to: :event
     delegate :email_intro, to: :event
     delegate :resource_path, to: :event
+    delegate :safe_resource_text, to: :event
 
     def date_time
       if frequency == :daily
@@ -21,6 +26,10 @@ module Decidim
       end
     end
 
+    def show_extended_information?
+      EXTENDED_NOTIFICATIONS_CLASSES.include?(event_class)
+    end
+
     private
 
     def event

data/app/services/decidim/events_manager.rb

@@ -46,5 +46,11 @@ module Decidim
     def self.subscribe(event, &)
       ActiveSupport::Notifications.subscribe(event, &)
     end
+
+    def self.subscribe_events!
+      subscribe(/^decidim\.events\./) do |event_name, data|
+        EventPublisherJob.perform_later(event_name, data)
+      end
+    end
   end
 end

data/app/services/decidim/iframe_disabler.rb

@@ -18,6 +18,10 @@ module Decidim
 
     def disable_iframes(node)
       if node.name == "iframe"
+        # Default title for accessibility
+        node["title"] = I18n.t("decidim.shared.embed.title") if node["title"].blank?
+        # Disable scrollbar for some embed services
+        node["scrolling"] = "no"
         orig_node = node.to_s
         node.replace(%(<div class="disabled-iframe"><!-- #{orig_node} --></div>))
       end

data/app/services/decidim/push_notification_message_sender.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A wrapper for preparing push notifications messages from conversations
+  # It respects the same contract as the Decidim::Messaging::ConversationMailer
+  class PushNotificationMessageSender
+    include HasConversations
+
+    def deliver
+      SendPushNotification.new.perform(@notification, title)
+    end
+
+    private
+
+    # rubocop:disable Metrics/ParameterLists
+    # rubocop:disable Lint/UnusedMethodArgument
+    #
+    # There are some parameters thar are not used in the method, but they are needed to
+    # keep the same contract as the Decidim::Messaging::ConversationMailer
+    def send_notification(from:, to:, conversation:, action:, message: nil, third_party: nil)
+      @action = action
+      @sender = to
+      @third_party = third_party
+
+      @notification = PushNotificationMessage.new(
+        recipient: to,
+        conversation:,
+        message:
+      )
+
+      self
+    end
+    # rubocop:enable Lint/UnusedMethodArgument
+    # rubocop:enable Metrics/ParameterLists
+
+    def title
+      get_subject(action: @action, sender: @sender, third_party: @third_party)
+    end
+  end
+end

data/app/services/decidim/send_push_notification.rb

@@ -14,14 +14,19 @@ module Decidim
     # Send the push notification. Returns `nil` if the user did not allowed push notifications
     # or if the subscription to push notifications does not exist
     #
-    # Returns the result of the dispatch or nil if user or subscription are empty
-    def perform(notification)
+    # @param notification [Decidim::Notification, Decidim::PushNotificationMessage] the notification to be sent
+    # @param title [String] the title of the notification. Optional.
+    #
+    # @return [Array<Net::HTTPCreated>, nil] the result of the dispatch or nil if user or subscription are empty
+    def perform(notification, title = nil)
       return unless Rails.application.secrets.dig(:vapid, :enabled)
+      raise ArgumentError, "Need to provide a title if the notification is a PushNotificationMessage" if notification.is_a?(Decidim::PushNotificationMessage) && title.nil?
+
+      user = notification.user
 
-      I18n.with_locale(notification.user.locale || notification.user.organization.default_locale) do
-        notification.user.notifications_subscriptions.values.map do |subscription|
-          message_params = notification_params(Decidim::PushNotificationPresenter.new(notification))
-          payload = build_payload(message_params, subscription)
+      I18n.with_locale(user.locale || user.organization.default_locale) do
+        user.notifications_subscriptions.values.map do |subscription|
+          payload = build_payload(message_params(notification, title), subscription)
           # Capture webpush exceptions in order to avoid this call to be repeated by the background job runner
           # Webpush::Error class is the parent class of all defined errors
           begin
@@ -36,9 +41,18 @@ module Decidim
 
     private
 
-    def notification_params(notification)
+    def message_params(notification, title = nil)
+      case notification
+      when Decidim::PushNotificationMessage
+        notification_params(notification, title)
+      else # when Decidim::Notification
+        notification_params(Decidim::PushNotificationPresenter.new(notification))
+      end
+    end
+
+    def notification_params(notification, title = nil)
       {
-        title: notification.title,
+        title: title.presence || notification.title,
         body: notification.body,
         icon: notification.icon,
         data: { url: notification.url }

data/app/uploaders/decidim/background_image_uploader.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class deals with uploading background images to participatory spaces, to be used with the ParticipatorySpaceHero
+  # content block.
+  class BackgroundImageUploader < RecordImageUploader
+    set_variants do
+      { default: { resize_to_fit: [1000, 1000] } }
+    end
+  end
+end

data/app/views/decidim/application/_collection.html.erb

@@ -5,14 +5,14 @@
       <%= icon "folder-line" %>
       <%= icon "folder-open-line" %>
     </span>
-    <%= translated_attribute(attachment_collection.name) %>
+    <%= decidim_escape_translated(attachment_collection.name) %>
   </span>
   <%= icon "arrow-down-s-fill" %>
   <%= icon "arrow-up-s-fill" %>
 </button>
 
 <div id="dropdown-menu-documents-<%= attachment_collection.id %>" class="documents__collection-content" aria-hidden="true">
-  <p><%= translated_attribute(attachment_collection.description) %></p>
+  <p><%= decidim_escape_translated(attachment_collection.description) %></p>
 
   <div class="documents__container">
     <% documents.each do |document| %>

data/app/views/decidim/application/_document.html.erb

@@ -4,7 +4,7 @@
       <%= h attachment_title(document) %>
     <% end %>
     <% if document.description.present? %>
-      <div class="card__list-text"><%= translated_attribute(document.description) %></div>
+      <div class="card__list-text"><%= decidim_escape_translated(document.description) %></div>
     <% end %>
     <div class="card__list-metadata">
       <span><%= icon "file-text-line" %><%= document.file_type %></span>

data/app/views/decidim/devise/registrations/new.html.erb

@@ -41,7 +41,7 @@
     </div>
 
     <div id="card__tos" class="form__wrapper-block">
-      <h4 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h4>
+      <h2 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h2>
 
       <div class="tos-text">
         <% terms_of_service_summary_content_blocks.each do |content_block| %>
@@ -53,7 +53,7 @@
     </div>
 
     <div id="card__newsletter" class="form__wrapper-block">
-      <h4 class="h4"><%= t("decidim.devise.registrations.new.newsletter_title") %></h4>
+      <h2 class="h4"><%= t("decidim.devise.registrations.new.newsletter_title") %></h2>
       <%= f.check_box :newsletter, label: t("decidim.devise.registrations.new.newsletter"), checked: @form.newsletter, label_options: { class: "form__wrapper-checkbox-label" } %>
     </div>
 

data/app/views/decidim/notifications_digest_mailer/_email_content.html.erb

@@ -8,4 +8,11 @@
       <%= link_to decidim_sanitize(notification.resource_title, strip_tags: true), notification.resource_url %>
     </p>
   <% end %>
+  <% if notification.show_extended_information? %>
+    <blockquote>
+      <p>
+      <%= notification.safe_resource_text %>
+      </p>
+    </blockquote>
+  <% end %>
 </div>

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

@@ -1,9 +1,15 @@
-<div id="offline-fallback-html" style="text-align:center;padding:1rem">
-  <svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
-    <path
-    d="m20.293 4-1.477 1.477A4.473 4.473 0 0 0 11.17 7.33 4.362 4.362 0 0 0 9.5 7a4.486 4.486 0 0 0-4.23 3.01 4.49 4.49 0 0 0 .042 8.971L4 20.293l.707.707L21 4.707zM19.99 8.21a3.936 3.936 0 0 0-.16-.92L8.12 19H18.5a5.497 5.497 0 0 0 1.49-10.79z"
-    style="fill:#1a181d" />
-  </svg>
-  <h3><%= t(".message") %></h3>
-  <button class="button large button--sc mt-s" onclick="location.reload()"><%= t(".retry") %></button>
-</div>
+<% add_decidim_page_title(t("decidim.offline.name")) %>
+
+<main id="offline-fallback-html" class="text-center mt-8">
+  <div class="flex justify-center">
+    <svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
+      <path
+      d="m20.293 4-1.477 1.477A4.473 4.473 0 0 0 11.17 7.33 4.362 4.362 0 0 0 9.5 7a4.486 4.486 0 0 0-4.23 3.01 4.49 4.49 0 0 0 .042 8.971L4 20.293l.707.707L21 4.707zM19.99 8.21a3.936 3.936 0 0 0-.16-.92L8.12 19H18.5a5.497 5.497 0 0 0 1.49-10.79z"
+      style="fill:#1a181d" />
+    </svg>
+  </div>
+  <h1 class="h1"><%= t("decidim.offline.name") %></h1>
+  <p class="text-lg mt-4"><%= t(".message_1") %></p>
+  <p class="text-lg mt-4"><%= t(".message_2") %></p>
+  <button class="button button__secondary button__lg mt-8" onclick="location.reload()"><%= t(".retry") %></button>
+</main>

data/app/views/layouts/decidim/_head.html.erb

@@ -27,6 +27,7 @@
 <link rel="manifest" href="/manifest.webmanifest">
 
 <%= prepend_javascript_pack_tag "decidim_core", defer: false %>
+<%= append_stylesheet_pack_tag "decidim_overrides", media: "all" %>
 <%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= yield :css_content %>