decidim-core 0.25.0 → 0.26.0.rc2

data/app/services/decidim/open_data_exporter.rb

@@ -33,7 +33,6 @@ module Decidim
         open_data_component_manifests.each do |manifest|
           add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_component(manifest))
         end
-
         open_data_participatory_space_manifests.each do |manifest|
           add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_participatory_space(manifest))
         end
@@ -42,12 +41,37 @@ module Decidim
       buffer.string
     end
 
-    def data_for_component(export_manifest)
-      collection = components.where(manifest_name: export_manifest.manifest.name).find_each.flat_map do |component|
-        export_manifest.collection.call(component)
+    def data_for_component(export_manifest, col_sep = Decidim.default_csv_col_sep)
+      headers = []
+      collection = []
+      ActiveRecord::Base.uncached do
+        components.where(manifest_name: export_manifest.manifest.name).find_each do |component|
+          export_manifest.collection.call(component).find_in_batches(batch_size: 100) do |batch|
+            exporter = Decidim::Exporters::CSV.new(batch, export_manifest.serializer)
+            headers.push(*exporter.headers)
+            exported = exporter.export
+
+            tmpfile = Tempfile.new("#{export_manifest.name}-#{component.id}-")
+            tmpfile.write(exported.read)
+            # Do not delete the file when the reference is deleted
+            ObjectSpace.undefine_finalizer(tmpfile)
+            tmpfile.close
+
+            collection.push(tmpfile.path)
+          end
+        end
       end
 
-      Decidim::Exporters::CSV.new(collection, export_manifest.serializer).export
+      headers.uniq!
+
+      data = CSV.generate_line(headers, col_sep: col_sep)
+      collection.each do |content|
+        CSV.foreach(content, headers: true, col_sep: col_sep) do |row|
+          data << CSV.generate_line(row.values_at(*headers), col_sep: col_sep)
+        end
+        File.unlink(content)
+      end
+      Decidim::Exporters::ExportData.new(data, "csv")
     end
 
     def data_for_participatory_space(export_manifest)

data/app/services/decidim/resource_search.rb

@@ -75,7 +75,7 @@ module Decidim
       conditions << "#{query.model_name.plural}.decidim_scope_id IS NULL" if clean_scope_ids.delete("global")
       conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
 
-      query.includes(:scope).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))
+      query.includes(:scope).references(:decidim_scopes).where(Arel.sql(conditions.join(" OR ")).to_s, *clean_scope_ids.map(&:to_i))
     end
 
     # Handle the origin filter.

data/app/uploaders/decidim/editor_image_uploader.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class deals with uploading images to WYSIWYG editor.
+  class EditorImageUploader < ImageUploader; end
+end

data/app/validators/password_validator.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+# Class is used to verify that the user's password is strong enough
+class PasswordValidator < ActiveModel::EachValidator
+  MINIMUM_LENGTH = 10
+  MAX_LENGTH = 256
+  MIN_UNIQUE_CHARACTERS = 5
+  IGNORE_SIMILARITY_SHORTER_THAN = 4
+  VALIDATION_METHODS = [
+    :password_too_short?,
+    :password_too_long?,
+    :not_enough_unique_characters?,
+    :name_included_in_password?,
+    :nickname_included_in_password?,
+    :email_included_in_password?,
+    :domain_included_in_password?,
+    :password_too_common?,
+    :blacklisted?
+  ].freeze
+
+  # Check if user's password is strong enough
+  #
+  # record - Instance of a form (e.g. Decidim::RegistrationForm) or model
+  # attribute - "password"
+  # value - Actual password
+  # Returns true if password is strong enough
+  def validate_each(record, attribute, value)
+    return false if value.blank?
+
+    @record = record
+    @attribute = attribute
+    @value = value
+    @weak_password_reasons = []
+
+    return true if strong?
+
+    @weak_password_reasons.each do |reason|
+      record.errors[attribute] << get_message(reason)
+    end
+
+    false
+  end
+
+  private
+
+  attr_reader :record, :attribute, :value
+
+  def get_message(reason)
+    I18n.t "password_validator.#{reason}"
+  end
+
+  def strong?
+    VALIDATION_METHODS.each do |method|
+      @weak_password_reasons << method.to_s.sub(/\?$/, "").to_sym if send(method.to_s)
+    end
+
+    @weak_password_reasons.empty?
+  end
+
+  def password_too_short?
+    value.length < MINIMUM_LENGTH
+  end
+
+  def password_too_long?
+    value.length > MAX_LENGTH
+  end
+
+  def not_enough_unique_characters?
+    value.chars.uniq.length < MIN_UNIQUE_CHARACTERS
+  end
+
+  def name_included_in_password?
+    return false if !record.respond_to?(:name) || record.name.blank?
+    return true if value.include?(record.name.delete(" "))
+
+    record.name.split(" ").each do |part|
+      next if part.length < IGNORE_SIMILARITY_SHORTER_THAN
+
+      return true if value.include?(part)
+    end
+
+    false
+  end
+
+  def nickname_included_in_password?
+    return false if !record.respond_to?(:nickname) || record.nickname.blank?
+
+    value.include?(record.nickname)
+  end
+
+  def email_included_in_password?
+    return false if !record.respond_to?(:email) || record.email.blank?
+
+    name, domain, _whatever = record.email.split("@")
+    value.include?(name) || (domain && value.include?(domain.split(".").first))
+  end
+
+  def domain_included_in_password?
+    return false unless record&.current_organization&.host
+    return true if value.include?(record.current_organization.host)
+
+    record.current_organization.host.split(".").each do |part|
+      next if part.length < IGNORE_SIMILARITY_SHORTER_THAN
+
+      return true if value.include?(part)
+    end
+
+    false
+  end
+
+  def blacklisted?
+    Array(Decidim.password_blacklist).each do |expression|
+      return true if expression.is_a?(Regexp) && value.match?(expression)
+      return true if expression.to_s == value
+    end
+
+    false
+  end
+
+  def password_too_common?
+    Decidim::CommonPasswords.instance.passwords.include?(value)
+  end
+end

