decidim-core 0.29.1 → 0.29.3

data/app/helpers/concerns/decidim/user_role_checker.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module UserRoleChecker
+    # Shared behaviour for signed_in admins
+    extend ActiveSupport::Concern
+
+    private
+
+    def user_has_any_role?(user, participatory_space = nil, broad_check: false)
+      return false unless user
+
+      [
+        user.admin,
+        user.roles.any?,
+        participatory_process_user_role?(user, participatory_space, broad_check:),
+        assembly_user_role?(user, participatory_space, broad_check:),
+        conference_user_role?(user, participatory_space, broad_check:)
+      ].any?
+    end
+
+    def participatory_process_user_role?(user, participatory_process = nil, broad_check: false)
+      return false unless Decidim.module_installed?(:participatory_processes)
+      return Decidim::ParticipatoryProcessUserRole.exists?(user:) if broad_check
+      return false unless participatory_process.is_a?(Decidim::ParticipatoryProcess)
+
+      Decidim::ParticipatoryProcessUserRole.exists?(user:, participatory_process:)
+    end
+
+    def assembly_user_role?(user, assembly = nil, broad_check: false)
+      return false unless Decidim.module_installed?(:assemblies)
+      return Decidim::AssemblyUserRole.exists?(user:) if broad_check
+      return false unless assembly.is_a?(Decidim::Assembly)
+
+      Decidim::AssemblyUserRole.exists?(user:, assembly:)
+    end
+
+    def conference_user_role?(user, conference = nil, broad_check: false)
+      return false unless Decidim.module_installed?(:conferences)
+      return Decidim::ConferenceUserRole.exists?(user:) if broad_check
+      return false unless conference.is_a?(Decidim::Conference)
+
+      Decidim::ConferenceUserRole.exists?(user:, conference:)
+    end
+  end
+end

data/app/helpers/decidim/cta_button_helper.rb

@@ -16,7 +16,7 @@ module Decidim
     # Finds the CTA button path to reuse it in other places.
     def cta_button_path
       if current_organization.cta_button_path.present?
-        current_organization.cta_button_path
+        "/#{current_organization.cta_button_path}"
       elsif Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?
         decidim_participatory_processes.participatory_processes_path
       elsif current_user

data/app/helpers/decidim/map_helper.rb

@@ -35,7 +35,12 @@ module Decidim
             data: { "external-link": "text-only" }
           }.merge(map_html_options)
           return link_to(map_url, html_options) do
-            image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s), alt: "#{map_service_brand} - #{address_text}"
+            # We also add the latitude and the longitude to prevent the Workbox cache to be overly aggressive when updating a map
+            image_tag decidim.static_map_path(
+              sgid: resource.to_sgid.to_s,
+              latitude: resource.latitude,
+              longitude: resource.longitude
+            ), alt: "#{map_service_brand} - #{address_text}"
           end
         end
       end

data/app/helpers/decidim/orders_helper.rb

@@ -13,7 +13,8 @@ module Decidim
     def order_selector(orders, options = {})
       render partial: "decidim/shared/orders", locals: {
         orders:,
-        i18n_scope: options[:i18n_scope]
+        i18n_scope: options[:i18n_scope],
+        css_class: options[:css_class]
       }
     end
 

data/app/helpers/decidim/participatory_space_helpers.rb

@@ -28,7 +28,7 @@ module Decidim
     end
 
     def participatory_space_floating_help
-      return if help_section.blank?
+      return if help_section.blank? || strip_tags(translated_attribute(help_section).html_safe).blank?
 
       floating_help(help_id) { translated_attribute(help_section).html_safe }
     end

data/app/helpers/decidim/sanitize_helper.rb

@@ -37,13 +37,22 @@ module Decidim
       end
     end
 
+    # Converts the blob and blob variant references to blob URLs.
+    def decidim_rich_text(html, **)
+      renderer = Decidim::ContentProcessor.renderer_klass(:blob).constantize.new(html)
+      renderer.render(**)
+    end
+
     def decidim_sanitize_editor(html, options = {})
       content_tag(:div, decidim_sanitize(html, options), class: %w(rich-text-display))
     end
 
     def decidim_sanitize_editor_admin(html, options = {})
       html = Decidim::IframeDisabler.new(html, options).perform
