decidim-core 0.26.3 → 0.27.0.rc1

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

@@ -12,7 +12,7 @@
 
       <div class="card card--list">
         <% documents.each do |document| %>
-          <%= render partial: "decidim/application/document.html", locals: { document: document } %>
+          <%= render partial: "decidim/application/document", locals: { document: document } %>
         <% end %>
       </div>
     </div>

data/app/views/decidim/application/{_documents.html.erb → _documents.erb}

@@ -4,12 +4,12 @@
     <% if (documents_without_collection = documents.reject(&:attachment_collection_id?)).any? %>
       <div class="card card--list">
         <% documents_without_collection.each do |document| %>
-          <%= render partial: "decidim/application/document.html", locals: { document: document } %>
+          <%= render partial: "decidim/application/document", locals: { document: document } %>
         <% end %>
       </div>
     <% end %>
     <% documents.select(&:attachment_collection_id?).group_by(&:attachment_collection).sort_by { |c, d| c.weight }.each do |collection, documents| %>
-      <%= render partial: "decidim/application/collection.html", locals: { attachment_collection: collection, documents: documents } %>
+      <%= render partial: "decidim/application/collection", locals: { attachment_collection: collection, documents: documents } %>
     <% end %>
   </div>
 <% end %>

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

@@ -16,7 +16,7 @@
             <%= render "devise/shared/error_messages", resource: resource %>
 
             <div class="field">
-              <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+              <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), autocomplete: "email" %>
             </div>
 
             <div class="actions">

data/app/views/decidim/devise/invitations/edit.html.erb

@@ -21,17 +21,16 @@
 
             <div class="user-nickname">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization.name), required: "required", prefix: { value: "@", small: 1, large: 1 } %>
+                <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization.name), required: "required", prefix: { value: "@", small: 1, large: 1 }, autocomplete: "nickname" %>
               </div>
             </div>
 
             <% if f.object.class.require_password_on_accepting %>
               <div class="field">
-                <p><%= f.password_field :password, required: "required", minlength: ::PasswordValidator::MINIMUM_LENGTH, maxlength: ::PasswordValidator::MAX_LENGTH %></p>
+                <p><%= f.password_field :password, password_field_options_for(:user).except(:help_text) %></p>
               </div>
-
               <div class="field">
-                <p><%= f.password_field :password_confirmation, required: "required", minlength: ::PasswordValidator::MINIMUM_LENGTH, maxlength: ::PasswordValidator::MAX_LENGTH %></p>
+                <p><%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %></p>
               </div>
             <% end %>
           </div>

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

@@ -18,18 +18,18 @@
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help") %>
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "name" %>
               </div>
             </div>
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name) %>
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), autocomplete: "nickname" %>
               </div>
             </div>
 
             <div class="field">
-              <%= f.email_field :email %>
+              <%= f.email_field :email, autocomplete: "email" %>
             </div>
 
             <%= f.hidden_field :uid %>

data/app/views/decidim/devise/passwords/edit.html.erb

@@ -2,7 +2,7 @@
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
-      <h1><%= t("devise.passwords.edit.change_your_password") %></h1>
+      <h1><%= t("devise.passwords.edit.title") %></h1>
     </div>
   </div>
 
