decidim-core 0.26.10 → 0.27.0.rc1

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

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t(".report_html", { url: reported_content_url }) %>
+  <%= t(".report_html", url: reported_content_url ) %>
 </p>
 
 <p class="email-button email-button__cta">

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

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t(".report_html", { url: reported_content_url }) %>
+  <%= t(".report_html", url: reported_content_url) %>
 </p>
 
 <br>

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

@@ -41,7 +41,7 @@
       <% if current || !required %>
         <a class="button" 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>
       <% else %>
-        <a class="button muted">
+        <a class="button" disabled="true">
       <% end %>
           <%= t("decidim.scopes.picker.choose") %>
         </a>

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

@@ -1,5 +1,5 @@
 <label class="text-medium mb-s"><%= t(".jump_to") %></label>
-<% if params.dig(:filter, :resource_type).present? %>
+<% if params.dig(:filter, :with_resource_type).present? %>
   <p class="text-secondary">
     <%= link_to main_search_path do %>
       <%= icon "caret-left", class: "icon--small", role: "img", "aria-hidden": true %>&nbsp;<%= t(".back") %>
@@ -12,7 +12,7 @@
 <%= render partial: "resources_filter_block", locals: { sections: @sections, types: Decidim::Searchable.searchable_resources_of_type_comment } %>
 <div class="card card--secondary">
   <%= filter_form_for filter do |form| %>
-    <%= scopes_picker_filter form, :decidim_scope_id %>
+    <%= scopes_picker_filter form, :decidim_scope_id_eq %>
     <%= form.hidden_field :term %>
   <% end %>
 </div>

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

@@ -1,14 +1,14 @@
 <%= filter_form_for filter do |form| %>
   <div class="columns mediumlarge-6 large-5">
-    <%= scopes_picker_filter form, :scope_id, checkboxes_on_top: checkboxes_on_top %>
+    <%= scopes_picker_filter form, :with_scope, checkboxes_on_top: checkboxes_on_top %>
   </div>
   <div class="columns mediumlarge-6 large-5">
-    <%= form.areas_select :area_id,
+    <%= form.areas_select :with_area,
                           areas_for_select(current_organization),
                           {
                             legend_title: t(".areas"),
                             label: "",
-                            selected: filter.area_id,
+                            selected: filter.with_area,
                             include_blank: t(".select_an_area")
                           },
                           "aria-label": t(".areas") %>

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

@@ -1,15 +1,17 @@
 <% add_decidim_page_title(t("my_interests", scope: "layouts.decidim.user_profile")) %>
 <% content_for(:subtitle) { t("my_interests", scope: "layouts.decidim.user_profile") } %>
 
-<p><%= t(".select_your_interests") %></p>
-<%= form_for(@user_interests, url: user_interests_path, method: :put, class: "user-form") do |f| %>
-  <p><strong><%= t(".my_interests") %></strong></p>
-  <% if @user_interests.scopes.any? %>
-    <div class="clearfix m-bottom">
-      <%= render partial: "scopes", locals: { scopes: @user_interests.scopes, f: f } %>
-    </div>
-    <%= f.submit t(".update_my_interests") %>
-  <% else %>
-    <p><%= t(".no_scopes") %></p>
+<div class="row">
+  <p><%= t(".select_your_interests") %></p>
+  <%= form_for(@user_interests, url: user_interests_path, method: :put, class: "user-form") do |f| %>
+    <p><strong><%= t(".my_interests") %></strong></p>
+    <% if @user_interests.scopes.any? %>
+      <div class="clearfix m-bottom">
+        <%= render partial: "scopes", locals: { scopes: @user_interests.scopes, f: f } %>
+      </div>
+      <%= f.submit t(".update_my_interests") %>
+    <% else %>
+      <p><%= t(".no_scopes") %></p>
+    <% end %>
   <% end %>
-<% end %>
+</div>

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

@@ -1,7 +1,14 @@
 <p class="email-greeting"><%= t ".hello", admin: h(@admin.name) %></p>
 
-<p class="email-instructions"><%= t ".body_1", user: h(@user.user_name), token: h(@token.name) %></p>
+<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: h(@reason) %></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-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<% if @report.details.present? %>
+  <p class="email-instructions"><%= t(".details") %></p>
+  <blockquote>
+    <%= @report.details %>
+  </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>

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

@@ -1,4 +1,6 @@
-<p class="email-greeting"><%= t(".greeting", recipient: @resource.email) %></p>
+<% if @resource.unconfirmed_email.blank? %>
+  <p class="email-greeting"><%= t(".greeting", recipient: @email) %></p>
+<% end %>
 
 <p class="email-instructions"><%= t(".instruction") %></p>
 

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

