decidim-core 0.29.2 → 0.30.0.rc1

data/app/validators/translated_etiquette_validator.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# This validator takes care of i18n fields ensuring the validated content is
+# respectful, does not use caps, and overall is meaningful.
+#
+#   validates :my_i18n_field, translated_etiquette: true
+class TranslatedEtiquetteValidator < EtiquetteValidator
+  def validate_each(record, attribute, _value)
+    translated_attr = "#{attribute}_#{default_locale_for(record)}".gsub("-", "__")
+    translated_value = record.send(translated_attr)
+    return if translated_value.blank?
+
+    text_value = strip_tags(translated_value)
+
+    validate_caps(record, translated_attr, text_value)
+    validate_marks(record, translated_attr, text_value)
+    validate_caps_first(record, translated_attr, text_value)
+  end
+
+  private
+
+  def default_locale_for(record)
+    return record.default_locale if record.respond_to?(:default_locale)
+
+    if record.current_organization
+      record.current_organization.default_locale
+    else
+      record.errors.add(:current_organization, :blank)
+      Decidim.default_locale
+    end
+  end
+end

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

@@ -3,11 +3,11 @@
   data-hide-password="<%= t "hide_password", scope: "decidim.devise.shared.password_fields" %>"
   data-hidden-password="<%= t "hidden_password", scope: "decidim.devise.shared.password_fields" %>"
   data-shown-password="<%= t "shown_password", scope: "decidim.devise.shared.password_fields" %>">
-  <%= form.send(:custom_label, :password, t("activemodel.attributes.user.password"), { required: true }) %>
+  <%= form.send(:custom_label, :password, t("activemodel.attributes.user.password"), {}) %>
 
   <% if local_assigns.has_key?(:show_help_text) || local_assigns.has_key?(:user) %>
     <%= form.password_field :password, password_field_options_for(user) %>
   <% else %>
-    <%= form.password_field :password, autocomplete: "current-password", required: true, label: false %>
+    <%= form.password_field :password, autocomplete: "current-password", required: true, label: false, placeholder: "************" %>
   <% end %>
 </div>

data/app/views/decidim/application/_accordion_section.html.erb

@@ -0,0 +1,14 @@
+<div class="card-accordion" data-component="accordion">
+  <div class="card-accordion-divider">
+    <button class="card-accordion-divider-button" data-open="<%= open_accordion ||= false %>" data-controls="panel-title--<%= panel_id %>" type="button">
+      <h2 class="card-accordion-title" id="title">
+        <%= title %>
+      </h2>
+      <%= icon "arrow-down-s-line", class: "mb-4" %>
+    </button>
+  </div>
+
+  <div id="panel-title--<%= panel_id %>" class="card-accordion-section editor-content" aria-hidden="true">
+    <%= yield %>
+  </div>
+</div>

data/app/views/decidim/application/_collection.html.erb

@@ -1,25 +1,37 @@
 <% unless attachment_collection.unused? %>
-<button id="dropdown-documents-trigger-<%= attachment_collection.id %>" class="documents__collection-trigger" data-component="dropdown" data-target="dropdown-menu-documents-<%= attachment_collection.id %>" aria-expanded="false">
-  <span>
-    <span class="documents__collection-trigger__icon">
-      <%= icon "folder-line" %>
-      <%= icon "folder-open-line" %>
-    </span>
-    <%= decidim_escape_translated(attachment_collection.name) %>
-  </span>
-  <%= icon "arrow-down-s-fill" %>
-  <%= icon "arrow-up-s-fill" %>
-</button>
+<div class="documents__dropdown-container">
+  <button id="dropdown-documents-trigger-<%= attachment_collection.id %>" class="documents__collection-trigger" data-component="dropdown" data-target="dropdown-menu-documents-<%= attachment_collection.id %>" aria-expanded="false">
+   <div class="documents-details">
+      <span>
+        <span class="documents__collection-trigger__icon">
+          <%= icon "folder-line" %>
+          <%= icon "folder-open-line" %>
+        </span>
+        <%= decidim_escape_translated(attachment_collection.name) %>
+      </span>
 
