decidim-core 0.24.3 → 0.25.0.rc4

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

@@ -1,6 +1,6 @@
-<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
+<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
 
-<p>
+<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) %>
   <% else %>
@@ -8,10 +8,10 @@
   <% end %>
 </p>
 
-<p><%= 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>
+<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>
 
 <% if @resource.invitation_due_at %>
-  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
+  <p class="email-small"><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
 <% end %>
 
-<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>
+<p class="email-small email-closing"><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

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

@@ -1,6 +1,6 @@
-<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
+<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
 
-<p>
+<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) %>
   <% else %>
@@ -8,10 +8,10 @@
   <% end %>
 </p>
 
-<p><%= 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>
+<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>
 
 <% if @resource.invitation_due_at %>
-  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
+  <p class="email-small"><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
 <% end %>
 
-<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>
+<p class="email-small email-closing"><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

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

@@ -1,6 +1,6 @@
-<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
+<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
 
-<p>
+<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) %>
   <% else %>
@@ -8,10 +8,10 @@
   <% end %>
 </p>
 
-<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %></p>
+<p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %></p>
 
 <% if @resource.invitation_due_at %>
-  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
+  <p class="email-small"><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
 <% end %>
 
-<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>
+<p class="email-small email-closing"><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

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

@@ -1,10 +1,11 @@
-<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
+<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
 
-<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %></p>
-<p><%= 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>
+<p class="email-instructions"><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %></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>
 
 <% if @resource.invitation_due_at %>
-  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
+  <p class="email-small"><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
 <% end %>
 
-<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>
+<p class="email-small email-closing"><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

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

@@ -1,3 +1,3 @@
-<p><%= t(".greeting", recipient: @resource.email) %></p>
+<p class="email-greeting"><%= t(".greeting", recipient: @resource.email) %></p>
 
-<p><%= t(".message") %></p>
+<p class="email-instructions"><%= t(".message") %></p>

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

@@ -1,8 +1,9 @@
-<p><%= t(".greeting", recipient: @resource.email) %></p>
+<p class="email-greeting"><%= t(".greeting", recipient: @resource.email) %></p>
 
-<p><%= t(".instruction") %></p>
+<p class="email-instructions"><%= t(".instruction") %></p>
 
-<p><%= link_to t(".action"), edit_password_url(@resource, reset_password_token: @token, host: @resource.organization.host) %></p>
+<p class="email-button email-button__cta"><%= link_to t(".action"), edit_password_url(@resource, reset_password_token: @token, host: @resource.organization.host) %></p>
 
-<p><%= t(".instruction_2") %></p>
-<p><%= t(".instruction_3") %></p>
+<p class="email-instruction email-small"><%= t(".instruction_2") %></p>
+
+<p class="email-instruction email-small"><%= t(".instruction_3") %></p>

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

@@ -1,7 +1,7 @@
-<p><%= t(".greeting", recipient: @resource.email) %></p>
+<p class="email-greeting"><%= t(".greeting", recipient: @resource.email) %></p>
 
-<p><%= t(".message") %></p>
+<p class="email-instructions"><%= t(".message") %></p>
 
-<p><%= t(".instruction") %></p>
+<p class="email-instructions"><%= t(".instruction") %></p>
 
-<p><%= link_to t(".action"), unlock_url(@resource, unlock_token: @token, host: @resource.organization.host) %></p>
+<p class="email-button email-button__cta"><%= link_to t(".action"), unlock_url(@resource, unlock_token: @token, host: @resource.organization.host) %></p>

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

@@ -7,7 +7,7 @@
     organization: current_organization,
     scope_name: :homepage,
     manifest_name: :hero
-  ).try(:images_container).try(:background_image).try(:url)
+  ).try(:images_container).try(:attached_uploader, :background_image).try(:path)
 }) %>
 
 <!DOCTYPE html>
@@ -15,6 +15,7 @@
   <head>
     <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/head" %>
+    <%= render partial: "layouts/decidim/js_configuration" %>
   </head>
 
   <body>