data/app/views/decidim/account/_password_fields.html.erb

@@ -1,2 +1,2 @@
-<%= form.password_field :password, value: form.object.password, autocomplete: "off", help_text: t("devise.passwords.edit.password_help", minimun_characters: NOBSPW.configuration.min_password_length) %>
+<%= form.password_field :password, value: form.object.password, autocomplete: "off", help_text: t("devise.passwords.edit.password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH) %>
 <%= form.password_field :password_confirmation, value: form.object.password_confirmation, autocomplete: "off" %>

data/app/views/decidim/devise/passwords/edit.html.erb

@@ -16,7 +16,7 @@
             <%= f.hidden_field :reset_password_token %>
 
             <div class="field">
-              <%= f.password_field :password, autocomplete: "off", help_text: t("devise.passwords.edit.password_help", minimun_characters: NOBSPW.configuration.min_password_length) %>
+              <%= f.password_field :password, autocomplete: "off", help_text: t("devise.passwords.edit.password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH) %>
             </div>
 
             <div class="field">

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

@@ -49,7 +49,7 @@
             </div>
 
             <div class="field">
-              <%= f.password_field :password, help_text: t(".password_help", minimun_characters: NOBSPW.configuration.min_password_length), autocomplete: "off" %>
+              <%= f.password_field :password, help_text: t(".password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH), autocomplete: "off" %>
             </div>
 
             <div class="field">

data/app/views/decidim/devise/shared/_omniauth_buttons_mini.html.erb

@@ -1,21 +1,23 @@
 <% if Devise.mappings[:user].omniauthable? && current_organization.enabled_omniauth_providers.any? %>
   <div class="row">
     <div class="columns medium-8 medium-centered">
-      <span class="register__separator">
-        <span class="register__separator__text"><%= t("or", scope: "decidim.devise.shared.omniauth_buttons") %></span>
-      </span>
       <div class="text-center">
         <%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
+        <div class="social-register">
           <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)} button--social--mini", method: :post do %>
             <span class="button--social__icon" aria-hidden="true">
               <%= oauth_icon provider %>
             </span>
-            <span class="show-for-sr">
+            <span class="button--social__text">
               <%= t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) %>
             </span>
           <% end %>
+        </div>
         <% end %>
       </div>
+      <span class="register__separator">
+        <span class="register__separator__text"><%= t("or", scope: "decidim.devise.shared.omniauth_buttons") %></span>
+      </span>
     </div>
   </div>
 <% end %>

data/app/views/decidim/messaging/conversations/_conversation.html.erb

@@ -14,10 +14,16 @@
     </li>
     <li class="card-data__item card--list__item card-data__item--expand absolutes">
       <div class="mr-s">