-<div id="dropdown-menu-documents-<%= attachment_collection.id %>" class="documents__collection-content" aria-hidden="true">
-  <% if (description = attachment_collection.description).present? %>
-    <p><%= decidim_escape_translated(description) %></p>
-  <% end %>
+      <div class="card__list-metadata">
+        <div><%= icon "file-text-line" %><%= t("decidim.documents", count: documents.count) %></div>
+        <% sum = 0
+           documents.each { |document| sum += document.file_size.to_i } %>
+        <div><%= icon "scales-2-line" %><%= number_to_human_size(sum) %></div>
+      </div>
+    </div>
 
-  <div class="documents__container">
-    <% documents.each do |document| %>
-      <%= render partial: "decidim/application/document", formats: [:html], locals: { document: } %>
+    <%= icon "arrow-down-s-fill" %>
+    <%= icon "arrow-up-s-fill" %>
+  </button>
+
+  <div id="dropdown-menu-documents-<%= attachment_collection.id %>" class="documents__collection-content" aria-hidden="true">
+    <% if (description = attachment_collection.description).present? %>
+      <p><%= decidim_escape_translated(description) %></p>
     <% end %>
+
+    <div class="documents__container">
+      <% documents.each do |document| %>
+        <%= render partial: "decidim/application/document", formats: [:html], locals: { document: } %>
+      <% end %>
+    </div>
   </div>
 </div>
 <% end %>

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

@@ -13,7 +13,7 @@
     <%= form_required_explanation %>
   </div>
 
-  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name)) do |f| %>
+  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name), html: { id: "omniauth-register-form" }) do |f| %>
 
     <div class="form__wrapper">
       <%= f.text_field :name, help_text: t("decidim.devise.omniauth_registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
@@ -22,6 +22,8 @@
 
       <%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
 
+      <%= render partial: "decidim/devise/shared/tos_fields", locals: { form: f, user: :user } %>
+
       <%= f.hidden_field :uid %>
       <%= f.hidden_field :provider %>
       <%= f.hidden_field :oauth_signature %>
@@ -35,3 +37,5 @@
     </div>
   <% end %>
 <% end %>
+
+<%= render "decidim/devise/shared/newsletter_modal" %>

data/app/views/decidim/devise/omniauth_registrations/new_tos_fields.html.erb

@@ -0,0 +1,29 @@
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="flex justify-center">
+    <h1 class="title-decorator my-12"><%= t("decidim.devise.omniauth_registrations.new_tos_fields.sign_up_title") %></h1>
+  </div>
+
+  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name), html: { id: "omniauth-register-form" }) do |f| %>
+
+    <div class="form__wrapper">
+      <%= f.hidden_field :name %>
+      <%= f.hidden_field :nickname %>
+      <%= f.hidden_field :email %>
+
+      <%= render partial: "decidim/devise/shared/tos_fields", locals: { form: f, user: :user } %>
+
+      <%= f.hidden_field :uid %>
+      <%= f.hidden_field :provider %>
+      <%= f.hidden_field :oauth_signature %>
+    </div>
+
+    <div class="form__wrapper-block">
+      <button type="submit" class="button button__lg button__secondary">
+        <span><%= t("decidim.devise.omniauth_registrations.new_tos_fields.sign_up") %></span>
+        <%= icon "arrow-right-line", class: "fill-current" %>
+      </button>
+    </div>
+  <% end %>
+<% end %>
+
+<%= render "decidim/devise/shared/newsletter_modal" %>

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

@@ -4,7 +4,7 @@
   <%= render "decidim/devise/shared/links" %>
 <% end %>
 
-<%= render layout: "layouts/decidim/shared/layout_center" do %>
+<%= render(layout: "layouts/decidim/shared/layout_center", locals: { columns: 8 }) do %>
   <div class="flex justify-center">
     <h1 class="title-decorator my-12"><%= t("decidim.devise.registrations.new.sign_up") %></h1>
   </div>
@@ -23,8 +23,6 @@
     <%= form_required_explanation %>
   </div>
 
-  <span class="login__info-separator"></span>
-
   <% cache current_organization do %>
     <%= render "decidim/devise/shared/omniauth_buttons" %>
   <% end %>
@@ -32,7 +30,7 @@
   <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { id: "register-form" }) do |f| %>
     <%= invisible_captcha %>
 