@@ -30,6 +31,6 @@
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "decidim/shared/login_modal" unless current_user %>
     <%= render partial: "decidim/shared/authorization_modal" %>
-    <%= render partial: "layouts/decidim/js_configuration" %>
+    <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
   </body>
 </html>

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

@@ -1,5 +1,5 @@
 <% unless cookies_accepted? %>
-  <div class="cookie-warning">
+  <div class="cookie-warning" role="region">
     <%= t(".description_html", link: link_to(t(".link_label"), decidim.page_path("terms-and-conditions"), title: t(".link_label"), target: "_blank")) %>
     <div class="cookie-warning__action">
       <%= button_to t(".ok"), decidim.accept_cookies_path, method: :get, remote: true, class: "button tiny cookie-bar__button" %>

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

@@ -0,0 +1,8 @@
+<div id="svg-cors-container" style="display: none"></div>
+<script type="text/javascript">
+  $.get(window.Decidim.config.get("icons_path"), function(data) {
+    var div = document.getElementById("svg-cors-container");
+    div.innerHTML = new XMLSerializer().serializeToString(data.documentElement);
+    document.body.insertBefore(div, document.body.childNodes[0]);
+  });
+</script>

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

@@ -18,12 +18,10 @@
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
 <%= favicon %>
-<%= stylesheet_link_tag    "application", media: "all" %>
+<%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 <%= organization_colors %>
-<%= javascript_include_tag "decidim/confirm" %>
-<%= javascript_include_tag "application" %>
-<%= foundation_datepicker_locale_tag %>
+<%= javascript_pack_tag "decidim_core", defer: false %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>

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

@@ -6,5 +6,4 @@
       <%= button_to t(".close_session"), decidim_admin.close_session_impersonatable_user_impersonations_path(current_user), class: "button tiny impersonation-bar__button", data: { disable: true } %>
     </div>
   </div>
-  <%= javascript_include_tag "decidim/impersonation" %>
 <% end %>

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

