decidim-core 0.28.5 → 0.29.0.rc1

data/app/views/decidim/reported_mailer/report.html.erb

@@ -13,7 +13,7 @@
 <p><%= link_to translated_attribute(@participatory_space.title), resource_locator(@participatory_space).url %></p>
 
 <p><b><%= t(".reason") %></b></p>
-<p><%= t(@report.reason, organization_name: @participatory_space.organization.name, scope: "decidim.shared.flag_modal") %></p>
+<p><%= t(@report.reason, organization_name: organization_name(@participatory_space.organization), scope: "decidim.shared.flag_modal") %></p>
 
 <% if @report.details.present? %>
   <p><b><%= t(".details") %></b></p>
@@ -37,7 +37,9 @@
   <% else %>
     <p>
       <%=
-        if @author.respond_to?(:name)
+        if @author.is_a?(Decidim::Organization)
+          organization_name(@author)
+        elsif @author.respond_to?(:name)
           @author.name
         elsif @author.respond_to?(:title)
           translated_attribute(@author.title)

data/app/views/decidim/scopes/picker.html.erb

@@ -1,4 +1,4 @@
-  <div class="scope-picker picker-header picker-list">
+  <div class="picker-header" data-scope-picker>
     <h6 id="data_picker-title" class="h2"><%= title %></h6>
     <button class="close-button" data-close type="button" data-reveal-id="data_picker-modal"><span aria-hidden="true">×</span></button>
     <div>
@@ -21,8 +21,8 @@
     </div>
   </div>
 
-  <div class="scope-picker picker-content picker-list">
-    <div class="picker-scrollable-content">
+  <div data-scope-picker data-content>
+    <div>
       <% if scopes&.any? %>
         <ul role="group" aria-label="<%= t("decidim.scopes.picker.change") %>">
           <% scopes.each do |scope| %>
@@ -37,8 +37,8 @@
     </div>
   </div>
 
-  <div class="scope-picker picker-footer reveal__footer">
-    <div class="buttons button--double">
+  <div class="picker-footer" data-scope-picker>
+    <div>
       <% if current || !required %>
         <a class="button button__sm md:button__lg button__transparent-secondary" role="button" href="<%= scopes_picker_path(current: current&.id, **context) %>" aria-controls="<%= picker_target_id %>" data-picker-value="<%= current&.id || global_value %>" data-picker-text="<%= scope_name_for_picker(current, t("decidim.scopes.global")) %>" data-picker-choose>
           <%= t("decidim.scopes.picker.choose") %>

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

@@ -1,17 +1,17 @@
 <% resources = @sections.select { |type, _results| types.include?(type) } %>
-<div class="card card--secondary">
-  <div class="filters">
+<div class="card">
+  <div>
     <% resources.each do |type, results| %>
     <div class="filters__section--general<%= " no-results" if results[:count].zero? %>">
       <% if results[:count].positive? %>
         <%= link_to search_path_by_resource_type(type) do %>
-          <strong class="section-title"><%= searchable_resource_human_name(type) %></strong>
-          <span class="muted">&nbsp;<%= results[:count] %></span>
+          <strong><%= searchable_resource_human_name(type) %></strong>
+          <span>&nbsp;<%= results[:count] %></span>
         <% end %>
       <% else %>
         <div>
-          <strong class="section-title"><%= searchable_resource_human_name(type) %></strong>
-          <span class="muted">&nbsp;<%= results[:count] %></span>
+          <strong><%= searchable_resource_human_name(type) %></strong>
+          <span>&nbsp;<%= results[:count] %></span>
         </div>
       <% end %>
     </div>

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

@@ -1,17 +1,17 @@
 <div class="row expanded">
-  <div class="process-nav">
+  <div>
     <div class="row">
-      <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
+      <button data-toggle="process-nav-content">
         <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t("decidim.shared.extended_navigation_bar.unfold"), role: "img" %>
         <% default_item = active_item || items.first %>
-        <span class="process-nav__link">
+        <span>
           <%= default_item[:name] %>
         </span>
       </button>