+        <% if conversation.messages.last.decidim_sender_id == current_user.id %>
+          <%= t("to", scope: "decidim.messaging.conversations.index") %>:
+        <% else %>
+          <%= t("from", scope: "decidim.messaging.conversations.index") %>:
+        <% end %>
+
         <% if conversation.interlocutors(current_user).count == 1 %>
-          <%= t("from", scope: "decidim.messaging.conversations.index") %>: <strong><%= conversation.interlocutors(current_user).first.name %> <span class="muted">@<%= conversation.interlocutors(current_user).first.nickname %></span></strong>
+          <%= conversation_name_for(conversation.interlocutors(current_user)) %>
         <% else %>
-          <%= t("from", scope: "decidim.messaging.conversations.index") %>: <strong><%= username_list(conversation.interlocutors(current_user), shorten: true) %></strong>
+          <strong><%= username_list(conversation.interlocutors(current_user), shorten: true).html_safe %></strong>
         <% end %>
         <br>
         <span class="muted">
@@ -45,7 +51,7 @@
           <% if conversation.interlocutors(current_user).count == 1 %>
             <%= icon "chevron-right", class: "card__link icon--big", role: "img", aria_label: t(".show", sender: conversation.interlocutors(current_user).first.name) %>
           <% else %>
-            <%= icon "chevron-right", class: "card__link icon--big", role: "img", aria_label: t(".show", sender: username_list(conversation.interlocutors(current_user))) %>
+            <%= icon "chevron-right", class: "card__link icon--big", role: "img", aria_label: t(".show", sender: strip_tags(username_list(conversation.interlocutors(current_user)))) %>
           <% end %>
         <% end %>
       </div>

data/app/views/decidim/messaging/conversations/_messages.html.erb

@@ -1,6 +1,12 @@
 <div class="conversation-chat<%= " conversation-chat--offset" if sender_is_user?(sender) %>">
-  <%= link_to profile_path(sender.nickname) do %>
-    <%= image_tag present(sender).avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(sender.name)) %>
+  <% if sender.deleted? %>
+    <span class="label label--small label--basic">
+      <%= t("deleted", scope: "decidim.profile") %>
+    </span>
+  <% else %>
+    <%= link_to profile_path(sender.nickname) do %>
+      <%= image_tag present(sender).avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(sender.name)) %>
+    <% end %>
   <% end %>
   <div>
     <% messages.each do |message| %>

data/app/views/decidim/messaging/conversations/_show.html.erb

@@ -1,12 +1,6 @@
-<% if participants.count == 1 %>
-  <% conversation_label = t(".chat_with") + " #{participants.first.name} (@#{participants.first.nickname})" %>
-<% else %>
-  <% conversation_label = t(".title", usernames: username_list(participants)) %>
-<% end %>
-
 <div class="wrapper">
   <div class="row">
-    <div class="columns medium-9 medium-centered tabs-panel is-active" id="conversations" role="tabpanel" aria-label="<%= conversation_label %>">
+    <div class="columns medium-9 medium-centered tabs-panel is-active" id="conversations" role="tabpanel" aria-label="<%= strip_tags(conversation_label_for(participants)) %>">
       <div class="conversation">
 
         <div class="conversation-header flex--cc absolutes">
@@ -15,20 +9,24 @@
               <%= icon "chevron-left", role: "img", aria_label: t(".back") %>
             <% end %>
           </div>
+
           <% if participants.count == 1 %>
-            <%= link_to profile_path(participants.first.nickname) do %>
-              <%= image_tag present(participants.first).avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(participants.first.name)) %>
+            <% if participants.first.deleted? %>
+              <%= image_tag present(participants.first).avatar_url, alt: t("decidim.author.avatar", name: t("decidim.profile.deleted")) %>
+            <% else %>
+              <%= link_to profile_path(participants.first.nickname) do %>
+                <%= image_tag present(participants.first).avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(participants.first.name)) %>
+              <% end %>
             <% end %>
           <% else %>
             <%= image_tag present(current_user).avatar.default_multiuser_url, alt: t("decidim.author.avatar_multiuser") %>
           <% end %>
-
           <div class="ml-s">
             <h1>
               <% if participants.count == 1 %>
-                <%= t(".chat_with") %> <strong><%= participants.first.name %></strong><br><span class="muted">@<%= participants.first.nickname %></span>
+                <%= t(".chat_with") %> <%= conversation_name_for(participants) %>
               <% else %>
-                <%= t(".title", usernames: username_list(participants)) %>
+                <%= t(".title", usernames: username_list(participants)).html_safe %>
               <% end %>
             </h1>
           </div>