-      decidim_sanitize_editor(html, { scrubber: Decidim::AdminInputScrubber.new }.merge(options))
+      decidim_sanitize_editor(
+        decidim_rich_text(html),
+        { scrubber: Decidim::AdminInputScrubber.new }.merge(options)
+      )
     end
 
     def decidim_html_escape(text)
@@ -51,7 +60,7 @@ module Decidim
     end
 
     def decidim_url_escape(text)
-      decidim_html_escape(text).sub(/^javascript:/, "")
+      decidim_html_escape(text).sub(/^\s*javascript:/, "")
     end
 
     def decidim_sanitize_translated(text)

data/app/jobs/decidim/hide_child_resources_job.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  class HideChildResourcesJob < ApplicationJob
+    queue_as :user_report
+
+    def perform(resource, user_id)
+      spam_user = (resource.organization.users.find_by(email: Decidim::Ai::SpamDetection.reporting_user_email) if Decidim.module_installed?(:ai))
+      spam_user = resource.organization.admins.find(user_id) if spam_user.nil?
+
+      tool = Decidim::ModerationTools.new(resource, spam_user)
+
+      unless Decidim::Report.exists?("decidim_moderation_id" => tool.moderation.id, "decidim_user_id" => spam_user.id)
+        tool.create_report!({
+                              reason: "parent_hidden",
+                              details: I18n.t("report_details", scope: "decidim.reports.parent_hidden")
+                            })
+      end
+
+      tool.update_report_count!
+      tool.hide!
+    end
+  end
+end

data/app/mailers/decidim/reported_mailer.rb

@@ -25,6 +25,7 @@ module Decidim
       with_user(user) do
         @report = report
         @participatory_space = @report.moderation.participatory_space
+        @reportable = @report.moderation.reportable
         @organization = user.organization
         @user = user
         subject = I18n.t("hide.subject", scope: "decidim.reported_mailer")

data/app/models/decidim/action_log.rb

@@ -156,15 +156,7 @@ module Decidim
 
     def self.publicable_public_resource_types
       @publicable_public_resource_types ||= public_resource_types
-                                            .select { |klass| klass.constantize.column_names.include?("published_at") } - publicable_exceptions
-    end
-
-    def self.publicable_exceptions
-      @publicable_exceptions = %w(
-        Decidim::Blogs::Post
-      ).select do |klass|
-        klass.safe_constantize.present?
-      end
+                                            .select { |klass| klass.constantize.column_names.include?("published_at") }
     end
 
     def self.ransackable_scopes(auth_object = nil)

data/app/models/decidim/attachment.rb

@@ -74,7 +74,7 @@ module Decidim
     # Returns String.
     def file_type
       if file?
-        url&.split(".")&.last&.downcase
+        url&.split(".")&.last&.split("&")&.first&.downcase
       elsif link?
         "link"
       end

data/app/models/decidim/report.rb

@@ -5,7 +5,7 @@ module Decidim
   class Report < ApplicationRecord
     include Decidim::DownloadYourData
 
-    REASONS = %w(spam offensive does_not_belong hidden_during_block).freeze
+    REASONS = %w(spam offensive does_not_belong hidden_during_block parent_hidden).freeze
 
     belongs_to :moderation, foreign_key: "decidim_moderation_id", class_name: "Decidim::Moderation"
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"

data/app/models/decidim/user.rb

@@ -13,8 +13,6 @@ module Decidim
     include Decidim::UserReportable
     include Decidim::Traceable
 
-    REGEXP_NICKNAME = /\A[\w-]+\z/
-
     class Roles
       def self.all
         Decidim.config.user_roles
@@ -51,8 +49,6 @@ module Decidim
 
     has_one_attached :download_your_data_file
 
-    scope :not_deleted, -> { where(deleted_at: nil) }
-
     scope :managed, -> { where(managed: true) }
     scope :not_managed, -> { where(managed: false) }
 

data/app/models/decidim/user_base_entity.rb

@@ -21,11 +21,13 @@ module Decidim
 
     # Regex for name & nickname format validations
     REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/
