decidim-core 0.29.6 → 0.30.0.rc1

data/app/services/decidim/open_data_exporter.rb

@@ -9,48 +9,86 @@ module Decidim
   class OpenDataExporter
     FILE_NAME_PATTERN = "%{host}-open-data-%{entity}.csv"
 
-    attr_reader :organization, :path
+    attr_reader :organization, :path, :resource, :help_definition
+
+    include Decidim::TranslatableAttributes
 
     # Public: Initializes the class.
     #
     # organization - The Organization to export the data from.
     # path         - The String path where to write the zip file.
-    def initialize(organization, path)
+    # resource     - The String of the component or participatory space to export. If nil, it will export all.
+    def initialize(organization, path, resource = nil)
       @organization = organization
       @path = File.expand_path path
+      @resource = resource
+      @help_definition = {}
     end
 
     def export
       dirname = File.dirname(path)
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-      File.binwrite(path, data)
+      if resource.nil?
+        File.binwrite(path, data_for_all_resources)
+      else
+        File.write(path, data_for_resource(resource))
+      end
     end
 
     private
 
-    def data
+    def data_for_all_resources
       buffer = Zip::OutputStream.write_buffer do |out|
+        core_data_manifests.each do |manifest|
+          add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_core(manifest).read)
+        end
         open_data_component_manifests.each do |manifest|
-          add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_component(manifest))
+          add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_component(manifest).read)
         end
         open_data_participatory_space_manifests.each do |manifest|
-          add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_participatory_space(manifest))
+          add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_participatory_space(manifest).read)
         end
+
+        add_file_to_output(out, "README.md", readme)
+        add_file_to_output(out, "LICENSE.md", license)
       end
 
       buffer.string
     end
 
+    def data_for_core(export_manifest)
+      collection = export_manifest.collection.call(organization)
+      exporter = Decidim::Exporters::CSV.new(collection, export_manifest.serializer)
+
+      get_help_definition(:core, exporter, export_manifest) unless collection.empty?
+
+      exporter.export
+    end
+
+    def data_for_resource(resource)
+      export_manifest = (core_data_manifests + open_data_component_manifests + open_data_participatory_space_manifests)
+                        .select { |manifest| manifest.name == resource.to_sym }.first
+
+      case export_manifest.respond_to?(:manifest) && export_manifest.manifest
+      when Decidim::ComponentManifest
+        data_for_component(export_manifest).read
+      when Decidim::ParticipatorySpaceManifest
+        data_for_participatory_space(export_manifest).read
+      else
+        data_for_core(export_manifest).read
+      end
+    end
+
     def data_for_component(export_manifest, col_sep = Decidim.default_csv_col_sep)
       headers = []
       collection = []
       ActiveRecord::Base.uncached do
-        components.where(manifest_name: export_manifest.manifest.name).find_each do |component|
+        components.where(manifest_name: export_manifest.manifest.name).unscope(:order).find_each do |component|
           export_manifest.collection.call(component).find_in_batches(batch_size: 100) do |batch|
-            exporter = Decidim::Exporters::CSV.new(batch, export_manifest.serializer)
+            serializer = export_manifest.open_data_serializer.nil? ? export_manifest.serializer : export_manifest.open_data_serializer
+            exporter = Decidim::Exporters::CSV.new(batch, serializer)
             headers.push(*exporter.headers)
             exported = exporter.export
-
             tmpdir = Dir::Tmpname.create(export_manifest.name.to_s) do
               # just get an empty file name
             end
@@ -59,6 +97,8 @@ module Decidim
             File.write(filename, exported.read)
 
             collection.push(filename)
+
+            get_help_definition(:components, exporter, export_manifest) unless collection.empty?
           end
         end
       end
@@ -76,16 +116,102 @@ module Decidim
     end
 
     def data_for_participatory_space(export_manifest)
-      collection = participatory_spaces.filter { |space| space.manifest.name == export_manifest.manifest.name }.flat_map do |participatory_space|
+      collection = participatory_spaces.flat_map do |participatory_space|
         export_manifest.collection.call(participatory_space)
       end
+      serializer = export_manifest.open_data_serializer.nil? ? export_manifest.serializer : export_manifest.open_data_serializer
+      exporter = Decidim::Exporters::CSV.new(collection, serializer)
+      get_help_definition(:spaces, exporter, export_manifest) unless collection.empty?
+
+      exporter.export
+    end
+
+    def get_help_definition(manifest_type, exporter, export_manifest)
+      help_definition[manifest_type] = {} if help_definition[manifest_type].nil?
+      help_definition[manifest_type][export_manifest.name] = {} if help_definition[manifest_type][export_manifest.name].blank?
+      exporter.headers_without_locales.each do |header|
+        help_definition[manifest_type][export_manifest.name][header] = I18n.t("decidim.open_data.help.#{export_manifest.name}.#{header}")
+      end
+    end
+
+    def readme
+      "# #{I18n.t("decidim.open_data.help.core.title", organization: translated_attribute(organization.name))}\n\n
+#{I18n.t("decidim.open_data.help.core.description")}\n\n
+#{core_readme}
+#{space_readme}
+#{component_readme}
+"
+    end
+
+    def core_readme
+      return unless help_definition.fetch(:core, false)
+
+      readme_file = "## #{I18n.t("decidim.open_data.help.core.main")}\n\n"
+      help_definition.fetch(:core, []).each do |element, headers|
+        readme_file << "### #{element}\n\n"
+
+        headers.each do |header, help_value|
+          readme_file << "* #{header}: #{help_value}\n"
+        end
+
+        readme_file << "\n\n"
+      end
+      readme_file
+    end
+
+    def space_readme
+      return unless help_definition.fetch(:spaces, false)
+
+      readme_file = "## #{I18n.t("decidim.open_data.help.core.spaces")}\n\n"
+
+      help_definition.fetch(:spaces, []).each do |space, headers|
+        readme_file << "### #{space}\n\n"
+
+        headers.each do |header, help_value|
+          readme_file << "* #{header}: #{help_value}\n"
+        end
+
+        readme_file << "\n\n"
+      end
+      readme_file
+    end
+
+    def component_readme
+      return unless help_definition.fetch(:components, false)
+
+      readme_file = "## #{I18n.t("decidim.open_data.help.core.components")}\n\n"
+
+      help_definition.fetch(:components, []).each do |component, headers|
+        readme_file << "### #{component}\n\n"
+
+        headers.each do |header, help_value|
+          readme_file << "* #{header}: #{help_value}\n"
+        end
+
+        readme_file << "\n\n"
+      end
 