data/app/views/decidim/messaging/conversations/show.html.erb

@@ -5,9 +5,11 @@
     <% end %>
   </div>
 
-  <% if conversation.accept_user?(current_user) %>
+  <% if conversation.with_deleted_users?(current_user) %>
+    <div class="callout warning margin-top-2"><%= t ".deleted_accounts" %></div>
+  <% elsif conversation.accept_user?(current_user) %>
     <%= render "reply", form: @form, conversation: conversation %>
   <% else %>
-    <em><%= t ".not_allowed" %></em>
+    <div class="callout warning margin-top-2"><%= t ".not_allowed" %></div>
   <% end %>
 <% end %>

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

@@ -5,7 +5,7 @@
   newsletter: newsletter,
   recipient_user: @user
 ) %>
-<%= decidim_sanitize @cell.to_s %>
+<%= decidim_sanitize_editor @cell.to_s %>
 
 <% content_for :note do %>
   <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>

data/app/views/decidim/notification_mailer/event_received.html.erb

@@ -9,6 +9,10 @@
 <% end %>
 
 <% if @event_instance.try(:safe_resource_text).present? %>
+  <% if @event_instance.perform_translation? %>
+    <p style="font-weight: bold"><%= t(".original_text") %></p>
+  <% end %>
+
   <blockquote>
     <p>
       <%= @event_instance.safe_resource_text %>
@@ -16,6 +20,19 @@
   </blockquote>
 <% end %>
 
+<% if @event_instance.content_in_same_language? %>
+  <p><%= t(".same_language", language: I18n.locale.to_s ) %></p>
+<% elsif @event_instance.translation_missing? %>
+  <p><%= t(".no_translation_available", link: @event_instance.resource_url ) %></p>
+<% elsif @event_instance.perform_translation? %>
+  <p style="font-weight: bold"><%= t(".translated_text") %></p>
+  <blockquote>
+    <p>
+      <%= @event_instance.safe_resource_translated_text %>
+    </p>
+  </blockquote>
+<% end %>
+
 <% if @event_instance.has_button? %>
   <table class="button expanded radius">
     <tr>

data/app/views/decidim/pages/_tabbed.html.erb

@@ -32,7 +32,7 @@
                 <h2>
                   <%= translated_attribute page.title %>
                 </h2>
-                <%= decidim_sanitize translated_attribute page.content %>
+                <%= decidim_sanitize_editor translated_attribute page.content %>
               </div>
             </div>
           </div>

data/app/views/decidim/searches/_filters_small_view.html.erb

@@ -1,13 +1,13 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t ".filter" %>
     <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <h3 id="filter-box-label" class="reveal__title"><%= t ".filter_by" %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

data/app/views/decidim/shared/_login_modal.html.erb

@@ -1,12 +1,15 @@
-<div class="reveal" id="loginModal" data-reveal>
+<div class="reveal" id="loginModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="loginModal-label">
   <div class="reveal__header">
-    <h2 class="reveal__title"><%= t(".please_sign_in") %></h2>
+    <h2 id="loginModal-label" class="reveal__title"><%= t(".please_sign_in") %></h2>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <% if current_organization.sign_in_enabled? %>
+    <% cache current_organization do %>
+      <%= render "decidim/devise/shared/omniauth_buttons_mini" %>
+    <% end %>
     <div class="row">
       <div class="columns medium-8 medium-centered">
           <%
@@ -39,9 +42,6 @@
           </p>
       </div>
     </div>
-    <% cache current_organization do %>
-      <%= render "decidim/devise/shared/omniauth_buttons_mini" %>
-    <% end %>
   <% else %>
     <div class="row">
       <div class="columns medium-8 medium-centered">

data/app/views/decidim/shared/_orders.html.erb

@@ -9,7 +9,7 @@
       data-close-on-click="true"
       role="menubar">
       <li class="is-dropdown-submenu-parent" role="presentation">
-        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="true" title="<%= t("#{i18n_scope}.label") %>" role="menuitem"><%= t("#{i18n_scope}.#{order}") %></a>
+        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="menu" title="<%= t("#{i18n_scope}.label") %>" role="menuitem"><%= t("#{i18n_scope}.#{order}") %></a>
 
         <ul id="<%= menu_id %>" class="menu" role="menu" aria-labelledby="<%= menu_id %>-control">
           <% orders.each do |order_name| %>

data/app/views/decidim/shared/_results_per_page.html.erb

