decidim-core 0.28.1 → 0.29.0.rc1

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

@@ -1,6 +1,6 @@
-<div class="reveal" id="messageErrorModal" data-reveal>
-  <div class="reveal__header">
-    <h2 class="reveal__title"><%= error %></h2>
+<div id="messageErrorModal" data-reveal>
+  <div>
+    <h2><%= error %></h2>
     <button class="close-button" data-close aria-label="<%= t(".close") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
@@ -13,8 +13,8 @@
     </p>
     <p><%= t(".correct_errors") %></p>
   </div>
-  <div class="reveal__footer">
-    <div class="buttons button--double">
+  <div>
+    <div>
       <a class="button" role="button" href="#" data-close aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
     </div>
   </div>

data/app/views/decidim/messaging/conversations/create.js.erb

@@ -1,4 +1,4 @@
 $("#messages").append("<%= j(render "messages", sender: conversation.messages.first.sender, messages: [conversation.messages.first]).html_safe %>");
 $("div[data-add-message]").replaceWith("<%= j(render "reply", form:, conversation:).html_safe %>");
-$("#new_message_").foundation();
+window.initFoundation($("#new_message_"));
 Decidim.addInputEmoji();

data/app/views/decidim/newsletter_mailer/newsletter.html.erb

@@ -1,7 +1,7 @@
 <%= decidim_sanitize_newsletter cell.to_s %>
 
 <% content_for :note do %>
-  <%== t ".note", organization_name: h(@organization.name), link: @newsletter.notifications_settings_url %>
+  <%== t ".note", organization_name: organization_name(@organization), link: @newsletter.notifications_settings_url %>
 <% end %>
 
 <% content_for :unsubscribe do %>

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

@@ -8,7 +8,7 @@
 <%= decidim_sanitize_newsletter @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) %>
+  <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: current_organization_name, link: decidim.notifications_settings_url(host: @organization.host) %>
 <% end %>
 
 <% if @user.present? %>

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

@@ -1,6 +1,6 @@
 <p class="email-greeting"><%= t ".hello" %></p>
 
-<p class="email-instructions"><%= t ".body_1", organization_name: h(@organization.name) %></p>
+<p class="email-instructions"><%= t ".body_1", organization_name: organization_name(@organization) %></p>
 
 <p class="email-instructions"><%= t ".body_2" %></p>
 
@@ -20,4 +20,4 @@
 
 <p class="email-instructions"><%= t ".body_3" %></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/notifications_settings/show.html.erb

@@ -12,7 +12,7 @@
           <label for="notifications_from_own_activity" class="toggle__switch-toggle">
             <span>
               <input
-                <%= %(checked="checked") if @notifications_settings.notifications_from_own_activity %>
+                <%== %(checked="checked") if @notifications_settings.notifications_from_own_activity %>
                 id="notifications_from_own_activity"
                 type="checkbox"
                 name="notifications_from_own_activity">
@@ -30,7 +30,7 @@
           <label for="notifications_from_followed" class="toggle__switch-toggle">
             <span>
               <input
-                <%= %(checked="checked") if @notifications_settings.notifications_from_followed %>
+                <%== %(checked="checked") if @notifications_settings.notifications_from_followed %>
                 id="notifications_from_followed"
                 type="checkbox"
                 name="notifications_from_followed">
@@ -62,7 +62,7 @@
         <label for="newsletter_notifications" class="toggle__switch-toggle">
           <span>
             <input
-              <%= %(checked="checked") if @notifications_settings.newsletter_notifications %>
+              <%== %(checked="checked") if @notifications_settings.newsletter_notifications %>
               id="newsletter_notifications"
               type="checkbox"
               name="newsletter_notifications">
@@ -84,7 +84,7 @@
         <label for="allow_public_contact" class="toggle__switch-toggle">
           <span>
             <input
-              <%= %(checked="checked") if @notifications_settings.allow_public_contact %>
+              <%== %(checked="checked") if @notifications_settings.allow_public_contact %>
               id="allow_public_contact"
               type="checkbox"
               name="allow_public_contact">
@@ -108,7 +108,7 @@
             <label for="email_on_moderations" class="toggle__switch-toggle">
               <span>
                 <input
-                  <%= %(checked="checked") if @notifications_settings.email_on_moderations %>
+                  <%== %(checked="checked") if @notifications_settings.email_on_moderations %>
                   id="email_on_moderations"
                   type="checkbox"
                   name="email_on_moderations">
@@ -156,7 +156,7 @@
             <label class="toggle__switch-toggle" for="allow_push_notifications">
               <span>
                 <input
-                  <%= %(checked="checked") if @notifications_settings.meet_push_notifications_requirements? %>
+                  <%== %(checked="checked") if @notifications_settings.meet_push_notifications_requirements? %>
                   id="allow_push_notifications"
                   type="checkbox"
                   name="allow_push_notifications">

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

@@ -11,14 +11,14 @@
 
   <div class="vertical-tabs">
     <nav>
-      <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-auto-close="true" data-disabled-md="true">
+      <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-auto-close="true">
         <span>
           <%= translated_attribute(page.title) %>
         </span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>
       </button>