-      Decidim::Exporters::CSV.new(collection, export_manifest.serializer).export
+      readme_file
     end
 
-    def add_file_to_output(output, file_name, data)
+    def license
+      link_database = "#{I18n.t("license_database_name", scope: "decidim.open_data.index.license")}: #{I18n.t("license_database_link", scope: "decidim.open_data.index.license")}"
+      link_contents = "#{I18n.t("license_contents_name", scope: "decidim.open_data.index.license")}: #{I18n.t("license_contents_link", scope: "decidim.open_data.index.license")}"
+
+      license_file = I18n.t("title", scope: "decidim.open_data.index.license")
+      license_file << "\n\n"
+      license_file << I18n.t("body_1_html", scope: "decidim.open_data.index.license", organization_name: translated_attribute(organization.name), link_database:, link_contents:)
+
+      license_file
+    end
+
+    def add_file_to_output(output, file_name, string)
       output.put_next_entry(file_name)
-      output.write data.read
+      output.write string
+    end
+
+    def core_data_manifests
+      @core_data_manifests ||= Decidim.open_data_manifests.select(&:include_in_open_data)
     end
 
     def open_data_component_manifests

data/app/services/decidim/static_map_generator.rb

@@ -15,7 +15,7 @@ module Decidim
     def data
       return if @resource.blank? || map_utility.nil?
 
-      Rails.cache.fetch(@resource.cache_key_with_version) do
+      Rails.cache.fetch(@resource.cache_key) do
         map_utility.image_data(
           latitude: @resource.latitude,
           longitude: @resource.longitude,

data/app/services/decidim/traceability.rb

@@ -69,6 +69,19 @@ module Decidim
       end
     end
 
+    # Performs the given block and sets the author of the action without log.
+    #
+    # author - An object that implements `to_gid` or a String
+    #
+    # Returns whatever the given block returns.
+    def perform_action_without_log!(author)
+      PaperTrail.request(whodunnit: gid(author)) do
+        Decidim::ApplicationRecord.transaction do
+          block_given? ? yield : nil
+        end
+      end
+    end
+
     # Updates the `resource` with `update!` and sets the author of the version.
     #
     # resource - An ActiveRecord instance that implements `Decidim::Traceable`

data/app/uploaders/decidim/application_uploader.rb

@@ -60,7 +60,7 @@ module Decidim
     end
 
     def variant_path(key, options = {})
-      variant_url(key, **options.merge(only_path: true))
+      variant_url(key, **options, only_path: true)
     end
 
     def remote_url=(url)

data/app/validators/etiquette_validator.rb

@@ -6,9 +6,11 @@ class EtiquetteValidator < ActiveModel::EachValidator
   include ActionView::Helpers::SanitizeHelper
 
   def validate_each(record, attribute, value)
+    return unless Decidim.enable_etiquette_validator
     return if value.blank?
 
-    text_value = strip_tags(value)
+    # remove HTML tags, from WYSIWYG editor
+    text_value = clean_value(value)
 
     validate_caps(record, attribute, text_value)
     validate_marks(record, attribute, text_value)
@@ -17,8 +19,13 @@ class EtiquetteValidator < ActiveModel::EachValidator
 
   private
 
+  def clean_value(value)
+    ActionController::Base.helpers.strip_tags(value).to_s.strip
+  end
+
   def validate_caps(record, attribute, value)
-    return if value.scan(/[A-Z]/).length < value.length / 4
+    number_of_caps = value.scan(/[A-Z]/).length
+    return if number_of_caps.zero? || number_of_caps < value.length / 2 # 50%
 
     record.errors.add(attribute, options[:message] || :too_much_caps)
   end

data/app/validators/passthru_validator.rb

@@ -33,7 +33,7 @@ class PassthruValidator < ActiveModel::EachValidator
       value = dummy.public_send(dummy_attr)
     elsif dummy.respond_to? :file
       dummy.public_send("file=", value)
-      value = dummy.public_send(:file)
+      value = dummy.file
     end
 
     target_validators(attribute).each do |validator|

data/app/validators/password_validator.rb

@@ -55,9 +55,7 @@ class PasswordValidator < ActiveModel::EachValidator
   attr_reader :record, :attribute, :value
 
   def get_message(reason)
-    I18n.t! "password_validator.#{reason}"
-  rescue I18n::MissingTranslationData
-    I18n.t "password_validator.fallback"
+    I18n.t "password_validator.#{reason}"
   end
 
   def organization

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

@@ -1,8 +1,8 @@
 <div id="<%= dom_id(document) %>">
   <div class="card__list-content">
-    <span class="card__list-title">
+    <%= link_to document.url, target: "_blank", rel: "noopener noreferrer", class: "card__list-title", title: t("decidim.application.document.download") do %>
       <%= h attachment_title(document) %>
-    </span>
+    <% end %>
     <% if document.description.present? %>
       <div class="card__list-text"><%= decidim_escape_translated(document.description) %></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>