-    <div class="form__wrapper">
+    <div class="form__wrapper pb-12">
       <%= f.text_field :name, help_text: t("decidim.devise.registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
 
       <%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
@@ -40,32 +38,22 @@
       <%= render partial: "decidim/account/password_fields", locals: { form: f, user: :user } %>
     </div>
 
-    <div id="card__tos" class="form__wrapper-block">
-      <h2 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h2>
-
-      <div>
-        <% terms_of_service_summary_content_blocks.each do |content_block| %>
-          <%= cell content_block.manifest.cell, content_block %>
-        <% end %>
-      </div>
-
-      <%= f.check_box :tos_agreement, label: t("decidim.devise.registrations.new.tos_agreement", link: link_to(t("decidim.devise.registrations.new.terms"), page_path("terms-of-service"))), label_options: { class: "form__wrapper-checkbox-label" } %>
-    </div>
-
-    <div id="card__newsletter" class="form__wrapper-block">
-      <h2 class="h4"><%= t("decidim.devise.registrations.new.newsletter_title") %></h2>
-      <%= f.check_box :newsletter, label: t("decidim.devise.registrations.new.newsletter"), checked: @form.newsletter, label_options: { class: "form__wrapper-checkbox-label" } %>
-    </div>
+    <%= render partial: "decidim/devise/shared/tos_fields", locals: { form: f, user: :user } %>
 
     <div class="form__wrapper-block">
       <button type="submit" class="button button__lg button__secondary">
         <%= t("decidim.devise.registrations.new.sign_up") %>
-        <%= icon "arrow-right-line", class: "fill-current" %>
       </button>
     </div>
 
     <div class="login__links">
-      <%= render "decidim/devise/shared/links" %>
+      <%- if current_organization.sign_up_enabled? && devise_mapping.confirmable? && controller_name != "confirmations" %>
+        <%= link_to t("devise.shared.links.didn_t_receive_confirmation_instructions"), new_confirmation_path(resource_name) %>
+      <% end -%>
+
+      <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
+        <%= link_to t("devise.shared.links.didn_t_receive_unlock_instructions"), new_unlock_path(resource_name) %>
+      <% end -%>
     </div>
   <% end %>
 <% end %>

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

@@ -1,32 +1,13 @@
 <% add_decidim_page_title(t("devise.sessions.new.log_in")) %>
 
-<%= render layout: "layouts/decidim/shared/layout_center" do %>
+<%= render(layout: "layouts/decidim/shared/layout_center", locals: { columns: 8 }) do %>
 
   <div class="flex justify-center">
     <h1 class="title-decorator my-12"><%= t("devise.sessions.new.log_in") %></h1>
   </div>
 
-  <div class="login__info font-semibold">
-    <% if current_organization.sign_up_enabled? %>
-      <p>
-        <%= t("decidim.devise.sessions.new.are_you_new?") %>
-        <%= link_to t("decidim.devise.sessions.new.register"), new_user_registration_path %>
-      </p>
-    <% elsif current_organization.sign_in_enabled? %>
-      <p>
-        <%= t("decidim.devise.sessions.new.sign_up_disabled") %>
-      </p>
-    <% else %>
-      <p>
-        <%= t("decidim.devise.sessions.new.sign_in_disabled") %>
-      </p>
-    <% end %>
-  </div>
-
-  <span class="login__info-separator"></span>
-
   <% cache current_organization do %>
-    <%= render "decidim/devise/shared/omniauth_buttons" %>
+    <%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
   <% end %>
 
   <% if current_organization.sign_in_enabled? %>
@@ -36,22 +17,36 @@
 
         <%= render partial: "decidim/account/password_fields", locals: { form: f } %>
 
-        <% if devise_mapping.rememberable? %>
-          <%= f.check_box :remember_me, label_options: { class: "form__wrapper-checkbox-label" } %>
+      </div>
+      <div class="login__modal-remember">
+          <% if devise_mapping.rememberable? %>
+            <%= f.check_box :remember_me, label_options: { class: "form__wrapper-checkbox-label" } %>
+            <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user), class: "sign-up-link" %>
+          <% end %>
+      </div>
+
+      <div class="login__info mb-10 flex justify-center font-semibold">
+        <% if current_organization.sign_up_enabled? %>
+          <p>
+            <%= t("decidim.devise.sessions.new.are_you_new?") %>
+            <%= link_to t("decidim.devise.sessions.new.register"), new_user_registration_path %>
+          </p>
+        <% elsif current_organization.sign_in_enabled? %>
+          <p>
+            <%= t("decidim.devise.sessions.new.sign_up_disabled") %>
+          </p>
+        <% else %>
+          <p>
+            <%= t("decidim.devise.sessions.new.sign_in_disabled") %>
+          </p>
         <% end %>
       </div>
 
       <div class="form__wrapper-block">
         <button type="submit" class="button button__lg button__secondary">
           <%= t("devise.sessions.new.log_in") %>