-      <ul id="dropdown-menu-pages" class="vertical-tabs__list">
+      <ul id="dropdown-menu-pages" class="vertical-tabs__list" aria-hidden="true">
         <% pages.each do |sibling| %>
           <li class="<%= "is-active" if page == sibling %>">
             <%= link_to translated_attribute(sibling.title), page_path(sibling.slug) %>

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

@@ -8,13 +8,12 @@ edit_link(
 %>
 
 <%= render layout:"layouts/decidim/shared/layout_center", locals: { columns: 8 } do %>
-
   <div class="text-center py-10">
     <h1 class="title-decorator inline-block text-left mb-12">
       <%= t "decidim.pages.index.title" %>
     </h1>
     <p class="text-lg text-gray-2">
-      <%= t("decidim.pages.index.subheading", name: current_organization.name) %>
+      <%= t("decidim.pages.index.subheading", name: current_organization_name) %>
     </p>
   </div>
 

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/_filters.html.erb

@@ -1,5 +1,5 @@
 <div class="filter-container search__filter">
-  <button id="dropdown-trigger-search" data-component="dropdown" data-target="dropdown-menu-search" data-auto-close="true" data-disabled-md="true">
+  <button id="dropdown-trigger-search" data-component="dropdown" data-target="dropdown-menu-search" data-auto-close="true">
     <%= content_tag :span, t("decidim.searches.filters_small_view.filter_by"), class: "#{"is-active" if params.dig(:filter, :with_resource_type) == nil}" %>
     <% @blocks.each do |elements| %>
       <% elements.each do |type, results| %>
@@ -11,7 +11,7 @@
     <%= icon "arrow-down-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
     <%= icon "arrow-up-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
   </button>
-  <div id="dropdown-menu-search">
+  <div id="dropdown-menu-search" aria-hidden="true">
     <div>
       <%= link_to main_search_path, class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == nil}" do %>
         <%= resource_type_icon("all") %>

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-disabled-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,7 +12,7 @@
       </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" %>
       <% end %>

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,9 +1,9 @@
-<button class="order-by__button" id="dropdown-trigger-order" data-component="dropdown" data-target="dropdown-menu-order" data-open="false" data-disabled-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:,

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

@@ -11,8 +11,10 @@
         collection,
         :first,
         :last
-    ) do |builder|
-      builder.label(class: "filter") { builder.send(builder_type.singularize, class: "reset-defaults") + filter_text_for(builder.text) }
-    end %>
+    ) do |builder| %>
+      <div class="filter">
+        <%= builder.label { builder.send(builder_type.singularize, class: "reset-defaults") + filter_text_for(builder.text) } %>
+      </div>
+    <% end %>
   </div>
 </div>

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

@@ -4,31 +4,33 @@
 <% data = item.tree_node? && item.node.present? ? { checkboxes_tree: data_checkboxes_tree_id } : {} %>
 <% check_box_label = capture do %>
   <%= filter_text_for(leaf.label, id: "dropdown-title-#{data_checkboxes_tree_id}") %>
-  <% if !is_blank_root && item.tree_node? && item.node.present? %>
-    <button id="dropdown-trigger-<%= data_checkboxes_tree_id %>" data-controls="panel-dropdown-menu-<%= data_checkboxes_tree_id %>" aria-labelledby="dropdown-title-<%= data_checkboxes_tree_id %>">
-      <%= icon "arrow-down-s-fill" %>
-      <%= icon "arrow-up-s-fill" %>
-    </button>
-  <% end %>
 <% end %>
 
 <% if leaf.value == "" %>
   <%= hidden_field_tag "#{form.object_name}[#{method}][]", "", id: "#{form.options[:namespace] rescue "default"}_filter_#{method}_all" %>
 <% end %>
 
-<%= form.check_box(
-      method,
-      check_boxes_tree_options(
-        leaf.value,
-        check_box_label,
-        class: "reset-defaults",
-        data:,
-        is_root_check_box: is_blank_root,
-        parent_id:
-      ),
-      leaf.value.to_s,
-      nil
-    ) %>
+<div class="filter">
+  <%= form.check_box(
+        method,
+        check_boxes_tree_options(
+          leaf.value,
+          check_box_label,
+          class: "reset-defaults",
+          data:,
+          is_root_check_box: is_blank_root,
+          parent_id:
+        ),
+        leaf.value.to_s,
+        nil
+      ) %>
+  <% if !is_blank_root && item.tree_node? && item.node.present? %>
+    <button id="dropdown-trigger-<%= data_checkboxes_tree_id %>" data-controls="panel-dropdown-menu-<%= data_checkboxes_tree_id %>" aria-labelledby="dropdown-title-<%= data_checkboxes_tree_id %>">
+      <%= icon "arrow-down-s-fill" %>
+      <%= icon "arrow-up-s-fill" %>
+    </button>
+  <% end %>
+</div>
 
 <% if item.tree_node? && item.node.present? %>
   <% subitems_content = capture do %>

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 %>