-      <div class="row column process-nav__content <%= browser.mobile? ? "is-active" : "" %>" id="process-nav-content" data-toggler=".is-active">
+      <div class="row column <%= browser.mobile? ? "is-active" : "" %>" id="process-nav-content" data-toggler=".is-active">
         <ul>
           <% items.each_with_index do |item, index| %>
-            <li class="<%= "is-active" if item[:active] %> <%= "hide-for-medium" if index > max_items %>">
+            <li class="<%= "is-active" if item[:active] %>">
               <%= link_to item[:url], class: "process-nav__link #{item[:active] ? "active" : nil}" do %>
                 <%= item[:name] %>
               <% end %>
@@ -20,17 +20,17 @@
         </ul>
 
         <% if extra_items.any? %>
-          <button class="button tiny process-nav__more show-for-medium" data-toggle="process-nav__hide-content">
+          <button class="button" data-toggle="process-nav__hide-content">
             <%= t("decidim.shared.extended_navigation_bar.more") %> <i></i><i></i><i></i>
           </button>
-          <div class="dropdown-pane process-nav__hidden-content" id="process-nav__hide-content"
+          <div class="dropdown-pane" id="process-nav__hide-content"
               data-dropdown
               data-hover="true"
               data-hover-pane="true"
               data-v-offset="-25"
               data-position="bottom"
               data-alignment="right">
-            <div class="process-nav__hidden-content__more">
+            <div>
               <%= t("decidim.shared.extended_navigation_bar.more") %> <i></i><i></i><i></i>
             </div>
             <ul>

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

@@ -4,7 +4,7 @@
 <% if filter_sections.present? || local_assigns.has_key?(:search_variable) %>
   <%= filter_form_for filter, url_for, class: "new_filter self-stretch", data: { filters: "", component: "accordion" } do |form| %>
 
-    <button id="dropdown-trigger-filters" data-component="dropdown" data-target="dropdown-menu-filters" data-open-md="true">
+    <button id="dropdown-trigger-filters" data-component="dropdown" data-target="dropdown-menu-filters">
       <%= icon "arrow-down-s-line" %>
       <%= icon "arrow-up-s-line" %>
       <span>
@@ -12,14 +12,14 @@
       </span>
     </button>
 
-    <div id="dropdown-menu-filters">
+    <div id="dropdown-menu-filters" aria-hidden="true">
       <% if local_assigns.has_key?(:skip_to_id) %>
-        <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip", role: "menuitem" %>
+        <%= link_to t("skip", scope: "decidim.shared.filter_form_help"), "##{skip_to_id}", class: "filter-skip" %>
       <% end %>
-      <p class="filter-help" role="menuitem" aria-disabled="true"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
+      <p class="filter-help"><%= t("help", scope: "decidim.shared.filter_form_help") %></p>
 
       <% if local_assigns.has_key?(:search_variable) %>
-        <div class="filter-search filter-container" role="menuitem">
+        <div class="filter-search filter-container">
           <%= form.search_field search_variable,
                                 label: false,
                                 placeholder: search_label,

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

@@ -10,7 +10,7 @@
 
   <%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: nil }) do |f| %>
     <div data-dialog-container>
-      <%= icon "login-box-line", class: "w-6 h-6 text-gray fill-current" %>
+      <%= icon "user-line", class: "w-6 h-6 text-gray fill-current" %>
       <h3 id="dialog-title-loginModal" class="h3"><%= t(".please_log_in") %></h3>
       <div>
         <% if current_organization.sign_in_enabled? %>

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

@@ -1,14 +1,13 @@
-<button class="order-by__button" id="dropdown-trigger-order" data-component="dropdown" data-target="dropdown-menu-order" data-open-md="true">
+<button class="order-by__button" id="dropdown-trigger-order" data-component="dropdown" data-target="dropdown-menu-order" data-open="false">
   <%= icon "arrow-down-s-line" %>
   <%= icon "arrow-up-s-line" %>
   <span><%= t("#{i18n_scope}.label") %></span>
 </button>