-          <%= icon "arrow-right-line", class: "fill-current" %>
         </button>
       </div>
-
-      <div class="login__links">
-        <%= render "decidim/devise/shared/links" %>
-      </div>
     <% end %>
-
   <% end %>
 <% end %>

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

@@ -2,12 +2,10 @@
 <% if Devise.mappings[:user].omniauthable? && current_organization.enabled_omniauth_providers.any? %>
   <div class="login__omniauth<%= " login__omniauth__horizontal" if is_horizontal %>">
     <%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
-      <% link_classes = "login__omniauth-button button--#{normalize_provider_name(provider)}" %>
+      <% link_classes = "login__omniauth-button login__omniauth-button--#{normalize_provider_name(provider)}" %>
       <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: link_classes, method: :post, title: t("devise.shared.links.log_in_with_provider", provider: normalize_provider_name(provider).titleize) do %>
         <%= oauth_icon provider %>
-        <span>
-          <%= normalize_provider_name(provider).titleize %>
-        </span>
+        <span><%= t("devise.shared.links.log_in_with_provider", provider: normalize_provider_name(provider).titleize) %></span>
       <% end %>
     <% end %>
   </div>

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

@@ -0,0 +1,16 @@
+<div id="card__tos" class="form__wrapper-block border-y-2">
+  <h2 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h2>
+
+  <div>
+    <% terms_of_service_summary_content_blocks.each do |content_block| %>
+      <%= cell content_block.manifest.cell, content_block %>
+    <% end %>
+  </div>
+
+  <%= form.check_box :tos_agreement, label: t("decidim.devise.registrations.new.tos_agreement", link: link_to(t("decidim.devise.registrations.new.terms"), decidim.page_path("terms-of-service"))), label_options: { class: "form__wrapper-checkbox-label" } %>
+</div>
+
+<div id="card__newsletter" class="form__wrapper-block">
+  <h2 class="h4"><%= t("decidim.devise.registrations.new.newsletter_title") %></h2>
+  <%= form.check_box :newsletter, label: t("decidim.devise.registrations.new.newsletter"), checked: @form.newsletter, label_options: { class: "form__wrapper-checkbox-label" } %>
+</div>

data/app/views/decidim/download_your_data/_export.html.erb

@@ -0,0 +1,15 @@
+<tr>
+  <td class="text-left p-4"><%= t(export.export_type, scope:"decidim.download_your_data.show") %></td>
+  <td class="text-center"><%= export.expired? ? t("expired", scope:"decidim.download_your_data.show") : l(export.expires_at, format: :decidim_short) %></td>
+  <td class="py-4">
+    <%= button_to download_download_your_data_path(export),
+                  class: "button button__sm button__transparent-secondary m-auto block",
+                  disabled: export.expired?,
+                  aria: { label: t("download", scope:"decidim.download_your_data.show") },
+                  method: :get do %>
+                    <span class="hidden lg:block"><%= t("download", scope:"decidim.download_your_data.show") %></span>
+                    <span class="lg:hidden"><%= icon "download-line", class: "text-secondary fill-current" %></span>
+    <% end %>
+
+  </td>
+</tr>

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

@@ -3,14 +3,60 @@
   <% content_for(:subtitle) { t("my_data", scope: "layouts.decidim.user_profile") } %>
 
   <div class="download-your-data">
-    <span class="uppercase font-semibold text-gray-2 mb-4 block">
+    <h2 class="h4 font-bold pb-4">
       <%= t("download_data", scope:"decidim.download_your_data.show") %>