@@ -9,7 +9,7 @@
       data-close-on-click="true"
       role="menubar">
       <li class="is-dropdown-submenu-parent" role="presentation">
-        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="true" title="<%= t("decidim.shared.results_per_page.title") %>" role="menuitem"><%= per_page %></a>
+        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="menu" title="<%= t("decidim.shared.results_per_page.title") %>" role="menuitem"><%= per_page %></a>
         <ul id="<%= menu_id %>" class="menu" role="menu" aria-labelledby="<%= menu_id %>-control">
           <% Decidim::Paginable::OPTIONS.each do |per_page_option| %>
             <li role="presentation">

data/app/views/decidim/shared/participatory_space_filters/_filters_small_view.html.erb

@@ -1,13 +1,13 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t("filter", scope: "decidim.searches.filters_small_view") %>
     <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t("unfold", scope: "decidim.searches.filters_small_view"), role: "img" %>
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t("filter_by", scope: "decidim.searches.filters_small_view") %>:</h3>
+    <h3 id="filter-box-label" class="reveal__title"><%= t("filter_by", scope: "decidim.searches.filters_small_view") %>:</h3>
     <button class="close-button" data-close aria-label="<%= 't("close_modal", scope: "decidim.searches.filters_small_view")' %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

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

@@ -1,15 +1,4 @@
-<% add_decidim_meta_tags({
-  description: strip_tags(translated_attribute(current_organization.description)),
-  title: current_organization.name,
-  url: request.original_url,
-  twitter_handler: current_organization.twitter_handler,
-  image_url: Decidim::ContentBlock.published.find_by(
-    organization: current_organization,
-    scope_name: :homepage,
-    manifest_name: :hero
-  ).try(:images_container).try(:attached_uploader, :background_image).try(:path)
-}) %>
-
+<%= render partial: "layouts/decidim/meta_tags_config" %>
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>" class="no-js">
   <head>

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

@@ -17,6 +17,10 @@
 <meta property="og:description" content="<%= decidim_meta_description %>">
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
+<% if current_organization.colors["theme"] %>
+  <meta name="theme-color" content="<%= current_organization.colors["theme"] %>">
+<% end %>
+
 <%= favicon %>
 <%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>

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

@@ -7,7 +7,7 @@
       data-close-on-click="true"
       role="menubar">
       <li class="is-dropdown-submenu-parent" role="presentation">
-        <%= link_to t("name", scope: "locale"), "#language-chooser-menu", id: "language-chooser-control", "aria-label": t("layouts.decidim.language_chooser.choose_language"), "aria-controls": "language-chooser-menu", "aria-haspopup": "true", role: "menuitem" %>
+        <%= link_to t("name", scope: "locale"), "#language-chooser-menu", id: "language-chooser-control", "aria-label": t("layouts.decidim.language_chooser.choose_language"), "aria-controls": "language-chooser-menu", "aria-haspopup": "menu", role: "menuitem" %>
         <ul class="menu is-dropdown-submenu" id="language-chooser-menu" role="menu" aria-labelledby="language-chooser-control">
           <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
             <li lang="<%= locale %>" role="presentation"><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post, role: "menuitem" %></li>

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

@@ -0,0 +1,11 @@
+<% add_decidim_meta_tags({
+  description: strip_tags(translated_attribute(current_organization.description)),
+  title: current_organization.name,
+  url: request.original_url,
+  twitter_handler: current_organization.twitter_handler,
+  image_url: Decidim::ContentBlock.published.find_by(
+    organization: current_organization,
+    scope_name: :homepage,
+    manifest_name: :hero
+  ).try(:images_container).try(:attached_uploader, :background_image).try(:path)
+}) %>

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

@@ -66,7 +66,7 @@ end
                     data-close-on-click="true"
                     role="menubar">
                     <li class="is-dropdown-submenu-parent show-for-medium" role="presentation">
-                      <%= link_to current_user.name, decidim.account_path, id: "user-menu-control", "aria-controls": "user-menu", "aria-haspopup": "true", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name), "role": "menuitem" %>
+                      <%= link_to current_user.name, decidim.account_path, id: "user-menu-control", "aria-controls": "user-menu", "aria-haspopup": "menu", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name), "role": "menuitem" %>
                       <ul class="menu is-dropdown-submenu" id="user-menu" role="menu" aria-labelledby="user-menu-control">
                         <%= render partial: "layouts/decidim/user_menu" %>
                       </ul>