@@ -4,14 +4,16 @@
   <head>
     <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/head" %>
-    <%= render partial: "layouts/decidim/js_configuration" %>
   </head>
 
   <body>
+    <!--noindex--><!--googleoff: all-->
+    <%= cell("decidim/data_consent", current_organization) %>
     <%= render partial: "layouts/decidim/impersonation_warning" %>
-    <%= render partial: "layouts/decidim/cookie_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 %>
       <%= yield %>
@@ -20,6 +22,7 @@
     <%= 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/cors" if Decidim.cors_enabled %>
+    <%= render partial: "layouts/decidim/decidim_javascript" %>
+    <%= render partial: "layouts/decidim/cookie_warning" %>
   </body>
 </html>

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

@@ -1,8 +1,8 @@
-<% unless cookies_accepted? %>
-  <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" %>
-    </div>
-  </div>
-<% end %>
+<div class="cookie-warning flex-center padding-1 hide">
+  <p>
+  <%= t("layouts.decidim.cookie_consent.warning.need_cookies", cookies: t("layouts.decidim.cookie_consent.warning.all_cookies")) %>
+  </p>
+  <a href="#" class="button margin-vertical-2" data-open="cc-modal">
+    <%= t("change_cookie_settings", scope: "layouts.decidim.cookie_consent.warning") %>
+  </a>
+</div>

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

@@ -0,0 +1,12 @@
+<%= javascript_pack_tag "decidim_core", defer: false %>
+<% if Decidim.service_worker_enabled %>
+  <%= javascript_pack_tag "decidim_sw", defer: false %>
+<% end %>
+<%= render partial: "layouts/decidim/js_configuration" %>
+
+<%= yield :js_content %>
+
+<%= snippets.display(:foot) %>
+<%= content_for :header_snippets %>
+
+<%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>

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

@@ -21,13 +21,15 @@
   <meta name="theme-color" content="<%= current_organization.colors["theme"] %>">
 <% end %>
 
+<%= legacy_favicon %>
 <%= favicon %>
+<%= apple_favicon %>
+<link rel="manifest" href="/manifest.webmanifest">
+
 <%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 <%= organization_colors %>
-<%= javascript_pack_tag "decidim_core", defer: false %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
 <%= snippets.display(:head) %>
-<%= content_for :header_snippets %>

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

@@ -5,9 +5,13 @@ js_configs = {
     "selfxssWarning": {
       title: t("decidim.security.selfxss_warning.title"),
       description: t("decidim.security.selfxss_warning.description")
+    },
+    "mentionsModal": {
+      "removeRecipient": t("decidim.shared.mentions_modal.remove_recipient", name: "%name%")
     }
   },
-  external_domain_whitelist: [current_organization.host] + current_organization.external_domain_whitelist
+  external_domain_whitelist: [current_organization.host] + current_organization.external_domain_whitelist,
+  consent_cookie_name: Decidim.consent_cookie_name
 }
 character_messages = {
   "charactersAtLeast": {

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

@@ -1,6 +1,6 @@
 <% if organization %>
-  <% if defined?(custom_url_for_mail_root) && custom_url_for_mail_root.present? %>
-    <% url = custom_url_for_mail_root %>
+  <% if @custom_url_for_mail_root.present? %>
+    <% url = @custom_url_for_mail_root %>
   <% else %>
     <% url = decidim.root_url(host: organization.host) %>
   <% end %>

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

@@ -22,6 +22,7 @@
             <% end %>
           <% end %>
           <li><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
+          <li><a href="#" data-open="cc-modal"><%= t("layouts.decidim.footer.cookie_settings") %></a></li>
         </ul>
       </nav>
     </div>

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

@@ -0,0 +1,11 @@
+<div class="flash callout primary small js-offline-message" style="display: none">
+  <%= t(".cache_version_page") %>
+</div>
+<script>
+  document.addEventListener("DOMContentLoaded", () => {
+    // show the banner if it's offline AND the offline-fallback is not displaying
+    if (!navigator.onLine && !document.querySelector("#offline-fallback-html")) {
+      document.querySelector(".js-offline-message").style.display = "block"
+    }
+  })
+</script>

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

@@ -6,7 +6,7 @@
     <%= stylesheet_pack_tag "decidim_email" %>
   </head>
 
-  <%= content_tag :body, class: @preview ? "preview" : nil do %>
+  <body>
     <!-- <style> -->
     <table class="body">
       <% if content_for?(:see_on_website) %>
@@ -42,5 +42,5 @@
         </td>
       </tr>
     </table>
-  <% end %>
+  </body>
 </html>

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

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

data/config/assets.rb

@@ -5,6 +5,7 @@ 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_sw: "#{base_path}/app/packs/entrypoints/decidim_sw.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",

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am: