decidim-core 0.26.7 → 0.26.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d573b856227ec581d40d90cff9a85c1f21502a1ed6278b82aa9768a434f0e9c
-  data.tar.gz: 2ca2fff70b6e6b9314450c35ab22965b3ba60af303a2839c7716e502cb566b3a
+  metadata.gz: 7ddc4e551d59fc9b95f5121333870c4e91a77eb2f53d03f659d63e16bea7ca7f
+  data.tar.gz: dd766575d88dfe729ce7f8ea151967642b40e875c0596443962d0a6d8d5cd101
 SHA512:
-  metadata.gz: 1000d09afe7e9af0586fa14c917c77a150bf9f55adee9d0a243744799a9cf9c84aa364b0f014cdec6eda3855c10b4b15772732c979d9f15e381c8a62e78aad8f
-  data.tar.gz: 1a4feafaa713a4fa540aab815e0306f125cc74d45599d5defbec2e9dd2cce8bc6223acd0148424b3973a0f1d6853b96cd3ee9a6fda7ff45cc91073fd2b84ac8a
+  metadata.gz: dcbcc2625fe80e646c9f5e05c0e187485004542bcb73c33978bd8f2b1f78f31c2e0a4f4dba6904ba0b660e5b4408977a21d13e0c02fe2d46cba8bdb13c399321
+  data.tar.gz: a1abc1c25bfe4c99875d00822beeefeadb20bd214672772b1491d07e515ce3990b6b24c96d5400e4bc71d1accb8c8484d7e57c6ed006f63fd19e23f8378234ce

data/app/cells/decidim/collapsible_list/show.erb

@@ -16,7 +16,7 @@
     </span>
   </div>
 <% else %>
-  <div class="collapsible-list <%= list_class %>">
+  <div class="<%= list_class %>">
     <% list.each do |element| %>
       <% if cell_name %>
         <%= cell cell_name, element, cell_options %>

data/app/controllers/decidim/authorization_modals_controller.rb

@@ -17,7 +17,7 @@ module Decidim
     end
 
     def current_component
-      @current_component ||= Decidim::Component.find(params[:component_id])
+      @current_component ||= Decidim::Component.where(participatory_space: current_organization.participatory_spaces).find(params[:component_id])
     end
 
     def authorization_action

data/app/forms/url_validator.rb

@@ -6,7 +6,7 @@
 #
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors[attribute] << (options[:message] || "must be a valid URL") unless url_valid?(value)
+    record.errors.add attribute, :url_format, **options unless url_valid?(value)
   end
 
   # a URL may be technically well-formed but may

data/app/helpers/decidim/layout_helper.rb

@@ -74,8 +74,11 @@ module Decidim
       classes = _icon_classes(options) + ["external-icon"]
 
       if path.split(".").last == "svg"
+        icon_path = application_path(path)
+        return unless icon_path
+
         attributes = { class: classes.join(" ") }.merge(options)
-        asset = File.read(application_path(path))
+        asset = File.read(icon_path)
         asset.gsub("<svg ", "<svg#{tag_builder.tag_options(attributes)} ").html_safe
       else
         image_pack_tag(path, class: classes.join(" "), style: "display: none")
@@ -83,9 +86,17 @@ module Decidim
     end
 
     def application_path(path)
-      img_path = asset_pack_path(path)
-      img_path = URI(img_path).path if Decidim.cors_enabled
-      Rails.root.join("public/#{img_path}")
+      # Force the path to be returned without the protocol and host even when a
+      # custom asset host has been defined. The host parameter needs to be a
+      # non-nil because otherwise it will be set to the asset host at
+      # ActionView::Helpers::AssetUrlHelper#compute_asset_host.
+      img_path = asset_pack_path(path, host: "", protocol: :relative)
+      path = Rails.public_path.join(img_path.sub(%r{^/}, ""))
+      return unless File.exist?(path)
+
+      path
+    rescue ::Webpacker::Manifest::MissingEntryError
+      nil
     end
 
     # Allows to create role attribute according to accessibility rules

data/app/helpers/decidim/layout_helper.rb.orig