-    </span>
-    <p class="help-text pb-8">
-      <%= t("download_data_description_html", scope:"decidim.download_your_data.show" , user_email: current_user.email) %>
+    </h2>
+
+    <p class="pb-4 editor-content">
+      <%= t("download_data_description_1", scope:"decidim.download_your_data.show") %>
+    </p>
+    <p class="pb-4 editor-content">
+      <%= t("download_data_description_2", scope:"decidim.download_your_data.show") %>
     </p>
-    <div class="form__wrapper-block">
+
+    <%= render layout: "decidim/application/accordion_section", locals: { open_accordion: true, panel_id: "explanation", title: t("title", scope: "decidim.download_your_data.show.explanation") } do %>
+      <p> <%= t("body_1", scope: "decidim.download_your_data.show.explanation", organization_name: current_organization_name) %> </p>
+      <p> <%= t("body_2", scope: "decidim.download_your_data.show.explanation") %> </p>
+    <% end %>
+
+    <%= render partial: "decidim/open_data/how_to_open_accordion_section" %>
+
+    <%= render layout: "decidim/application/accordion_section", locals: { panel_id: "detailed", title: t("title", scope: "decidim.open_data.index.detailed") } do %>
+      <p> <%= t("body_1", scope: "decidim.open_data.index.detailed") %> </p>
+      <% help_definitions.each do |export_manifest_name, export_manifest_definitions| %>
+        <% next if export_manifest_definitions.blank? %>
+        <div class="mt-8">
+          <h4><%= export_manifest_name %></h4>
+          <ul>
+            <% export_manifest_definitions.each do |i18n_key, i18n_value| %>
+              <li> <b><%= i18n_key %></b>: <%= i18n_value %> </li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
+    <% end %>
+
+    <div class="py-10 flex flex-col gap-4 only:[&_*]:ml-auto">
       <%= button_to t("request_data", scope:"decidim.download_your_data.show"), export_download_your_data_path, class: "button button__sm md:button__lg button__secondary mr-auto !ml-0", data: { disable: true } %>
     </div>
+
+    <% unless @exports.size.zero? %>
+      <h2 class="h4 font-bold pb-4">
+        <%= t("files_to_download", scope:"decidim.download_your_data.show") %>
+      </h2>
+
+      <table class="w-full">
+        <thead class="bg-gray-5">
+          <th class="font-semibold p-4 text-left"><%= t("type", scope:"decidim.download_your_data.show") %></th>
+          <th class="w-[20%] sm:w-[25%] font-semibold py-4"><%= t("expiration", scope:"decidim.download_your_data.show") %></th>
+          <th class="w-[20%] sm:w-[25%] font-semibold py-4 text-center"><%= t("action", scope:"decidim.download_your_data.show") %></th>
+        </thead>
+        <tbody>
+          <%= render partial: "decidim/download_your_data/export", collection: @exports %>
+        </tbody>
+      </table>
+      <%= decidim_paginate(@exports) %>
+    <% end %>
   </div>
+
 <% end %>

data/app/views/decidim/endorsements/update_buttons_and_counters.js.erb

@@ -1,28 +1,25 @@
 updateEndorsementBlock();
 function updateEndorsementBlock() {
-  var $endorsementBlock = $('#resource-<%= resource.id %>-endorsement-block');
-  var $endorsementListTrigger = $('#resource-<%= resource.id %>-endorsement-block #dropdown-trigger');
-  var $endorsementButton = $('#resource-<%= resource.id %>-endorsement-button');
-  var $endorsementIdentitiesButton = $('#resource-<%= resource.id %>-endorsement-button #select-identity-button');
-  var $endorsementListGrid = $('#dropdown-menu-endorsers-list .endorsers-list__grid');
-  var endorsersCount = <%= j(cell("decidim/endorsers_list", resource).endorsers_count) %>
+  var $endorsementBlock = document.getElementById('resource-<%= resource.reload.id %>-endorsement-block');
+  var $endorsementButton = document.getElementById('resource-<%= resource.id %>-endorsement-button');
+  var $endorsementListGrid = document.getElementById('endorser-list-<%= resource.id %>');
 
-  $endorsementListTrigger[0].innerHTML = '<%= j(cell("decidim/endorsers_list", resource)).strip.html_safe %>';
-  $endorsementListGrid[0].innerHTML = '<%= j(cell("decidim/endorsers_list", resource).full_endorsers_list).strip.html_safe %>';
-  if (endorsersCount > 0) {
-    $endorsementListTrigger.removeClass('hidden');
-  } else {
-    $endorsementListTrigger.addClass('hidden');
+  var $endorsersModal = document.getElementById('endorsersModal-<%= resource.id %>');
+
+  if ($endorsersModal !== null) {
+    $endorsersModal.remove();
   }
 
+  $endorsementListGrid.outerHTML = '<%= j(cell("decidim/endorsers_list", resource)).strip.html_safe %>';
+
   <%# If the endorsement button displays a modal to select the identity to endorse only the content of the button %>
   <%# has to be updated to maintain the function of the button to open the modal. Otherwise the button has to be fully %>
   <%# updated because the form request also changes %>
-  if ($endorsementIdentitiesButton.length == 0) {
-    $endorsementButton[0].outerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).show).strip.html_safe %>';
-  } else {
-    $endorsementIdentitiesButton[0].innerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).button_content).strip.html_safe %>';
-  }
-  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $endorsementBlock[0] }));
-  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $endorsementListGrid[0] }));
+
+  $endorsementButton.outerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).show).strip.html_safe %>';
+
+  $endorsementListGrid = document.getElementById('endorser-list-<%= resource.id %>');
+
+  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $endorsementBlock }));
+  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $endorsementListGrid }));
 }