-<div id="dropdown-menu-order" class="order-by">
+<div id="dropdown-menu-order" class="order-by" aria-hidden="true">
   <% orders.each do |order_name| %>
     <%= order_link order_name,
                    i18n_scope:,
                    title: t("#{i18n_scope}.label"),
-                   role: :menuitem,
                    class: "button button__sm button__text-secondary #{order_name == order ? "underline font-bold" : "font-normal"}" %>
   <% end %>
 </div>

data/app/views/decidim/shared/filters/_check_boxes_tree.html.erb

@@ -1,4 +1,4 @@
-<div class="filter-container" role="menuitem">
+<div class="filter-container">
   <button id="trigger-menu-<%= id %>" data-controls="panel-dropdown-menu-<%= id %>" data-open="false" data-open-md="true">
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>

data/app/views/decidim/shared/filters/_collection.html.erb

@@ -1,4 +1,4 @@
-<div class="filter-container" role="menuitem">
+<div class="filter-container">
   <button id="trigger-menu-<%= id %>" data-controls="panel-dropdown-menu-<%= id %>" data-open="false" data-open-md="true">
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>

data/app/views/decidim/user_interests/_areas.html.erb

@@ -1,10 +1,10 @@
 <ul>
   <% areas.each do |area| %>
-    <li class="switch tiny switch-with-label">
+    <li>
       <%= f.fields_for "areas[]", area do |form| %>
         <%= form.label "checked" do %>
           <%= form.check_box "checked", label: false, class: "switch-input" %>
-          <span class="switch-paddle"></span>
+          <span></span>
           <span class="switch-label"><%= translated_attribute area.name %></span>
         <% end %>
         <%= form.hidden_field "id", value: area.id %>

data/app/views/decidim/user_report_mailer/notify.html.erb

@@ -2,7 +2,7 @@
 
 <p class="email-instructions"><%= t ".body_1", user: h(@report.moderation.user.name), token: h(@report.user.name) %></p>
 
-<p class="email-instructions"><%= t ".body_2", reason: t(@report.reason, organization_name: @report.moderation.user.organization.name, scope: "decidim.shared.flag_user_modal") %></p>
+<p class="email-instructions"><%= t ".body_2", reason: t(@report.reason, organization_name: organization_name(@report.moderation.user.organization), scope: "decidim.shared.flag_user_modal") %></p>
 
 <% if @report.details.present? %>
   <p class="email-instructions"><%= t(".details") %></p>
@@ -11,4 +11,4 @@
   </blockquote>
 <% end %>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@report.moderation.user.organization.name), organization_url: decidim.root_url(host: @report.moderation.user.organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@report.moderation.user.organization), organization_url: decidim.root_url(host: @report.moderation.user.organization.host)).html_safe %></p>

data/app/views/decidim/user_update_mailer/notify.html.erb

@@ -6,4 +6,4 @@
 
 <p class="email-instructions"><%= t ".body_2" %></p>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/app/views/decidim/widgets/_data_picker.html.erb

@@ -1,6 +1,6 @@
 <div id="<%= picker_options[:id] %>" class="data-picker <%= picker_options[:class] %>" data-picker-name="<%= picker_options[:name] %>">
   <div class="picker-values"><% items.each do |item, params| %>
-    <div><a href="<%= params[:url] %>" class="label primary" data-picker-value="<%= item.id %>"><span aria-hidden="true">×</span> <%= params[:text] %></a></div>
+    <div><a href="<%= params[:url] %>" class="label" data-picker-value="<%= item.id %>"><span aria-hidden="true">×</span> <%= params[:text] %></a></div>
   <% end %></div>
   <div class="picker-prompt"><a href="<%= prompt_params[:url] %>"><%= prompt_params[:text] %></a></div>
 </div>

data/app/views/devise/mailer/invitation_instructions.html.erb

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
 
 <p class="email-instructions">
-  <%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+  <%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
 </p>
 
 <p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim.root_path, host: @resource.organization.host) %></p>

data/app/views/devise/mailer/invitation_instructions.text.erb

@@ -1,6 +1,6 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
-<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim.root_path, host: @resource.organization.host) %>
 