@@ -10,17 +10,17 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= decidim_form_for(resource, namespace: "password", as: resource_name, url: password_path(resource_name), html: { method: :put, class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(resource, namespace: "password", as: resource_name, url: @send_path || password_path(resource_name), html: { method: :put, class: "register-form new_user" }) do |f| %>
             <%= form_required_explanation %>
 
             <%= f.hidden_field :reset_password_token %>
 
             <div class="field">
-              <%= f.password_field :password, autocomplete: "off", help_text: t("devise.passwords.edit.password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH) %>
+              <%= f.password_field :password, password_field_options_for(current_user || params["reset_password_token"]) %>
             </div>
 
             <div class="field">
-              <%= f.password_field :password_confirmation, autocomplete: "off" %>
+              <%= f.password_field :password_confirmation, password_field_options_for(current_user || params["reset_password_token"]).except(:help_text) %>
             </div>
 
             <div class="actions">
@@ -28,7 +28,9 @@
             </div>
           <% end %>
 
-          <%= render "decidim/devise/shared/links" %>
+          <% unless current_user %>
+            <%= render "decidim/devise/shared/links" %>
+          <% end %>
         </div>
       </div>
     </div>

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

@@ -14,7 +14,7 @@
         <div class="card__content">
           <%= decidim_form_for(resource, namespace: "password", as: resource_name, url: password_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
             <div class="field">
-              <%= f.email_field :email, autofocus: true %>
+              <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
             </div>
 
             <div class="actions">

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

@@ -6,7 +6,7 @@
   <%= invisible_captcha %>
 
   <div class="field">
-    <%= f.email_field :email %>
+    <%= f.email_field :email, autocomplete: "email" %>
   </div>
 
   <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
@@ -16,19 +16,19 @@
   <% end %>
 
   <div class="field">
-    <%= f.password_field :password, autocomplete: "off" %>
+    <%= f.password_field :password, password_field_options_for(current_user) %>
   </div>
 
   <div class="field">
-    <%= f.password_field :password_confirmation %>
+    <%= f.password_field :password_confirmation, password_field_options_for(current_user).except(:help_text) %>
   </div>
 
   <div class="field">
-    <%= f.password_field :current_password %>
+    <%= f.password_field :current_password, autocomplete: "current-password" %>
   </div>
 
   <div class="field">
-    <%= f.text_field :name %>
+    <%= f.text_field :name, autocomplete: "name" %>
   </div>
 
   <div><%= f.submit t("devise.registrations.edit.update") %></div>

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

@@ -34,26 +34,26 @@
 
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help") %>
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "name" %>
               </div>
             </div>
 
             <div class="user-nickname">
               <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 } %>
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "nickname" %>
               </div>
             </div>
 
             <div class="field">
-              <%= f.email_field :email %>
+              <%= f.email_field :email, autocomplete: "email" %>
             </div>
 
             <div class="field">
-              <%= f.password_field :password, help_text: t(".password_help", minimun_characters: ::PasswordValidator::MINIMUM_LENGTH), autocomplete: "off" %>
+              <%= f.password_field :password, password_field_options_for(:user) %>
             </div>
 
             <div class="field">
-              <%= f.password_field :password_confirmation %>
+              <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
             </div>
           </div>
         </div>

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

@@ -33,10 +33,10 @@
               <%= decidim_form_for(resource, namespace: "session", as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
                 <div>
                   <div class="field">
-                    <%= f.email_field :email %>
+                    <%= f.email_field :email, autocomplete: "email" %>
                   </div>
                   <div class="field">
-                    <%= f.password_field :password, autocomplete: "off" %>
+                    <%= f.password_field :password, autocomplete: "current-password" %>
                   </div>
                 </div>
                   <% if devise_mapping.rememberable? %>

data/app/views/decidim/{data_portability → download_your_data}/show.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("my_data", scope: "layouts.decidim.user_profile")) %>
 <% content_for(:subtitle) { t("my_data", scope: "layouts.decidim.user_profile") } %>
 
-<div class="data-portability">
+<div class="row download-your-data">
   <strong><%= t(".download_data") %></strong>
   <p><%= t(".download_data_description", user_email: current_user.email).html_safe %></p>
-  <%= button_to t(".request_data"), export_data_portability_path, class: "button", data: { disable: true } %>
+  <%= button_to t(".request_data"), export_download_your_data_path, class: "button", data: { disable: true } %>
 </div>

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

@@ -0,0 +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>
+</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" %>
+</p>

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

@@ -7,7 +7,7 @@
     <div class="columns mediumlarge-4 large-3">
       <div class="card card--secondary show-for-mediumlarge">
         <%= filter_form_for filter, last_activities_path do |form| %>
-          <%= form.collection_radio_buttons :resource_type, resource_types, :first, :last, legend_title: t(".resource_type") %>
+          <%= form.collection_radio_buttons :with_resource_type, resource_types, :first, :last, legend_title: t(".resource_type") %>
         <% end %>
       </div>
     </div>

data/app/views/decidim/manifests/show.json.erb

@@ -0,0 +1,31 @@
+{
+  "name": "<%= organization_params.html_name %>",
+  "lang": "<%= organization_params.default_locale %>",
+  "description": "<%= organization_params.translated_description %>",
+  "display": "<%= organization_params.pwa_display %>",
+  "start_url": "<%= organization_params.start_url %>",
+  "theme_color": "<%= organization_params.colors["theme"] %>",
+  "background_color": "<%= organization_params.colors["theme"] %>",
+  "icons": [
+    {
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :small %>",
+      "sizes": "32x32",
+      "type": "image/png"
+    },
+    {
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :medium %>",
+      "sizes": "180x180",
+      "type": "image/png"
+    },
+    {
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :big %>",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :huge %>",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ]
+}

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

@@ -6,17 +6,19 @@
       </div>
     </div>
     <div class="row">
-      <div class="row columns mentions__container">
+      <div class="row columns multiple-mentions" data-name="recipient_id[]" data-multiple="true">
         <label for="add_conversation_users"><%= t(".add_max_users") %></label>
         <input id="add_conversation_users" type="text"
-            class="js-multiple-mentions mentions__container"
+            spellcheck="false"
+            autocomplete="off"
             placeholder="<%= t(".add_users_placeholder") %>"
             data-noresults="<%= t(".no_results") %>"
+            data-selected="multiple-mentions-selected"
             contenteditable="true"
             data-direct-messages-disabled="<%= t("decidim.messaging.conversations.add_conversation_users.participant_with_disabled_message_reception") %>">
       </div>
       <div class="columns large-12">
-        <div class="js-multiple-mentions-recipients"></div>
+        <ul class="multiple-mentions-selected"></ul>
       </div>
     </div>
   </div>

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

@@ -5,7 +5,7 @@
 
   <%= decidim_form_for form, url: decidim.conversation_path(conversation.id), method: :put, remote: true do |f| %>
     <%= f.label :body, nil, class: "show-for-sr" %>
-    <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder") %>
+    <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t(".placeholder"), data: { input_emoji: true } %>
 
     <%= f.submit t(".send"), class: "button pull-right", data: { disable: true } %>
   <% end %>

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

@@ -6,13 +6,11 @@
   </h2>
 
   <%= decidim_form_for form, url: decidim.conversations_path, remote: true do |f| %>
-    <%= form_required_explanation %>
-
     <% @form.recipient.each do |recipient| %>
       <%= f.hidden_field :recipient_id, id: nil, name: "conversation[recipient_id][]", value: recipient.id %>
     <% end %>
     <%= f.label :body, nil, class: "show-for-sr" %>
-    <%= f.text_area :body, label: false, rows: 4, required: true %>
+    <%= f.text_area :body, label: false, rows: 4, required: true, data: { input_emoji: true } %>
 
     <%= f.submit t(".send") %>
   <% end %>

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

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

data/app/views/decidim/notifications_digest_mailer/_email_content.html.erb

@@ -0,0 +1,11 @@
+<div class="email-content-notification">
+  <span class="email-notification-date"> <%= notification.date_time %> </span>
+  <p class="email-instructions">
+    <%= notification.email_intro %>
+  </p>
+  <% if notification.resource_path.present? && notification.resource_title.present? %>
+    <p class="email-button email-button__cta">
+      <%= link_to notification.resource_title, notification.resource_url %>
+    </p>
+  <% end %>
+</div>

data/app/views/decidim/notifications_digest_mailer/digest_mail.erb

@@ -0,0 +1,27 @@
+<div class="email-notifications-digest">
+  <div>
+    <p class="email-header"> <%= @notifications_digest.header %> </p>
+    <p class="email-header email-header--right"> <%= @notifications_digest.formated_date(Date.today) %> </p>
+  </div>
+
+  <p class="email-greeting"><%= @notifications_digest.greeting %></p>
+  <p class="email-intro"><%= @notifications_digest.intro %></p>
+
+  <div class="email-content-notifications">
+    <% length = @notifications.size - 1 %>
+    <% @notifications.each_with_index do |notification, i| %>
+      <%= render("decidim/notifications_digest_mailer/email_content", notification: notification) %>
+      <% if i < length %>
+        <hr class="email-element-separator">
+      <% end %>
+    <% end %>
+  </div>
+
+  <% if(@display_see_more_message) %>
+    <div>
+      <%= link_to @notifications_digest.see_more, decidim.notifications_url(host: @organization.host), class: "email-btn" %>
+    </div>
+  <% end %>
+
+  <p class="email-closing"><%= @notifications_digest.outro %></p>
+</div>

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

@@ -1,60 +1,87 @@
 <% add_decidim_page_title(t("notifications_settings", scope: "layouts.decidim.user_profile")) %>
 <% content_for(:subtitle) { t("notifications_settings", scope: "layouts.decidim.user_profile") } %>
 
-<%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
-  <p><strong><%= t(".receive_notifications_about") %></strong></p>
-  <div class="switch tiny switch-with-label notifications_from_own_activity">
-    <%= f.label :notifications_from_own_activity do %>
-      <%= f.check_box :notifications_from_own_activity, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".own_activity") %></span>
-    <% end %>
-  </div>
-  <div class="switch tiny switch-with-label notifications_from_followed">
-    <%= f.label :notifications_from_followed do %>
-      <%= f.check_box :notifications_from_followed, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".everything_followed") %></span>
-    <% end %>
-  </div>
-
-  <p><strong><%= t(".send_notifications_by_email") %></strong></p>
-  <div class="switch tiny switch-with-label email_on_notification">
-    <%= f.label :email_on_notification do %>
-      <%= f.check_box :email_on_notification, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".email_on_notification") %></span>
-    <% end %>
-  </div>
-
-  <p><strong><%= t(".newsletters") %></strong></p>
-  <div class="switch tiny switch-with-label newsletter_notifications">
-    <label>
-      <%= f.check_box :newsletter_notifications, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".newsletter_notifications") %></span>
-    </label>
-  </div>
-
-  <p><strong><%= t(".direct_messages") %></strong></p>
-  <div class="switch tiny switch-with-label allow_public_contact">
-    <label>
-      <%= f.check_box :allow_public_contact, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".allow_public_contact") %></span>
-    </label>
-  </div>
-
-  <% if @notifications_settings.user_is_moderator?(current_user) %>
-    <p><strong><%= t(".administrators") %></strong></p>
-    <div class="switch tiny switch-with-label email_on_moderations">
+<div class="row mb-m">
+  <%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
+    <p><strong><%= t(".receive_notifications_about") %></strong></p>
+    <div class="switch tiny switch-with-label notifications_from_own_activity">
+      <%= f.label :notifications_from_own_activity do %>
+        <%= f.check_box :notifications_from_own_activity, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t(".own_activity") %></span>
+      <% end %>
+    </div>
+    <div class="switch tiny switch-with-label notifications_from_followed">
+      <%= f.label :notifications_from_followed do %>
+        <%= f.check_box :notifications_from_followed, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t(".everything_followed") %></span>
+      <% end %>
+    </div>
+
+    <p><strong><%= t(".notifications_sending_frequency") %></strong></p>
+    <%= f.collection_radio_buttons :notifications_sending_frequency, frequencies_collection, :first, :last, { checked: @notifications_settings.notifications_sending_frequency || "daily" } %>
+
+    <p><strong><%= t(".newsletters") %></strong></p>
+    <div class="switch tiny switch-with-label newsletter_notifications">
       <label>