data/app/views/decidim/export_mailer/download_your_data_export.html.erb

@@ -1,7 +1,7 @@
 <p class="email-instructions">
-  <%= t(".click_button", password: @password, date: l(Decidim.download_your_data_expiry_time.from_now, format: :decidim_short) ).html_safe %><br>
+  <%= t(".click_button_html", date: l(@private_export.expires_at, format: :decidim_short) ) %><br>
 </p>
 
 <p class="email-button email-button__cta">
-  <%= link_to t(".download"), download_file_download_your_data_url(host: @organization.host, filename: @filename), class: "button expanded hollow button--sc" %>
+  <%= link_to t(".download"), download_download_your_data_url(@private_export, host: @organization.host), class: "button expanded hollow button--sc" %>
 </p>

data/app/views/decidim/export_mailer/export.html.erb

@@ -1,3 +1,7 @@
 <p class="email-instructions">
-  <%= t(".ready") %>
+  <%= t(".click_button_html", date: l(@private_export.expires_at, format: :decidim_short) ) %><br>
+</p>
+
+<p class="email-button email-button__cta">
+  <%= link_to t(".download"), download_download_your_data_url(@private_export, host: @organization.host), class: "button expanded hollow button--sc" %>
 </p>

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

@@ -99,6 +99,28 @@
         </label>
       </div>
 
+      <label>
+        <%= t("valuators", scope: "decidim.notifications_settings.show") %>
+      </label>
+      <div class="toggle__switch-trigger">
+        <label for="email_on_assigned_proposals" class="toggle__switch-toggle">
+          <span>
+            <input
+              <%== %(checked="checked") if @notifications_settings.email_on_assigned_proposals %>
+              id="email_on_assigned_proposals"
+              type="checkbox"
+              name="email_on_assigned_proposals">
+            <span class="toggle__switch-toggle-content">
+            </span>
+            <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+            <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+          </span>
+          <span class="toggle__switch-trigger-text">
+            <%= t("assigned_to_proposal", scope: "decidim.notifications_settings.show") %>
+          </span>
+        </label>
+      </div>
+
       <% if current_user.moderator? %>
         <label>
           <%= t("administrators", scope: "decidim.notifications_settings.show") %>

data/app/views/decidim/open_data/_how_to_open_accordion_section.html.erb

@@ -0,0 +1,15 @@
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_1.title") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_1.body_html") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_2.title") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_2.body_html") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_3.title") %>
+<%# i18n-tasks-use t("decidim.open_data.index.how_to.step_3.body_html") %>
+<%= render layout: "decidim/application/accordion_section", locals: { panel_id: "how_to", title: t("title", scope: "decidim.open_data.index.how_to") } do %>
+  <% (1..3).each do |step_number| %>
+    <% scope = "decidim.open_data.index.how_to.step_#{step_number}" %>
+    <div class="row column">
+      <h3 class="text-lg pt-8"><%= t("title", scope:) %></h3>
+      <%= t("body_html", scope:) %>
+    </div>
+  <% end %>
+<% end %>