data/app/views/devise/mailer/invite_admin.html.erb

@@ -2,9 +2,9 @@
 
 <p class="email-instructions">
   <% if @resource.invited_by.present? %>
-    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/invite_admin.text.erb

@@ -1,9 +1,9 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
 <% if @resource.invited_by.present? %>
-<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>

data/app/views/devise/mailer/invite_collaborator.html.erb

@@ -2,9 +2,9 @@
 
 <p class="email-instructions">
   <% if @resource.invited_by.present? %>
-    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/invite_collaborator.text.erb

@@ -1,9 +1,9 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
 <% if @resource.invited_by.present? %>
-<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>

data/app/views/devise/mailer/invite_private_user.html.erb

@@ -2,9 +2,9 @@
 
 <p class="email-instructions">
   <% if @resource.invited_by.present? %>
-    <%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
   <% else %>
-    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: @resource.organization.name) %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
   <% end %>
 </p>
 

data/app/views/devise/mailer/invite_private_user.text.erb

@@ -1,9 +1,9 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
 <% if @resource.invited_by.present? %>
-<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
 <% else %>
-<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
 <% end %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %>

data/app/views/devise/mailer/organization_admin_invitation_instructions.html.erb

@@ -1,6 +1,6 @@
 <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
 
-<p class="email-instructions"><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %></p>
+<p class="email-instructions"><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %></p>
 
 <p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %></p>
 

data/app/views/devise/mailer/organization_admin_invitation_instructions.text.erb

@@ -1,6 +1,6 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %>
 
-<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>
 

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

@@ -1,19 +1,15 @@
 <%= render partial: "layouts/decidim/meta_tags_config" %>
 <!DOCTYPE html>
-<html lang="<%= I18n.locale %>" class="no-js">
+<html lang="<%= I18n.locale %>" dir="<%= rtl_direction %>" class="no-js">
   <head>
     <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/head" %>
   </head>
 
-  <body class="text-black text-md form-defaults">
+  <body class="text-black text-md form-defaults<%= yield (:body_class) %>">
     <!--noindex--><!--googleoff: all-->
     <%= link_to t("skip_button", scope: "decidim.accessibility"), "#content", class: "layout-container__skip" %>
     <%= cell("decidim/data_consent", current_organization) %>
-    <%= render partial: "layouts/decidim/impersonation_warning" %>
-    <%= render partial: "layouts/decidim/omnipresent_banner" %>
-    <%= render partial: "layouts/decidim/timeout_modal" %>
-    <%= render partial: "layouts/decidim/offline_banner" %>
     <!--googleon: all--><!--/noindex-->
 
     <%= render "layouts/decidim/wrapper" do %>
@@ -22,6 +18,7 @@
       <%= yield %>
     <% end %>
 
+    <%= render partial: "layouts/decidim/timeout_modal" %>
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "decidim/shared/login_modal" unless current_user %>
     <%= render partial: "decidim/shared/authorization_modal" %>

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

@@ -1,8 +1,8 @@
-<div hidden class="dataconsent-warning padding-1 hide">
+<div hidden data-dataconsent-warning class="hide">
   <p>
   <%= t("layouts.decidim.data_consent.warning.consent_required", categories: t("layouts.decidim.data_consent.warning.all_categories")) %>
   </p>
-  <a href="#" class="button margin-vertical-2" data-dialog-open="dc-modal">
+  <a href="#" class="button" data-dialog-open="dc-modal">
     <%= t("change_settings", scope: "layouts.decidim.data_consent.warning") %>
   </a>
 </div>

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

@@ -1,4 +1,4 @@
-<%# NOTE: for performance reasons defer this javacript call would be good, although there are references to jquery that need to be reviewed %>
+<%# NOTE: for performance reasons defer this javascript call would be good, although there are references to jquery that need to be reviewed %>
 
 <% if Decidim.service_worker_enabled %>
   <%= javascript_pack_tag "decidim_core","decidim_sw", defer: false %>

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