@@ -1,12 +1,13 @@
 <%
 js_configs = {
-  icons_path: image_path("decidim/icons.svg"),
+  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg"),
   messages: {
     "selfxssWarning": {
       title: t("decidim.security.selfxss_warning.title"),
       description: t("decidim.security.selfxss_warning.description")
     }
-  }
+  },
+  external_domain_whitelist: [current_organization.host] + current_organization.external_domain_whitelist
 }
 character_messages = {
   "charactersAtLeast": {

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

@@ -5,12 +5,12 @@
       data-disable-hover="true"
       data-click-open="true"
       data-close-on-click="true"
-      tabindex="-1">
-      <li class="is-dropdown-submenu-parent" tabindex="-1">
-        <%= 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" %>
-        <ul class="menu is-dropdown-submenu" id="language-chooser-menu" role="menu" aria-labelledby="language-chooser-control" tabindex="-1">
+      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" %>
+        <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 %>"><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post, tabindex: "-1" %></li>
+            <li lang="<%= locale %>" role="presentation"><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post, role: "menuitem" %></li>
           <% end %>
         </ul>
       </li>

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

@@ -1,7 +1,7 @@
 <% if organization %>
   <%= link_to decidim.root_url(host: organization.host), title: t("logo", scope: "decidim.accessibility", organization: organization.name) do %>
-    <% if organization.logo.present? %>
-      <%= image_tag organization.logo.medium.url, alt: t("logo", scope: "decidim.accessibility", organization: organization.name) %>
+    <% if organization.logo.attached? %>
+      <%= image_tag organization.attached_uploader(:logo).variant_path(:medium), alt: t("logo", scope: "decidim.accessibility", organization: organization.name) %>
     <% else %>
       <span><%= organization.name %></span>
     <% end %>

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

@@ -5,8 +5,12 @@
     <% url = decidim.root_url(host: organization.host) %>
   <% end %>
   <%= link_to url do %>
-    <% if organization.logo.present? %>
-      <%= image_tag organization.logo.medium.url, style: "max-height: 50px", alt: "#{organization.name}" %>
+    <% if organization.logo.attached? %>
+      <%= image_tag(
+            organization.attached_uploader(:logo).variant_url(:medium, host: organization.host),
+            style: "max-height: 50px",
+            alt: "#{organization.name}"
+          ) %>
     <% else %>
       <span><%= organization.name %></span>
     <% end %>

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

@@ -1,7 +1,7 @@
 <div class="main-footer">
-  <% if current_organization.official_img_footer? %>
+  <% if current_organization.official_img_footer.attached? %>
     <%= link_to current_organization.official_url, class: "main-footer__badge" do %>
-      <%= image_tag current_organization.official_img_footer.url.to_s , alt: current_organization.name %>
+      <%= image_tag current_organization.attached_uploader(:official_img_footer).path, alt: current_organization.name %>
     <% end %>
   <% end %>
   <div class="row">

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

@@ -4,7 +4,7 @@
       <a rel="license noopener" class="cc-badge"
          href="http://creativecommons.org/licenses/by-sa/4.0/"
          target="_blank">
-        <%= image_tag("decidim/cc-badge.png", alt: t("layouts.decidim.footer.cc_by_license")) %>
+        <%= image_pack_tag("media/images/cc-badge.png", alt: t("layouts.decidim.footer.cc_by_license")) %>
       </a>
       <%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
     </div>
@@ -13,7 +13,7 @@
         <a rel="decidim noopener"
            href="https://decidim.org/"
            target="_blank">
-          <%= image_tag("decidim/decidim-logo.svg", alt: t("layouts.decidim.footer.decidim_logo")) %>
+          <%= image_pack_tag("media/images/decidim-logo.svg", alt: t("layouts.decidim.footer.decidim_logo")) %>
         </a>
       </div>
     </div>

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

@@ -1,9 +1,10 @@
-<% if current_user %>
-  <% timeout_time_seconds = Devise.timeout_in.to_i %>
+<% if current_user && !current_user.remember_created_at %>
+  <% timeout_time_seconds = Decidim.config.expire_session_after.to_i %>
   <div class="reveal" id="timeoutModal" data-close-on-click="false" data-close-on-esc="false"
     data-seconds-until-timeout-path="<%= decidim.seconds_until_timeout_path %>"
+    data-heartbeat-path="<%= decidim.heartbeat_path %>"
     data-session-timeout="<%= timeout_time_seconds %>"
-    data-session-timeouter-interval="<%= Decidim.config.session_timeouter_interval %>" data-reveal>
+    data-session-timeout-interval="<%= Decidim.config.session_timeout_interval.to_i * 1000 %>" data-reveal>
     <h2><%= t(".title") %></h2>
     <p><%= t(".body", minutes: (timeout_time_seconds / 60) - 2) %></p>
 

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

@@ -1,10 +1,10 @@
-<li><%= link_to t(".profile"), decidim.account_path, tabindex: "-1" %></li>
+<li role="presentation"><%= link_to t(".profile"), decidim.account_path, role: "menuitem" %></li>
 <% if current_user.nickname.present? && !current_user.managed? %>
-  <li><%= link_to t(".public_profile"), decidim.profile_path(current_user.nickname), tabindex: "-1" %></li>
+  <li role="presentation"><%= link_to t(".public_profile"), decidim.profile_path(current_user.nickname), role: "menuitem" %></li>
 <% end %>
-<li><%= link_to t(".notifications"), decidim.notifications_path, tabindex: "-1" %></li>
-<li><%= link_to t(".conversations"), decidim.conversations_path, tabindex: "-1" %></li>
+<li role="presentation"><%= link_to t(".notifications"), decidim.notifications_path, role: "menuitem" %></li>
+<li role="presentation"><%= link_to t(".conversations"), decidim.conversations_path, role: "menuitem" %></li>
 <% if allowed_to? :read, :admin_dashboard %>
-  <li><%= link_to t(".admin_dashboard"), decidim_admin.root_path, tabindex: "-1" %></li>
+  <li role="presentation"><%= link_to t(".admin_dashboard"), decidim_admin.root_path, role: "menuitem" %></li>
 <% end %>
-<li><%= link_to t(".sign_out"), decidim.destroy_user_session_path, method: :delete, class: "sign-out-link", tabindex: "-1" %></li>
+<li role="presentation"><%= link_to t(".sign_out"), decidim.destroy_user_session_path, method: :delete, class: "sign-out-link", role: "menuitem" %></li>

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

@@ -31,70 +31,73 @@ end
       <div class="footer-separator">
         <!--separates the footer from the rest of the page,
              creates a sticky footer-->
-        <!-- Topbar -->
-        <div class="title-bar">
-          <%= link_to t("skip_button", scope: "decidim.accessibility"), url_for(anchor: "content"), class: "skip" %>
-          <% if current_organization.official_img_header? %>
-            <%= link_to  current_organization.official_url, class: "logo-cityhall" do %>
-              <%= image_tag current_organization.official_img_header.url.to_s , alt: current_organization.name %>
+        <div class="header" role="banner">
+          <!-- Topbar -->
+          <div class="title-bar">
+            <%= link_to t("skip_button", scope: "decidim.accessibility"), url_for(anchor: "content"), class: "skip" %>
+            <% if current_organization.official_img_header.attached? %>
+              <%= link_to  current_organization.official_url, class: "logo-cityhall" do %>
+                <%= image_tag current_organization.attached_uploader(:official_img_header).path, alt: current_organization.name %>
+              <% end %>
             <% end %>
-          <% end %>
-          <div class="row column topbar">
-            <div class="logo-wrapper">
-              <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
-            </div>
-            <%= render partial: "layouts/decidim/topbar_search" %>
-            <%= render partial: "layouts/decidim/language_chooser" %>
-            <div class="hide-for-medium topbar__menu">
-              <button type="button" data-toggle="offCanvas" aria-label="<%= t("layouts.decidim.header.navigation") %>">
-                <%= icon "menu", aria_label: t("layouts.decidim.header.navigation"), role: "img" %>
-              </button>
-            </div>
-            <% if current_user %>
-              <nav class="topbar__dropmenu topbar__user__logged">
-                <%= link_to decidim.notifications_path, class: "topbar__notifications #{current_user.notifications.any? ? "is-active" : ""}" do %>
-                  <%= icon "bell", role: "img", aria_label: t("layouts.decidim.user_menu.notifications") %>
-                <% end %>
-                <%= link_to decidim.conversations_path, class: "topbar__conversations #{current_user.unread_conversations.any? ? "is-active" : ""}" do %>
-                  <%= icon "envelope-closed", role: "img", aria_label: t("layouts.decidim.user_menu.conversations") %>
-                <% end %>
-                <ul class="dropdown menu" data-dropdown-menu
-                  data-autoclose="false"
-                  data-disable-hover="true"
-                  data-click-open="true"
-                  data-close-on-click="true">
-                  <li class="is-dropdown-submenu-parent show-for-medium" tabindex="-1">
-                    <%= 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) %>
-                    <ul class="menu is-dropdown-submenu" id="user-menu" role="menu" aria-labelledby="user-menu-control" tabindex="-1">
-                      <%= render partial: "layouts/decidim/user_menu" %>
-                    </ul>
-                    <div data-set="nav-login-holder" class="show-for-medium">
-                      <!-- Repeated due to dropdown limitations -->
-                      <ul class="menu is-dropdown-submenu js-append usermenu-off-canvas">
+            <div class="row column topbar">
+              <div class="logo-wrapper">
+                <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
+              </div>
+              <%= render partial: "layouts/decidim/topbar_search" %>
+              <%= render partial: "layouts/decidim/language_chooser" %>
+              <div class="hide-for-medium topbar__menu">
+                <button type="button" data-toggle="offCanvas" aria-label="<%= t("layouts.decidim.header.navigation") %>">
+                  <%= icon "menu", aria_label: t("layouts.decidim.header.navigation"), role: "img" %>
+                </button>
+              </div>
+              <% if current_user %>
+                <nav class="topbar__dropmenu topbar__user__logged" aria-label="<%= t("layouts.decidim.header.user_menu") %>">
+                  <%= link_to decidim.notifications_path, class: "topbar__notifications #{current_user.notifications.any? ? "is-active" : ""}" do %>
+                    <%= icon "bell", role: "img", aria_label: t("layouts.decidim.user_menu.notifications") %>
+                  <% end %>
+                  <%= link_to decidim.conversations_path, class: "topbar__conversations #{current_user.unread_conversations.any? ? "is-active" : ""}" do %>
+                    <%= icon "envelope-closed", role: "img", aria_label: t("layouts.decidim.user_menu.conversations") %>
+                  <% end %>
+                  <ul class="dropdown menu" data-dropdown-menu
+                    data-autoclose="false"
+                    data-disable-hover="true"
+                    data-click-open="true"
+                    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" %>
+                      <ul class="menu is-dropdown-submenu" id="user-menu" role="menu" aria-labelledby="user-menu-control">
                         <%= render partial: "layouts/decidim/user_menu" %>
                       </ul>
-                    </div>
-                  </li>
-                </ul>
-              </nav>
-            <% else %>
-              <div class="topbar__user show-for-medium" data-set="nav-login-holder">
-                <div class="topbar__user__login js-append">
-                  <% if current_organization.sign_up_enabled? %>
-                    <%= link_to t("layouts.decidim.header.sign_up"), decidim.new_user_registration_path, class: "sign-up-link" %>
-                  <% end %>
-                  <%= link_to t("layouts.decidim.header.sign_in"), decidim.new_user_session_path, class: "sign-in-link" %>
+                      <div data-set="nav-login-holder" class="show-for-medium">
+                        <!-- Repeated due to dropdown limitations -->
+                        <ul class="menu is-dropdown-submenu js-append usermenu-off-canvas">
+                          <%= render partial: "layouts/decidim/user_menu" %>
+                        </ul>
+                      </div>
+                    </li>
+                  </ul>
+                </nav>
+              <% else %>
+                <div class="topbar__user show-for-medium" data-set="nav-login-holder">
+                  <div class="topbar__user__login js-append">
+                    <% if current_organization.sign_up_enabled? %>
+                      <%= link_to t("layouts.decidim.header.sign_up"), decidim.new_user_registration_path, class: "sign-up-link" %>
+                    <% end %>
+                    <%= link_to t("layouts.decidim.header.sign_in"), decidim.new_user_session_path, class: "sign-in-link" %>
+                  </div>
                 </div>
-              </div>
-            <% end %>
+              <% end %>
 
-            <%= render partial: "layouts/decidim/admin_links" %>
+              <%= render partial: "layouts/decidim/admin_links" %>
+            </div>
           </div>
-        </div>
-        <div class="show-for-medium" data-set="nav-holder">
-          <div class="navbar js-append">
-            <div class="row column">
-              <%= main_menu.render %>
+          <div class="show-for-medium" data-set="nav-holder">
+            <div class="navbar js-append">
+              <div class="row column">
+                <%= main_menu.render %>
+              </div>
             </div>
           </div>
         </div>
@@ -104,8 +107,10 @@ end
           <%= yield %>
         </main>
       </div>
-      <%= render partial: "layouts/decidim/main_footer" %>
-      <%= render partial: "layouts/decidim/mini_footer" %>
+      <div class="footer" role="contentinfo">
+        <%= render partial: "layouts/decidim/main_footer" %>
+        <%= render partial: "layouts/decidim/mini_footer" %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width">
-    <%= stylesheet_link_tag "decidim/email" %>
+    <%= stylesheet_pack_tag "decidim_email" %>
   </head>
 
   <body>
@@ -47,9 +47,9 @@
                         <table>
                           <tr>
                             <th>
-                              <% if @organization.official_img_header? %>
+                              <% if @organization.official_img_header.attached? %>
                                 <%= link_to @organization.official_url do %>
-                                  <%= image_tag @organization.official_img_header.url.to_s , alt: "", style: "max-height: 50px", class: "float-right" %>
+                                  <%= image_tag @organization.attached_uploader(:official_img_header).url(host: @organization.host), alt: "", style: "max-height: 50px", class: "float-right" %>
                                 <% end %>
                               <% end %>
                             </th>

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

@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width">
-    <%= stylesheet_link_tag "decidim/email" %>
+    <%= stylesheet_pack_tag "decidim_email" %>
   </head>
 
   <body>

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

@@ -3,8 +3,8 @@
   <head>
     <title><%= decidim_page_title %></title>
     <%= csrf_meta_tags %>
-    <%= stylesheet_link_tag    "application" %>
-    <%= javascript_include_tag "application" %>
+    <%= stylesheet_pack_tag "decidim_core" %>
+    <%= javascript_pack_tag "decidim_core", defer: false %>
   </head>
 
   <body class="widget">
@@ -27,7 +27,8 @@
       <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
     </div>
 
-    <%= javascript_include_tag "decidim/widget" %>
+    <%= javascript_pack_tag "decidim_widget" %>
     <%= render partial: "layouts/decidim/js_configuration" %>
+    <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
   </body>
 </html>

data/config/assets.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_core: "#{base_path}/app/packs/entrypoints/decidim_core.js",
+  decidim_conference_diploma: "#{base_path}/app/packs/entrypoints/decidim_conference_diploma.js",
+  decidim_email: "#{base_path}/app/packs/entrypoints/decidim_email.js",
+  decidim_map: "#{base_path}/app/packs/entrypoints/decidim_map.js",
+  decidim_geocoding_provider_photon: "#{base_path}/app/packs/entrypoints/decidim_geocoding_provider_photon.js",
+  decidim_geocoding_provider_here: "#{base_path}/app/packs/entrypoints/decidim_geocoding_provider_here.js",
+  decidim_map_provider_default: "#{base_path}/app/packs/entrypoints/decidim_map_provider_default.js",
+  decidim_map_provider_here: "#{base_path}/app/packs/entrypoints/decidim_map_provider_here.js",
+  decidim_widget: "#{base_path}/app/packs/entrypoints/decidim_widget.js"
+)