@@ -0,0 +1,225 @@
+# frozen_string_literal: true
+
+module Decidim
+  # View helpers related to the layout.
+  module LayoutHelper
+    include Decidim::ModalHelper
+    include Decidim::TooltipHelper
+
+    # Public: Generates a set of meta tags that generate the different favicon
+    # versions for an organization.
+    #
+    # Returns a safe String with the versions.
+    def favicon
+      return if current_organization.favicon.blank?
+
+      safe_join(Decidim::OrganizationFaviconUploader::SIZES.map do |version, size|
+        favicon_link_tag(current_organization.attached_uploader(:favicon).variant_url(version, host: current_organization.host), sizes: "#{size}x#{size}")
+      end)
+    end
+
+    def apple_favicon
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(:medium, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image, rel: "apple-touch-icon", type: "image/png")
+    end
+
+    def legacy_favicon
+      variant = :favicon if current_organization.favicon.content_type != "image/vnd.microsoft.icon"
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(variant, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image, rel: "icon", sizes: "any", type: nil)
+    end
+
+    # Outputs an SVG-based icon.
+    #
+    # name    - The String with the icon name.
+    # options - The Hash options used to customize the icon (default {}):
+    #             :width  - The Number of width in pixels (optional).
+    #             :height - The Number of height in pixels (optional).
+    #             :title - The title for the SVG element (optional, similar to alt for img)
+    #             :aria_label - The String to set as aria label (optional).
+    #             :aria_hidden - The Truthy value to enable aria_hidden (optional).
+    #             :role - The String to set as the role (optional).
+    #             :class - The String to add as a CSS class (optional).
+    #
+    # Returns a String.
+    def redesigned_icon(name, options = {})
+      default_html_properties = {
+        "width" => "1em",
+        "height" => "1em",
+        "role" => "img",
+        "aria-hidden" => "true"
+      }
+
+      html_properties = options.with_indifferent_access.transform_keys(&:dasherize).slice("width", "height", "aria-label", "role", "aria-hidden", "class", "style")
+      html_properties = default_html_properties.merge(html_properties)
+
+      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
+
+      content_tag :svg, html_properties do
+        content_tag :use, nil, "href" => "#{href}#ri-#{name}", tabindex: -1
+      end
+    end
+
+    def legacy_icon(name, options = {})
+      options = options.with_indifferent_access
+      html_properties = {}
+
+      html_properties["width"] = options[:width]
+      html_properties["height"] = options[:height]
+      html_properties["aria-label"] = options[:aria_label] || options[:"aria-label"]
+      html_properties["role"] = options[:role] || "img"
+      html_properties["aria-hidden"] = options[:aria_hidden] || options[:"aria-hidden"]
+
+      html_properties["class"] = (["icon--#{name}"] + _icon_classes(options)).join(" ")
+
+      title = options["title"] || html_properties["aria-label"]
+      if title.blank? && html_properties["role"] == "img"
+        # This will make the accessibility audit tools happy as with the "img"
+        # role, the alternative text (aria-label) and title are required for the
+        # element. This will also force the SVG to be hidden because otherwise
+        # the screen reader would announce the icon name which can be in
+        # different language (English) than the page language which is not
+        # allowed.
+        title = name
+        html_properties["aria-label"] = title
+        html_properties["aria-hidden"] = true
+      end
+
+      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg")
+
+      content_tag :svg, html_properties do
+        inner = content_tag :title, title
+        inner += content_tag :use, nil, "href" => "#{href}#icon-#{name}"
+
+        inner
+      end
+    end
+
+    def icon(*args)
+      redesign_enabled? ? redesigned_icon(*args) : legacy_icon(*args)
+    end
+
+    # Outputs a SVG icon from an external file. It apparently renders an image
+    # tag, but then a JS script kicks in and replaces it with an inlined SVG
+    # version.
+    #
+    # path    - The asset's path
+    #
+    # Returns an <img /> tag with the SVG icon.
+    def external_icon(path, options = {})
+      classes = _icon_classes(options) + ["external-icon"]
+
+      if path.split(".").last == "svg"
+        icon_path = application_path(path)
+        return unless icon_path
+
+        attributes = { class: classes.join(" ") }.merge(options)
+        asset = File.read(icon_path)
+        asset.gsub("<svg ", "<svg#{tag_builder.tag_options(attributes)} ").html_safe
+      else
+        image_pack_tag(path, class: classes.join(" "), style: "display: none")
+      end
+    end
+
+    def application_path(path)
+      # Force the path to be returned without the protocol and host even when a
+      # custom asset host has been defined. The host parameter needs to be a
+      # non-nil because otherwise it will be set to the asset host at
+      # ActionView::Helpers::AssetUrlHelper#compute_asset_host.
+      img_path = asset_pack_path(path, host: "", protocol: :relative)
+      path = Rails.public_path.join(img_path.sub(%r{^/}, ""))
+      return unless File.exist?(path)
+
+      path
+    rescue ::Webpacker::Manifest::MissingEntryError
+      nil
+    end
+
+    # Allows to create role attribute according to accessibility rules
+    #
+    # Returns role attribute string if role option is specified
+    def role(options = {})
+      "role=\"#{options[:role]}\" " if options[:role]
+    end
+
+    def _icon_classes(options = {})
+      classes = options[:remove_icon_class] ? [] : ["icon"]
+      classes += [options[:class]]
+      classes.compact
+    end
+
+    def extended_navigation_bar(items, max_items: 5)
+      return unless items.any?
+
+      extra_items = items.slice((max_items + 1)..-1) || []
+      active_item = items.find { |item| item[:active] }
+
+      controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
+        items:,
+        extra_items:,
+        active_item:,
+        max_items:
+      }
+    end
+
+    # Renders a view with the customizable CSS variables in two flavours:
+    # 1. as a hexadecimal valid CSS color (ie: #ff0000)
+    # 2. as a disassembled RGB components (ie: 255 0 0)
+    #
+    # Example:
+    #
+    # --primary: #ff0000;
+    # --primary-rgb: 255,0,0
+    #
+    # Hexadecimal variables can be used as a normal CSS color:
+    #
+    # color: var(--primary)
+    #
+    # While the disassembled variant can be used where you need to manipulate
+    # the color somehow (ie: adding a background transparency):
+    #
+    # background-color: rgba(var(--primary-rgb), 0.5)
+    def organization_colors
+      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex} #{v[3..4].hex} #{v[5..6].hex};" }.join
+      render partial: "layouts/decidim/organization_colors", locals: { css: }
+    end
+
+<<<<<<< HEAD
+    def current_user_unread_data
+      return {} if current_user.blank?
+
+      {}.tap do |d|
+        d.merge!(unread_notifications: true) if current_user.notifications.any?
+        d.merge!(unread_conversations: true) if current_user.unread_conversations.any?
+        d.merge!(unread_items: d.present?)
+      end
+    end
+
+||||||| parent of 53b6893e5c (Use local emojibase data instead of CDN)
+=======
+    # Public: Gets the name of the webpacker entrypoint that will be used
+    # for the locale of the Emojibase NPM package, used with @picmo/popup-picker
+    #
+    # Returns a string with the entrypoint name
+    def emojibase_entrypoint_locale
+      entrypoint = Decidim::Webpacker.configuration.entrypoints.keys.select do |entry|
+        entry == "decidim_emojibase_#{I18n.locale}"
+      end
+
+      return "decidim_emojibase_en" if entrypoint.empty?
+
+      entrypoint.first
+    end
+
+>>>>>>> 53b6893e5c (Use local emojibase data instead of CDN)
+    private
+
+    def tag_builder
+      @tag_builder ||= ActionView::Helpers::TagHelper::TagBuilder.new(self)
+    end
+  end
+end