@@ -2,7 +2,7 @@
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <% available_locales.each do |locale| %>
-  <link rel="alternate" href="<%= current_url(request.parameters.merge(locale:)) %>" hreflang="<%= locale %>">
+  <link rel="alternate" href="<%= url_for(request.parameters.merge(locale:)) %>" hreflang="<%= locale %>">
 <% end %>
 
 <meta name="twitter:card" content="summary_large_image">

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

@@ -1,8 +1,8 @@
 <%#
-This file is meant to be overriden by the app developers in order to
+This file is meant to be overridden by the app developers in order to
 include extra headers like tracking, error handling and such.
 
-Note that thie code you add here will be run for all organizations in
+Note that the code you add here will be run for all organizations in
 your instance of Decidim. If you want to add code for a specific
 organization, add it to the organization's `header_snippets` field,
 which can be modified at the organization admin section.

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

@@ -1,5 +1,5 @@
 <% if current_user_impersonated? %>
-  <div class="impersonation-warning flash warning my-0 flex justify-center text-center" data-session-ends-at="<%= impersonation_session_ends_at.iso8601 %>">
+  <div data-impersonation-warning class="flash warning my-0 flex justify-center text-center" data-session-ends-at="<%= impersonation_session_ends_at.iso8601 %>">
     <div class="flash__message">
       <%= t(".description_html", user_name: current_user.name) %>
       <%= t(".expire_time_html", minutes: impersonation_session_remaining_duration_in_minutes) %>

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

@@ -8,9 +8,14 @@ js_configs = {
       "removeRecipient": t("decidim.shared.mentions_modal.remove_recipient", name: "%name%")
     },
     emojis: I18n.t("emojis").deep_transform_keys { |k| k.to_s.camelize(:lower) },
-    editor: I18n.t("editor")
+    editor: I18n.t("editor"),
+    date: I18n.t("date"),
+    time: I18n.t("time")
   },
-  external_domain_whitelist: [current_organization.host] + current_organization.external_domain_whitelist,
+  notifications: {
+    action_error: I18n.t("decidim.notifications.action_error")
+  },
+  external_domain_allowlist: [current_organization.host] + current_organization.external_domain_allowlist,
   consent_cookie_name: Decidim.consent_cookie_name,
   sign_out_path: decidim.destroy_user_session_path
 }

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

@@ -1,9 +1,9 @@
 <% if organization %>
   <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
     <% if organization.logo.attached? %>