+    REGEXP_NICKNAME = /\A[a-z0-9_-]+\z/
 
     has_one_attached :avatar
     validates_avatar :avatar, uploader: Decidim::AvatarUploader
 
     validates :name, format: { with: REGEXP_NAME }
+    validates :nickname, format: { with: REGEXP_NICKNAME }, unless: -> { deleted? || managed? }
 
     scope :confirmed, -> { where.not(confirmed_at: nil) }
     scope :not_confirmed, -> { where(confirmed_at: nil) }
@@ -34,6 +36,8 @@ module Decidim
     scope :not_blocked, -> { where(blocked: false) }
     scope :available, -> { where(deleted_at: nil, blocked: false, managed: false) }
 
+    scope :not_deleted, -> { where(deleted_at: nil) }
+
     # Public: Returns a collection with all the public entities this user is following.
     #
     # This cannot be done as with a `has_many :following, through: :following_follows`

data/app/packs/src/decidim/append_redirect_url_to_modals.js

@@ -53,10 +53,18 @@ $(() => {
   }
 
   $(document).on("click.zf.trigger", (event) => {
-    const target = `#${$(event.target).data("dialogOpen")}`;
-    const redirectUrl = $(event.target).data("redirectUrl");
+    // Try to get the <a> directly or find the closest parent <a>
+    const $target = $(event.target).closest("a");
 
-    if (!target || !redirectUrl) {
+    // Check if an <a> was found
+    if (!$target) {
+      return;
+    }
+
+    const dialogTarget = `#${$target.data("dialog-open")}`;
+    const redirectUrl = $target.data("redirectUrl");
+
+    if (!dialogTarget || !redirectUrl) {
       return;
     }
 
@@ -64,10 +72,10 @@ $(() => {
       attr("id", "redirect_url").
       attr("name", "redirect_url").
       attr("value", redirectUrl).
-      appendTo(`${target} form`);
+      appendTo(`${dialogTarget} form`);
 
-    $(`${target} a`).attr("href", (index, href) => {
-      const querystring = jQuery.param({ "redirect_url": redirectUrl });
+    $(`${dialogTarget} a`).attr("href", (index, href) => {
+      const querystring = jQuery.param({"redirect_url": redirectUrl});
       return href + (href.match(/\?/) ? "&" : "?") + querystring;
     });
   });

data/app/packs/src/decidim/datepicker/datepicker_functions.js

@@ -29,12 +29,12 @@ export const formatInputDate = (date, formats) => {
   const month = dateList[1];
   const day = dateList[2];
 
-  if (formats.order === "d-m-y") {
-    return `${day}${formats.separator}${month}${formats.separator}${year}`;
+  if (formats.order === "m-d-y") {
+    return `${month}${formats.separator}${day}${formats.separator}${year}`;
   } else if (formats.order === "y-m-d") {
     return `${year}${formats.separator}${month}${formats.separator}${day}`;
   };
-  return `${month}${formats.separator}${day}${formats.separator}${year}`;
+  return `${day}${formats.separator}${month}${formats.separator}${year}`;
 };
 
 export const formatInputTime = (time, format, input) => {

data/app/packs/src/decidim/direct_uploads/upload_field.js

@@ -21,6 +21,7 @@ const updateActiveUploads = (modal) => {
   const files = document.querySelector(`[data-active-uploads=${modal.modal.id}]`)
   const previousId = Array.from(files.querySelectorAll("[type=hidden][id]"))
   const isMultiple = modal.options.multiple
+  const isTitled = modal.options.titled
 
   // fastest way to clean children nodes
   files.textContent = ""
@@ -34,16 +35,26 @@ const updateActiveUploads = (modal) => {
     let hidden = ""
     if (file.hiddenField) {
       // if there is hiddenField, this file is new
-      const fileField = isMultiple
-        ? `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][file]`
-        : `${modal.options.resourceName}[${modal.options.addAttribute}]`
+      let fileField = null;
+      if (isMultiple) {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][file]`
+      } else if (isTitled) {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}][file]`
+      } else {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}]`;
+      }
 
       hidden = `<input type="hidden" name="${fileField}" value="${file.hiddenField}" />`
     } else {
       // otherwise, we keep the attachmentId
-      const fileField = isMultiple
-        ? `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][id]`
-        : `${modal.options.resourceName}[${modal.options.addAttribute}]`
+      let fileField = null;
+      if (isMultiple) {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][id]`;
+      } else if (isTitled) {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}][id]`;
+      } else {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}]`;
+      }
 
       // convert all node attributes to string
       const attributes = Array.from(previousId.find(({ id }) => id === file.attachmentId).attributes).reduce((acc, { name, value }) => `${acc} ${name}="${value}"`, "")
@@ -51,10 +62,12 @@ const updateActiveUploads = (modal) => {
       hidden += `<input type="hidden" name="${fileField}" value="${file.attachmentId}" />`
     }
 
-    if (modal.options.titled) {
+    if (isTitled) {
       const titleValue = modal.modal.querySelectorAll('input[type="text"]')[ix].value
       // NOTE - Renaming the attachment is not supported when multiple uploader is disabled
-      const titleField = `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][title]`
+      const titleField = isMultiple
+        ? `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][title]`
+        : `${modal.options.resourceName}[${modal.options.addAttribute}][title]`
       hidden += `<input type="hidden" name="${titleField}" value="${escapeQuotes(titleValue)}" />`
 
       title = titleValue

data/app/packs/src/decidim/index.js

@@ -69,6 +69,8 @@ import handleNotificationActions from "src/decidim/notifications_actions"
 import RemoteModal from "src/decidim/remote_modal"
 import selectActiveIdentity from "src/decidim/identity_selector_dialog"
 import createTooltip from "src/decidim/tooltips"
+// Temporary disabling this feature because we have a poor performance. See https://github.com/decidim/decidim/issues/14431
+// import fetchRemoteTooltip from "src/decidim/remote_tooltips"
 import createToggle from "src/decidim/toggle"
 import {
   createAccordion,
@@ -195,6 +197,9 @@ const initializer = (element = document) => {
   // Initialize data-toggles
   element.querySelectorAll("[data-toggle]").forEach((elem) => createToggle(elem))
 
+  // Temporary disabling this feature because we have a poor performance. See https://github.com/decidim/decidim/issues/14431
+  // element.querySelectorAll("[data-remote-tooltip]").forEach((elem) => fetchRemoteTooltip(elem))
+
   element.querySelectorAll(".new_report").forEach((elem) => changeReportFormBehavior(elem))
 }
 

data/app/packs/src/decidim/map/provider/here.js

@@ -1,5 +1,5 @@
 import "leaflet"
-import "src/decidim/vendor/leaflet-tilelayer-here"
+import "leaflet-tilelayer-here"
 
 /**
  * NOTE:

data/app/packs/src/decidim/remote_tooltips.js

@@ -0,0 +1,38 @@
+import createTooltip from "src/decidim/tooltips"
+
+/**
+ * Given the following HTML structure,
+ * <span data-remote-tooltip="true" tooltip-url="some url" data-author="true">
+ *   <span></span>
+ * </span>
+ *
+ * This function will check if the HTMLElement where is attached to has a child, and will add a data tooltip attribute
+ * to the respective child in order to attach the fetched HTML content fetched under a json key as the content of the
+ * HTML tooltip. The DOM structure is expected to be like follows:
+ *
+ * <span data-remote-tooltip="true" tooltip-url="some url" data-author="true">
+ *   <span data-tooltip="HTML content from json data field"></span>
+ * </span>
+ *
+ * @param {HTMLElement} node The element holding the initialization data
+ * @returns {void}
+ */
+export default async function(node) {
+  const container = node.firstElementChild;
+
+  if (container) {
+    const response = await fetch(node.dataset.tooltipUrl, {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+    if (response.ok) {
+      const json = await response.json();
+
+      container.dataset.tooltip = json.data;
+      createTooltip(container);
+    } else {
+      console.error(response.status, response.statusText);
+    }
+  }
+}

data/app/packs/src/decidim/toggle.js

@@ -9,7 +9,7 @@ export default function createToggle(component) {
   const { toggle } = component.dataset
 
   if (!component.id) {
-    // when component has no id, we enforce to have it one
+    // when component has no id, we enforce it to have one
     component.id = `toggle-${Math.random().toString(36).substring(7)}`
   }
 

data/app/packs/src/decidim/tooltips.js

@@ -63,9 +63,32 @@ export default function(node) {
   // append to dom hidden, to apply css transitions
   tooltip.setAttribute("aria-hidden", true)
 
-  const append = () => {
-    // do nothing if the tooltip is already present at the DOM
+  // used to detect if the user is on a mobile device by checking the user agent
+  const useMobile = (/Mobi|Android/i).test(navigator.userAgent);
+
+  // used not to collapse tooltip
+  let removeTooltip = () => {
+    tooltip.setAttribute("aria-hidden", "true");
+  }
+
+  // used to allow clicks outside the tooltip to take place on the page or device
+  const OutsideClick = (event) => {
+    if (!tooltip.contains(event.target) && event.target !== node) {
+      removeTooltip();
+    }
+  }
+
+  // function called again to allow clicks outside the tooltip to collapse the tooltip
+  removeTooltip = () => {
+    tooltip.setAttribute("aria-hidden", "true");
+    document.removeEventListener("click", OutsideClick)
+  }
+
+  const toggleTooltip = (event) => {
+    event.preventDefault();
+    // if the tooltip is visible in the DOM, hide it otherwise display
     if (tooltip.getAttribute("aria-hidden") === "false") {
+      tooltip.setAttribute("aria-hidden", "true");
       return
     }
 
@@ -106,27 +129,24 @@ export default function(node) {
     tooltip.style.left = `${positionX}px`
 
     tooltip.setAttribute("aria-hidden", false)
-  }
-
-  // in order to revoke the remove event when the mouse is over the trigger/tooltip
-  let cancelRemove = false
 
-  const remove = () => {
-    cancelRemove = false
-    // give some sleep time before hiding the element from the DOM
-    setTimeout(() => !cancelRemove && tooltip.setAttribute("aria-hidden", true), 500);
+    // sleep time before hiding the element from the DOM
+    setTimeout(() => document.addEventListener("click", OutsideClick))
   }
 
-  // keyboard listener is at root-level
-  window.addEventListener("keydown", (event) => event.key === "Escape" && remove())
-
-  node.addEventListener("mouseenter", append)
-  node.addEventListener("mouseleave", remove)
-  node.addEventListener("focus", append)
-  node.addEventListener("blur", remove)
-  tooltip.addEventListener("mouseenter", () => tooltip.setAttribute("aria-hidden", false))
-  tooltip.addEventListener("mouseleave", remove)
-
-  node.addEventListener("mouseover", () => (cancelRemove = true))
-  tooltip.addEventListener("mouseover", () => (cancelRemove = true))
+  if (useMobile) {
+    // mobile use to click and toggle the tooltip
+    node.addEventListener("click", toggleTooltip);
+    window.addEventListener("keydown", (event) => event.key === "Escape" && removeTooltip())
+  } else {
+    // desktop use for hover and blur over tooltip
+    node.addEventListener("mouseenter", toggleTooltip)
+    node.addEventListener("mouseleave", removeTooltip)
+    node.addEventListener("focus", toggleTooltip)
+    node.addEventListener("blur", removeTooltip)
+
+    // tooltip hover listeners to prevent hiding when hovered
+    tooltip.addEventListener("mouseenter", () => tooltip.setAttribute("aria-hidden", false))
+    tooltip.addEventListener("mouseleave", removeTooltip)
+  }
 }

data/app/packs/stylesheets/decidim/_content_blocks.scss

@@ -27,6 +27,10 @@
         @apply block;
       }
     }
+
+    > h3:not([class~="not-prose"]) {
+      @apply mb-[-0.4rem] pt-4 pb-2;
+    }
   }
 
   &__span {

data/app/packs/stylesheets/decidim/_hashtags.scss

@@ -0,0 +1,5 @@
+.hashtags {
+  > label {
+    @apply ml-4;
+  }
+}

data/app/packs/stylesheets/decidim/_header.scss

@@ -115,7 +115,7 @@ header {
       @apply fixed bottom-0 left-0 z-40 bg-white w-full px-4 py-3 flex justify-between text-secondary shadow-[0_-4px_6px_rgba(198,198,198,0.25)];
 
       &__trigger {
-        @apply flex flex-col items-center text-secondary cursor-pointer pl-4 border-l border-gray-3;
+        @apply flex flex-col items-center text-secondary cursor-pointer md:pl-4 md:border-l border-gray-3;
 
         svg {
           @apply w-6 h-6 fill-current;
@@ -167,7 +167,7 @@ header {
       }
 
       &__item {
-        @apply relative;
+        @apply flex relative;
       }
 
       &__search {
@@ -175,14 +175,16 @@ header {
       }
 
       &__login {
-        @apply w-20 h-full flex flex-row items-center relative text-secondary gap-1;
+        @apply w-auto h-full flex flex-row items-center relative text-secondary gap-1 pl-2 pr-2;
 
         svg {
           @apply w-8 h-6 fill-current;
         }
 
         svg + span {
-          @apply text-sm first-letter:uppercase pr-4 w-16;
+          @apply text-sm first-letter:uppercase w-auto;
+
+          flex-shrink: 0;
         }
       }
     }
@@ -432,8 +434,12 @@ header {
         @apply h4 md:h3;
       }
 
+      nav {
+        @apply w-full md:w-1/4;
+      }
+
       &__menu {
-        @apply w-full md:w-1/4 bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
+        @apply w-full bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
 
         > * {
           @apply py-3 md:py-3.5;

data/app/packs/stylesheets/decidim/_labels.scss

@@ -6,7 +6,7 @@
   --warning: #ad4910;
   --bg-warning: #ffeebd;
 
-  @apply bg-background text-gray-2 rounded inline-flex items-center gap-1 px-2 font-semibold text-sm;
+  @apply bg-background text-gray-2 rounded inline-flex items-center gap-1 px-2 py-1 h-min font-semibold text-sm;
 
   &.success {
     @apply bg-[var(--bg-success)] text-[var(--success)];

data/app/packs/stylesheets/decidim/_profile.scss

@@ -45,7 +45,7 @@
 
   &__actions {
     &-main {
-      @apply w-fit grid grid-cols-2 md:grid-cols-1 mx-auto gap-x-4 gap-y-6 md:gap-4;
+      @apply w-fit mx-auto gap-x-4 gap-y-6 md:gap-4;
 
       &__dropdown {
         @apply divide-y divide-gray-3 z-20 w-64;

data/app/packs/stylesheets/decidim/_progress-bar.scss

@@ -29,7 +29,7 @@
   }
 
   &__sm {
-    @apply w-16;
+    @apply w-16 pt-2;
   }
 
   &__sm &__number {

data/app/packs/stylesheets/decidim/application.scss

@@ -58,6 +58,7 @@
   @import "stylesheets/decidim/_hero.scss";
   @import "stylesheets/decidim/_actions.scss";
   @import "stylesheets/decidim/_emoji.scss";
+  @import "stylesheets/decidim/_hashtags.scss";
 }
 
 @import "stylesheets/decidim/vendor/datepicker_light.scss";

data/app/packs/stylesheets/decidim/legacy/conference-diploma.scss

@@ -37,7 +37,6 @@
 }
 
 .conference-diploma .diploma__logo {
-  border: 1px solid #333;
   padding: 2rem;
 }
 
@@ -47,10 +46,12 @@
     max-height: 100%;
     max-width: 100%;
     margin: 0;
+    padding-top: 10%;
   }
 
   .conference-diploma .diploma__border {
     margin: 0;
+    margin-top: 15%;
     -moz-border-image: url("../images/decidim/pattern.png") 20 repeat;
     -webkit-border-image: url("../images/decidim/pattern.png") 20 repeat;
     -o-border-image: url("../images/decidim/pattern.png") 20 repeat;

data/app/presenters/decidim/attachment_presenter.rb

@@ -6,7 +6,7 @@ module Decidim
   #
   class AttachmentPresenter < SimpleDelegator
     def attachment_file_url
-      attachment.attached_uploader(:file).url(host: attached_to.organization.host)
+      attachment.attached_uploader(:file).url
     end
 
     def attachment