data/app/models/decidim/organization.rb

@@ -87,6 +87,12 @@ module Decidim
       @top_scopes ||= scopes.top_level
     end
 
+    def participatory_spaces
+      @participatory_spaces ||= Decidim.participatory_space_manifests.flat_map do |manifest|
+        manifest.participatory_spaces.call(self)
+      end
+    end
+
     def public_participatory_spaces
       @public_participatory_spaces ||= Decidim.participatory_space_manifests.flat_map do |manifest|
         manifest.participatory_spaces.call(self).public_spaces

data/app/packs/src/decidim/map/controller/drag_marker.js

@@ -1,6 +1,4 @@
-import * as L from "leaflet";
 import MapController from "src/decidim/map/controller"
-import "src/decidim/vendor/leaflet-tilelayer-here"
 
 export default class MapDragMarkerController extends MapController {
   start() {

data/app/packs/src/decidim/map/controller/markers.js

@@ -1,5 +1,4 @@
 import "src/decidim/vendor/jquery-tmpl"
-import * as L from "leaflet";
 import MapController from "src/decidim/map/controller"
 import "leaflet.markercluster";
 

data/app/packs/src/decidim/map/controller/static.js

@@ -1,4 +1,3 @@
-import * as L from "leaflet";
 import MapController from "src/decidim/map/controller"
 
 const openLink = window.open;

data/app/packs/src/decidim/map/controller.js

@@ -1,5 +1,3 @@
-import * as L from "leaflet";
-import "src/decidim/map/icon"
 import MapControllerRegistry from "src/decidim/map/controller_registry"
 
 export default class MapController {

data/app/packs/src/decidim/map/factory.js

@@ -1,3 +1,5 @@
+import "src/decidim/map/icon"
+
 import MapMarkersController from "src/decidim/map/controller/markers"
 import MapStaticController from "src/decidim/map/controller/static"
 import MapDragMarkerController from "src/decidim/map/controller/drag_marker"
@@ -22,7 +24,8 @@ import MapDragMarkerController from "src/decidim/map/controller/drag_marker"
  *   window.Decidim.createMapController = (mapId, config) => {
  *     if (config.type === "custom") {
  *       // Obviously you need to implement CustomMapController for this to
- *       // work.
+ *       // work. You can find an example at:
+ *       // decidim-dev/app/packs/src/decidim/dev/test/custom_map_factory.js
  *       return new window.Decidim.CustomMapController(mapId, config);
  *     }
  *

data/app/packs/src/decidim/map/icon.js

@@ -1,4 +1,3 @@
-import * as L from "leaflet";
 import { SVGIcon } from "leaflet-svgicon"
 
 L.DivIcon.SVGIcon = SVGIcon;

data/app/packs/src/decidim/map/legacy.js

@@ -1,6 +1,5 @@
 /* eslint-disable require-jsdoc */
 
-import * as L from "leaflet";
 import "src/decidim/map/factory"
 
 /**

data/app/packs/src/decidim/map/provider/default.js

@@ -1,3 +1,5 @@
+import "leaflet"
+
 /**
  * NOTE:
  * This has to load before decidim/map in order for it to apply correctly when

data/app/packs/src/decidim/map/provider/here.js

@@ -1,4 +1,5 @@
-import * as L from "leaflet"
+import "leaflet"
+import "src/decidim/vendor/leaflet-tilelayer-here"
 
 /**
  * NOTE:

data/app/packs/stylesheets/decidim/modules/_dropdown_menu.scss

@@ -0,0 +1,9 @@
+.dropdown.menu > li {
+  &.is-active > a {
+    color: var(--secondary);
+  }
+
+  &.is-dropdown-submenu-parent > a::after {
+    border-color: var(--secondary) transparent transparent;
+  }
+}

data/app/queries/decidim/metrics/users_metric_manage.rb

@@ -11,15 +11,15 @@ module Decidim
       private
 
       def query
-        return @query if @query
-
-        @query = Decidim::User.where(organization: @organization)
-        @query = @query.where("created_at <= ?", end_time)
-        @query
+        @query ||= Decidim::User.where(organization: @organization)
+                                .where("deleted_at IS NULL OR deleted_at > ?", end_time)
+                                .where("blocked_at IS NULL OR blocked_at > ?", end_time)
+                                .confirmed
+                                .where("created_at <= ?", end_time)
       end
 
       def quantity
-        @quantity ||= @query.where("created_at >= ?", start_time).count
+        @quantity ||= query.where("created_at >= ?", start_time).count
       end
     end
   end

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

@@ -0,0 +1,231 @@
+<% add_decidim_page_title(t(".sign_up")) %>
+
+<% content_for :devise_links do %>
+  <%= render "decidim/devise/shared/links" %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="flex justify-center">
+    <h1 class="h3 md:h1 decorator my-12"><%= t("decidim.devise.registrations.new.sign_up") %></h1>
+  </div>
+
+  <div class="login__info">
+    <p>
+      <%= t("decidim.devise.registrations.new.subtitle") %>
+    </p>
+    <p class="font-semibold">
+      <%= t("decidim.devise.registrations.new.already_have_an_account?") %>
+      <%= link_to t("decidim.devise.registrations.new.sign_in"), new_user_session_path %>
+    </p>
+  </div>
+
+  <div class="login__info-required">
+    <%= form_required_explanation %>
+  </div>
+
+  <div class="login__omniauth-container">
+    <% cache current_organization do %>
+      <%= render "decidim/devise/shared/omniauth_buttons" %>
+    <% end %>
+  </div>
+
+  <%= 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">
+      <%= f.text_field :name, help_text: t("decidim.devise.registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
+
+      <%= f.text_field :nickname, help_text: t("decidim.devise.registrations.new.nickname_help", organization: current_organization.name), autocomplete: "nickname", placeholder: "johndoe" %>
+
+      <%= f.email_field :email, autocomplete: "email", placeholder: "hi@email.com" %>
+
+      <%= f.password_field :password, password_field_options_for(:user) %>
+
+      <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
+    </div>
+
+    <div id="card__tos" class="form__wrapper-block">
+      <h4 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h4>
+
+      <div class="tos-text">
+        <% 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">
+      <h4 class="h4"><%= t("decidim.devise.registrations.new.newsletter_title") %></h4>
+      <%= f.check_box :newsletter, label: t("decidim.devise.registrations.new.newsletter"), checked: @form.newsletter, label_options: { class: "form__wrapper-checkbox-label" } %>
+    </div>
+
+    <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/redesigned_links" %>
+    </div>
+  <% end %>
+<% end %>
+
+<<<<<<< HEAD
+||||||| parent of 4e14afa36c (add password toggle via unobstructive javascript)
+  <div class="row">
+    <div class="columns large-6 medium-10 medium-centered">
+
+      <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
+        <%= invisible_captcha %>
+        <div class="card">
+          <div class="card__content">
+            <%= form_required_explanation %>
+
+            <div class="user-person">
+              <div class="field">
+                <%= 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 }, autocomplete: "nickname" %>
+              </div>
+            </div>
+
+            <div class="field">
+              <%= f.email_field :email, autocomplete: "email" %>
+            </div>
+
+            <div class="field">
+              <%= f.password_field :password, password_field_options_for(:user) %>
+            </div>
+
+            <div class="field">
+              <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__tos">
+          <div class="card__content">
+            <h3><%= t(".tos_title") %></h3>
+
+            <p class="tos-text">
+              <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
+            </p>
+
+            <div class="field">
+              <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__newsletter">
+          <div class="card__content">
+            <h3><%= t(".newsletter_title") %></h3>
+              <div class="field">
+                <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
+              </div>
+          </div>
+        </div>
+
+        <div class="card">
+          <div class="card__content">
+            <div class="actions">
+              <%= f.submit t("devise.registrations.new.sign_up"), class: "button expanded" %>
+            </div>
+            <%= yield :devise_links %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+</div>
+=======
+  <div class="row">
+    <div class="columns large-6 medium-10 medium-centered">
+
+      <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
+        <%= invisible_captcha %>
+        <div class="card">
+          <div class="card__content">
+            <%= form_required_explanation %>
+
+            <div class="user-person">
+              <div class="field">
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "off" %>
+              </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 }, autocomplete: "off" %>
+              </div>
+            </div>
+
+            <div class="field">
+              <%= f.email_field :email, autocomplete: "email" %>
+            </div>
+
+            <div class="user-password">
+              <div class="field">
+                <%= f.password_field :password, password_field_options_for(:user) %>
+              </div>
+            </div>
+
+            <div class="user-password-confirmation">
+              <div class="field">
+                <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__tos">
+          <div class="card__content">
+            <h3><%= t(".tos_title") %></h3>
+
+            <p class="tos-text">
+              <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
+            </p>
+
+            <div class="field">
+              <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__newsletter">
+          <div class="card__content">
+            <h3><%= t(".newsletter_title") %></h3>
+              <div class="field">
+                <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
+              </div>
+          </div>
+        </div>
+
+        <div class="card">
+          <div class="card__content">
+            <div class="actions">
+              <%= f.submit t("devise.registrations.new.sign_up"), class: "button expanded" %>
+            </div>
+            <%= yield :devise_links %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+</div>
+>>>>>>> 4e14afa36c (add password toggle via unobstructive javascript)
+<%= render "decidim/devise/shared/newsletter_modal" %>
+
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_registrations" %>
+<% end %>