-      <%= image_tag organization.attached_uploader(:logo).variant_url(:medium), alt: t("logo", scope: "decidim.accessibility", organization: organization.name) %>
+      <%= image_tag organization.attached_uploader(:logo).variant_path(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
     <% else %>
-      <span><%= organization.name %></span>
+      <span><%= current_organization_name %></span>
     <% end %>
   <% end %>
 <% else %>

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

@@ -0,0 +1,11 @@
+<% if organization %>
+  <%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
+    <% if organization.favicon.attached? %>
+      <%= image_tag organization.attached_uploader(:favicon).variant_path(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
+    <% else %>
+      <span><%= current_organization_name %></span>
+    <% end %>
+  <% end %>
+<% else %>
+  <%= Decidim.application_name %>
+<% end %>

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

@@ -9,10 +9,10 @@
       <%= image_tag(
             organization.attached_uploader(:logo).variant_url(:medium, host: organization.host),
             style: "max-height: 50px",
-            alt: "#{organization.name}"
+            alt: organization_name(organization)
           ) %>
     <% else %>
-      <span><%= organization.name %></span>
+      <span><%= organization_name(organization) %></span>
     <% end %>
   <% end %>
 <% else %>

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

@@ -1,6 +1,6 @@
 <% add_decidim_meta_tags({
                            description: strip_tags(translated_attribute(current_organization.description)),
-                           title: current_organization.name,
+                           title: current_organization_name,
                            url: request.original_url,
                            twitter_handler: current_organization.twitter_handler,
                            image_url: Decidim::ContentBlock.published.find_by(

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

@@ -11,15 +11,22 @@ end
 %>
 
 <div class="layout-container">
-  <header>
-    <%= render partial: "layouts/decidim/admin_links" if current_user && allowed_to?(:read, :admin_dashboard) %>
-    <%= render partial: "layouts/decidim/header/main" %>
-    <% if display_flash_messages.present? %>
-      <div class="container">
-        <%= display_flash_messages %>
-      </div>
-    <% end %>
-    <%= render partial: "layouts/decidim/header/menu" unless controller_name == "homepage" %>
+  <header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %>>
+    <div id="sticky-header-container" data-sticky-header>
+      <%= render partial: "layouts/decidim/impersonation_warning" %>
+      <%= render partial: "layouts/decidim/omnipresent_banner" %>
+      <%= render partial: "layouts/decidim/offline_banner" %>
+      <%= render partial: "layouts/decidim/admin_links" if current_user && allowed_to?(:read, :admin_dashboard) %>
+      <%= render partial: "layouts/decidim/header/main" %>
+    </div>
+    <div id="menu-bar-container">
+      <% if display_flash_messages.present? %>
+        <div id="flash-messages-container" class="container">
+          <%= display_flash_messages %>
+        </div>
+      <% end %>
+      <%= render partial: "layouts/decidim/header/menu" unless controller_name == "homepage" %>
+    </div>
   </header>
 
   <div id="content" data-content>

data/app/views/layouts/decidim/footer/_main.html.erb

@@ -3,16 +3,15 @@
     <div class="lg:w-1/3">
       <%= render partial: "layouts/decidim/footer/main_intro" %>
     </div>
-    <div class="lg:w-2/3 grid grid-cols-1 gap-x-4 gap-y-10 lg:grid-cols-4 text-md text-white">
+    <div class="lg:w-2/3 grid grid-cols-1 gap-x-44 gap-y-10 lg:grid-cols-4 text-md text-white">
       <%= render partial: "layouts/decidim/footer/main_links" %>
     </div>
-    <%= cell("decidim/footer_pages", :topics) %>
   </div>
   <div class="main-footer__down">
     <nav class="md:w-1/2 lg:w-auto" role="navigation" aria-label="Legal">
       <%= render partial: "layouts/decidim/footer/main_legal" %>
     </nav>
-    <nav class="max-w-fit w-full md:w-auto md:ml-auto" role="navigation" aria-label="Social media">
+    <nav class="w-full md:w-auto md:ml-auto" role="navigation" aria-label="Social media">
       <%= render partial: "layouts/decidim/footer/main_social_media_links" %>
     </nav>
     <%= render partial: "layouts/decidim/footer/main_language_chooser" %>

data/app/views/layouts/decidim/footer/_main_intro.html.erb

@@ -1,9 +1,9 @@
 <% if current_organization.official_img_footer.attached? %>
   <%= link_to current_organization.official_url, class: "block mb-6" do %>
-    <%= image_tag current_organization.attached_uploader(:official_img_footer).url, alt: current_organization.name, class: "max-h-16" %>
+    <%= image_tag current_organization.attached_uploader(:official_img_footer).path, alt: current_organization_name, class: "max-h-16" %>
   <% end %>
 <% end %>
 <div class="text-sm text-white prose">
-  <p><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization.name) %></p>
+  <p><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization_name) %></p>
   <p><%= organization_description_label %></p>
 </div>

data/app/views/layouts/decidim/footer/_main_legal.html.erb

@@ -1,7 +1,6 @@
-<ul class="flex flex-col md:flex-row gap-10 text-sm text-white [&_a]:underline">
-  <%= cell("decidim/footer_pages", :pages) %>
+<ul class="flex flex-col gap-6 md:flex-row md:gap-10 text-sm text-white [&_a]:underline">
   <li>
-    <%= link_to t("layouts.decidim.footer.terms_and_conditions"), decidim.page_path("terms-and-conditions") %>
+    <%= link_to t("layouts.decidim.footer.terms_of_service"), decidim.page_path("terms-of-service") %>
   </li>
   <li>
     <a href="#" data-dialog-open="dc-modal"><%= t("layouts.decidim.footer.data_consent_settings") %></a>