-        <%= f.check_box :email_on_moderations, label: false, class: "switch-input" %>
+        <%= f.check_box :newsletter_notifications, label: false, class: "switch-input" %>
         <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".email_on_moderations") %></span>
+        <span class="switch-label"><%= t(".newsletter_notifications") %></span>
       </label>
     </div>
-  <% end %>
 
-  <%= f.submit t(".update_notifications_settings") %>
-<% end %>
+    <p><strong><%= t(".direct_messages") %></strong></p>
+    <div class="switch tiny switch-with-label allow_public_contact">
+      <label>
+        <%= f.check_box :allow_public_contact, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t(".allow_public_contact") %></span>
+      </label>
+    </div>
+
+    <% if @notifications_settings.user_is_moderator?(current_user) %>
+      <p><strong><%= t(".administrators") %></strong></p>
+      <div class="switch tiny switch-with-label email_on_moderations">
+        <label>
+          <%= f.check_box :email_on_moderations, label: false, class: "switch-input" %>
+          <span class="switch-paddle"></span>
+          <span class="switch-label"><%= t(".email_on_moderations") %></span>
+        </label>
+      </div>
+
+      <% Decidim.notification_settings_registry.manifests.filter{ |a| a.settings_area == :administrators }.each do |manifest| %>
+        <div class="switch tiny switch-with-label notification_settings">
+          <label>
+            <%= f.check_box "notification_settings[#{manifest.name}]",
+                            checked: ["1", true].include?(current_user.notification_settings.fetch(manifest.name.to_s, manifest.default_value)),
+                            label: false,
+                            class: "switch-input" %>
+            <span class="switch-paddle"></span>
+            <span class="switch-label"><%= t(".notification_settings.#{manifest.name}") %></span>
+          </label>
+        </div>
+      <% end %>
+
+    <% end %>
+
+    <% if @notifications_settings.meet_push_notifications_requirements? %>
+      <div class="push-notifications js-sw-mandatory">
+        <p><strong><%= t(".push_notifications") %></strong></p>
+        <p id="push-notifications-reminder" class="push-notifications__reminder"><i><%= t(".push_notifications_reminder") %></i></p>
+        <div class="switch tiny switch-with-label allow_push_notifications">
+          <label>
+            <%= check_box_tag :allow_push_notifications, 0, false, class: "switch-input" %>
+            <span class="switch-paddle"></span>
+            <span class="switch-label"><%= t(".allow_push_notifications") %></span>
+          </label>
+        </div>
+      </div>
+
+      <input id="vapidPublicKey" name="vapid_public_key" type="hidden" value="<%= Base64.urlsafe_decode64(Rails.application.secrets.vapid[:public_key]).bytes %>">
+      <input id="subKeys" name="sub_key" type="hidden" value="<%= current_user.notifications_subscriptions.keys %>">
+    <% end %>
+
+    <%= f.submit t(".update_notifications_settings") %>
+  <% end %>
+</div>

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

@@ -0,0 +1,9 @@
+<div id="offline-fallback-html" style="text-align:center;padding:1rem">
+  <svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
+    <path
+    d="m20.293 4-1.477 1.477A4.473 4.473 0 0 0 11.17 7.33 4.362 4.362 0 0 0 9.5 7a4.486 4.486 0 0 0-4.23 3.01 4.49 4.49 0 0 0 .042 8.971L4 20.293l.707.707L21 4.707zM19.99 8.21a3.936 3.936 0 0 0-.16-.92L8.12 19H18.5a5.497 5.497 0 0 0 1.49-10.79z"
+    style="fill:#1a181d" />
+  </svg>
+  <h3><%= t(".message") %></h3>
+  <button class="button large button--sc mt-s" onclick="location.reload()"><%= t(".retry") %></button>
+</div>

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

@@ -10,7 +10,7 @@
 
     <div class="columns small-12">
       <div class="card">
-        <div class="card__content"><%= decidim_sanitize translated_attribute page.content %></div>
+        <div class="card__content"><%= decidim_sanitize_editor translated_attribute page.content %></div>
       </div>
     </div>
 

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