data/config/initializers/devise.rb

@@ -225,7 +225,7 @@ Devise.setup do |config|
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
-  config.timeout_in = 30.minutes
+  config.timeout_in = Decidim.config.expire_session_after
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.

data/config/locales/ar.yml

@@ -231,7 +231,6 @@ ar:
       photos:
         related_photos: الصور ذات الصلة
     author:
-      avatar: الصورة الرمزية
       comments:
         zero: تعليقات
         one: تعليق
@@ -851,24 +850,7 @@ ar:
         metrics:
           headline: المشاركة في الأرقام
         statistics:
-          answers_count: المسوحات المكتملة
-          assemblies_count: الجمعيات
-          comments_count: تعليقات
-          conferences_count: المؤتمرات
-          debates_count: المناقشات
-          endorsements_count: موافقات
           headline: الحالة الحالية لـ %{organization}
-          meetings_count: اجتماعات
-          orders_count: الأصوات
-          pages_count: صفحات
-          processes_count: العمليات
-          projects_count: مشاريع
-          proposals_accepted: المقترحات المقبولة
-          proposals_count: اقتراحات
-          results_count: النتائج
-          surveys_count: الدراسات الاستقصائية
-          users_count: المشاركين
-          votes_count: الأصوات
         sub_hero:
           register: تسجيل
       index:
@@ -1018,6 +1000,8 @@ ar:
         close_window: أغلق النافذة
         share: شارك
         share_link: مشاركة الرابط
+    statistics:
+      comments_count: تعليقات
     user_activity:
       index:
         no_activities_warning: هذا المشارك لم يقم بأي نشاط حتى الآن.