decidim-decidim_awesome 0.8.3 → 0.9.1

data/app/permissions/decidim/decidim_awesome/admin/permissions.rb

@@ -11,10 +11,24 @@ module Decidim
           return permission_action unless user
           return permission_action if user.read_attribute("admin").blank?
 
-          toggle_allow(config_enabled?(permission_action.subject)) if permission_action.action == :edit_config
+          if permission_action.subject == :admin_accountability && DecidimAwesome.admin_accountability.respond_to?(:include?)
+            if global?
+              toggle_allow(DecidimAwesome.admin_accountability.include?(:admin_roles))
+            else
+              toggle_allow(DecidimAwesome.admin_accountability.include?(:participatory_space_roles))
+            end
+          elsif permission_action.action == :edit_config
+            toggle_allow(config_enabled?(permission_action.subject))
+          end
 
           permission_action
         end
+
+        private
+
+        def global?
+          context.fetch(:global)
+        end
       end
     end
   end

data/app/permissions/decidim/decidim_awesome/permissions.rb

@@ -18,13 +18,11 @@ module Decidim
 
         config = context.fetch(:awesome_config, {})
 
+        return allow! if user.admin?
         return allow! if config[:allow_images_in_proposals]
-
-        if user.admin
-          return allow! if config[:allow_images_in_small_editor]
-          return allow! if config[:allow_images_in_full_editor]
-          return allow! if config[:allow_images_in_markdown_editor]
-        end
+        return allow! if config[:allow_images_in_small_editor]
+        return allow! if config[:allow_images_in_full_editor]
+        return allow! if config[:allow_images_in_markdown_editor]
       end
     end
   end

data/app/presenters/decidim/decidim_awesome/paper_trail_base_presenter.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class PaperTrailBasePresenter
+      attr_reader :entry, :html
+
+      def initialize(entry, html: true)
+        @entry = entry
+        @html = html
+      end
+
+      # try to use the object in the database if exists
+      # Note that "reify" does not work on "create" events
+      def item
+        @item ||= entry&.item
+      end
+
+      def item_type
+        @item_type ||= entry&.item_type
+      end
+
+      def item_id
+        @item_id ||= entry&.item_id
+      end
+    end
+  end
+end

data/app/presenters/decidim/decidim_awesome/participatory_space_role_presenter.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class ParticipatorySpaceRolePresenter < RoleBasePresenter
+      # Finds the destroyed entry if exists
+      def destroy_entry
+        @destroy_entry ||= PaperTrail::Version.find_by(item_type: item_type, event: "destroy", item_id: item_id)
+      end
+
+      # roles are in the destroyed event if the role has been removed
+      def role
+        @role ||= destroy_item&.role || item&.role
+      end
+
+      def role_name
+        type = I18n.t(role, scope: "decidim.decidim_awesome.admin.admin_accountability.roles", default: role)
+        return type unless html && role_class
+
+        "<span class=\"#{role_class}\">#{type}</span>".html_safe
+      end
+
+      def user
+        @user ||= Decidim::User.find_by(id: entry.changeset["decidim_user_id"]&.last)
+      end
+
+      # participatory spaces is in the normal entry if the role hasn't been removed
+      # otherwise is in the removed role log entry
+      def participatory_space
+        item&.participatory_space || destroy_item&.participatory_space
+      end
+
+      private
+
+      def role_class
+        case role
+        when "admin"
+          "text-alert"
+        when "valuator"
+          "text-secondary"
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/decidim_awesome/role_base_presenter.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class RoleBasePresenter < PaperTrailBasePresenter
+      include TranslatableAttributes
+
+      # Finds the destroyed entry if exists
+      def destroy_entry
+        nil
+      end
+
+      alias destroyed? destroy_entry
+
+      # try to reconstruct a destroyed event
+      def destroy_item
+        @destroy_item ||= destroy_entry&.reify
+      end
+
+      def user
+        raise "Please implement this method to return the user object"
+      end
+
+      def role_name
+        raise "Please implement this method to return the role text"
+      end
+
+      def participatory_space
+        nil
+      end
+
+      def participatory_space_name
+        participatory_space_type.present? ? "#{participatory_space_type} > #{translated_attribute participatory_space&.title}" : ""
+      end
+
+      def participatory_space_type
+        I18n.t(participatory_space&.manifest&.name, scope: "decidim.admin.menu") if participatory_space.present?
+      end
+
+      # try to link to the user roles page or to the participatory space if not existing
+      def participatory_space_path
+        proxy.send("#{participatory_space.manifest.route_name}_user_roles_path")
+      rescue NoMethodError
+        begin
+          proxy.send("#{participatory_space.manifest.route_name}_path", participatory_space)
+        rescue NoMethodError
+          ""
+        end
+      end
+
+      def user_name
+        return I18n.t("missing_user", scope: "decidim.decidim_awesome.admin.admin_accountability") unless user
+        return I18n.t("deleted_user", scope: "decidim.decidim_awesome.admin.admin_accountability") if user.deleted?
+
+        user&.name
+      end
+
+      def user_email
+        user&.email || entry.changeset["email"]&.last
+      end
+
+      def created_at
+        entry.changeset["created_at"]&.last || entry&.created_at
+      end
+
+      def created_date
+        I18n.l(created_at, format: :short)
+      rescue I18n::ArgumentError
+        ""
+      end
+
+      def destroyed_at
+        destroy_entry&.created_at
+      end
+
+      def removal_date
+        I18n.l(destroyed_at, format: :short)
+      rescue I18n::ArgumentError
+        info_text("currently_active", klass: "text-success")
+      end
+
+      def last_sign_in_date
+        I18n.l(user&.last_sign_in_at, format: :short)
+      rescue I18n::ArgumentError
+        info_text("never_logged")
+      end
+
+      protected
+
+      def info_text(key, klass: :muted)
+        text = I18n.t(key, scope: "decidim.decidim_awesome.admin.admin_accountability")
+        return text unless html
+
+        "<span class=\"#{klass}\">#{text}</span>".html_safe
+      end
+
+      def proxy
+        @proxy ||= Decidim::EngineRouter.admin_proxy(participatory_space)
+      end
+    end
+  end
+end

data/app/presenters/decidim/decidim_awesome/user_entity_presenter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class UserEntityPresenter < RoleBasePresenter
+      # Finds the destroyed entry if exists
+      def destroy_entry
+        @destroy_entry ||= begin
+          query = PaperTrail::Version.where(item_type: item_type, event: "update", item_id: item_id)
+                                     .where("id > ?", entry.id)
+          if roles.include? "admin"
+            query.where("object_changes LIKE '%\nadmin:\n- true\n- false%'").first
+          else
+            query.where("object_changes LIKE '%\nroles:\n- - %'").first
+          end
+        end
+      end
+
+      def roles
+        @roles ||= begin
+          rls = entry.changeset["roles"]&.last || []
+          rls << "admin" if entry.changeset["admin"]&.last
+          rls
+        end
+      end
+
+      def role_name
+        types = roles.index_with { |role| I18n.t(role, scope: "decidim.decidim_awesome.admin.admin_accountability.admin_roles", default: role) }
+        return types.values.join(", ") unless html
+
+        types.map { |role, type| "<span class=\"#{role_class(role)}\">#{type}</span>" }.join(" ").html_safe
+      end
+
+      def user
+        @user ||= entry&.item || Decidim::User.find_by(id: entry.changeset["id"]&.last)
+      end
+
+      private
+
+      def role_class(role)
+        case role
+        when "admin"
+          "text-alert"
+        when "user_manager"
+          "text-secondary"
+        end
+      end
+    end
+  end
+end

data/app/serializers/decidim/decidim_awesome/paper_trail_version_serializer.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    # This class serializes a AdminAccountability so can be exported to CSV, JSON or other
+    # formats.
+    class PaperTrailVersionSerializer < Decidim::Exporters::Serializer
+      include Decidim::ApplicationHelper
+      include Decidim::ResourceHelper
+      include Decidim::TranslationsHelper
+
+      # Public: Initializes the serializer with a admin actions.
+      def initialize(log_entry)
+        @entry = log_entry.present(html: false)
+      end
+
+      # Public: Exports a hash with the serialized data for this admin action.
+      def serialize
+        {
+          role: entry.role_name,
+          user_name: entry.user_name,
+          user_email: entry.user_email,
+          user_role_type: entry.entry.item_type,
+          participatory_space_type: entry.participatory_space_type,
+          participatory_space_title: translated_attribute(entry.participatory_space&.title),
+          last_sign_in_at: entry.last_sign_in_date,
+          role_created_at: entry.created_date,
+          role_removed_at: entry.removal_date
+        }
+      end
+
+      private
+
+      attr_reader :entry
+    end
+  end
+end

data/app/validators/concerns/decidim/decidim_awesome/etiquette_validator_override.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module EtiquetteValidatorOverride
+      extend ActiveSupport::Concern
+
+      included do
+        private
+
+        def validate_caps(record, attribute, value)
+          percent = awesome_config(record, "validate_#{attribute}_max_caps_percent").to_f
+          return if value.scan(/[[:upper:]]/).length < value.length * percent / 100
+
+          record.errors.add(attribute, options[:message] || I18n.t("too_much_caps", scope: "decidim.decidim_awesome.validators", percent: percent.round))
+        end
+
+        def validate_marks(record, attribute, value)
+          marks = awesome_config(record, "validate_#{attribute}_max_marks_together").to_i + 1
+          return if value.scan(/[!?¡¿]{#{marks},}/).empty?
+
+          record.errors.add(attribute, options[:message] || :too_many_marks)
+        end
+
+        def validate_caps_first(record, attribute, value)
+          return unless awesome_config(record, "validate_#{attribute}_start_with_caps")
+          return if value.scan(/\A[[:lower:]]{1}/).empty?
+
+          record.errors.add(attribute, options[:message] || :must_start_with_caps)
+        end
+
+        def awesome_config(record, var)
+          config = record.try(:awesome_config)&.config
+          return unless config.is_a?(Hash)
+
+          config[var.to_sym]
+        end
+      end
+    end
+  end
+end

data/app/views/decidim/decidim_awesome/admin/admin_accountability/index.html.erb

@@ -0,0 +1,59 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %>
+      <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown">
+        <%= t "exports.button", scope: "decidim.decidim_awesome.admin.admin_accountability" %>
+      </span>
+      <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
+        <ul class="vertical menu add-components">
+          <% %w{CSV JSON Excel}.each do |format| %>
+            <li class="exports--format--<%= format.downcase %> exports--registrations">
+              <%= link_to t("decidim.decidim_awesome.admin.admin_accountability.exports.export_as", export_format:
+                format.upcase), export_admin_accountability_path(export_params.merge(format: format)), method: :post %>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+      <%= link_to t(global? ? ".see_spaces" : ".see_global"), admin_accountability_path(admins: !global?), class: "button tiny button--title new" %>
+      </h2>
+  </div>
+
+  <%= render partial: "decidim/decidim_awesome/admin/shared/filters_with_date", locals: { i18n_ctx: "admin_accountability" } %>
+
+  <div class="card-section">
+    <p class="help-text"><%= t(global? ? ".global_description" : ".description") %></p>
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+        <tr>
+          <th><%= t("role", scope: "decidim.decidim_awesome.admin.admin_accountability") %></th>
+          <th><%= t("name", scope: "decidim.decidim_awesome.admin.admin_accountability") %></th>
+          <th><%= t("email", scope: "decidim.decidim_awesome.admin.admin_accountability") %></th>
+          <% unless global? %>
+            <th><%= t("participatory_space", scope: "decidim.decidim_awesome.admin.admin_accountability") %></th>
+          <% end %>
+          <th><%= t("last_login", scope: "decidim.decidim_awesome.admin.admin_accountability") %></th>
+          <th><%= t("created_at", scope: "decidim.decidim_awesome.admin.admin_accountability") %></th>
+          <th><%= t("removal_date", scope: "decidim.decidim_awesome.admin.admin_accountability") %></th>
+        </tr>
+        </thead>
+        <tbody>
+        <% admin_actions.each do |log| %>
+          <tr class="<%= log.present.destroyed? ? "text-muted" : nil %>">
+            <td><%= log.present.role_name %></td>
+            <td><%= log.present.user_name %></td>
+            <td><%= link_to(log.present.user_email, "mailto:#{log.present.user_email}") if log.present.user_email %></td>
+            <% unless global? %>
+              <td><%= link_to log.present.participatory_space_name, log.present.participatory_space_path %></td>
+            <% end %>
+            <td><%= log.present.last_sign_in_date %></td>
+            <td><%= log.present.created_date %></td>
+            <td><%= log.present.removal_date %></td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+      <%= paginate admin_actions, theme: "decidim" %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/decidim_awesome/admin/checks/_assets_tester.html.erb

@@ -0,0 +1,2 @@
+<%= render partial: "layouts/decidim/head" %>
+<%= render partial: "layouts/decidim/decidim_javascript" unless legacy_version? %>

data/app/views/decidim/decidim_awesome/admin/config/_form_proposals.html.erb

@@ -2,9 +2,89 @@
   <% if config_enabled? :allow_images_in_proposals %>
     <p class="text-info"><%= t("rich_text_editor_in_public_views", scope: "decidim.decidim_awesome.admin.config") if current_organization.rich_text_editor_in_public_views %></p>
 
-    <%= form.check_box :allow_images_in_proposals %>
+    <%= form.check_box :allow_images_in_proposals, disabled: current_organization.rich_text_editor_in_public_views %>
     <p class="help-text"><%= t("help.allow_images_in_proposals", scope: "decidim.decidim_awesome.admin.config.form") %></p>
 
-    <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :allow_images_in_proposals, constraints: constraints_for(:allow_images_in_proposals) }) %>
+    <% unless current_organization.rich_text_editor_in_public_views %>
+      <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :allow_images_in_proposals, constraints: constraints_for(:allow_images_in_proposals) }) %>
+    <% end %>
   <% end %>
 </div>
+
+<% if config_enabled? %i(validate_title_min_length validate_title_max_caps_percent validate_title_max_marks_together validate_title_start_with_caps) %>
+  </div> <!-- .card-section -->
+  </div><!-- .card -->
+
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t("validators.title", scope: "decidim.decidim_awesome.admin.config.form") %></h2>
+    </div>
+    <div class="card-section">
+
+      <div class="row column decidim_awesome-form">
+        <% if config_enabled? :validate_title_start_with_caps %>
+          <%= form.check_box :validate_title_start_with_caps %>
+
+          <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :validate_title_start_with_caps, constraints: constraints_for(:validate_title_start_with_caps) }) %>
+        <% end %>
+
+        <% if config_enabled? :validate_title_min_length %>
+          <%= form.number_field :validate_title_min_length %>
+          <p class="help-text"><%= t("help.validate_title_min_length", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+          <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :validate_title_min_length, constraints: constraints_for(:validate_title_min_length) }) %>
+        <% end %>
+
+        <% if config_enabled? :validate_title_max_caps_percent %>
+          <%= form.number_field :validate_title_max_caps_percent %>
+          <p class="help-text"><%= t("help.validate_title_max_caps_percent", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+          <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :validate_title_max_caps_percent, constraints: constraints_for(:validate_title_max_caps_percent) }) %>
+        <% end %>
+
+        <% if config_enabled? :validate_title_max_marks_together %>
+          <%= form.number_field :validate_title_max_marks_together %>
+          <p class="help-text"><%= t("help.validate_title_max_marks_together", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+          <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :validate_title_max_marks_together, constraints: constraints_for(:validate_title_max_marks_together) }) %>
+        <% end %>
+      </div>
+<% end %>
+
+<% if config_enabled? %i(validate_body_min_length validate_body_max_caps_percent validate_body_max_marks_together validate_body_start_with_caps) %>
+  </div> <!-- .card-section -->
+  </div><!-- .card -->
+
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t("validators.body", scope: "decidim.decidim_awesome.admin.config.form") %></h2>
+    </div>
+    <div class="card-section">
+        <% if config_enabled? :validate_body_start_with_caps %>
+          <%= form.check_box :validate_body_start_with_caps %>
+
+          <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :validate_body_start_with_caps, constraints: constraints_for(:validate_body_start_with_caps) }) %>
+        <% end %>
+
+        <% if config_enabled? :validate_body_min_length %>
+          <%= form.number_field :validate_body_min_length %>
+          <p class="help-text"><%= t("help.validate_body_min_length", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+          <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :validate_body_min_length, constraints: constraints_for(:validate_body_min_length) }) %>
+        <% end %>
+
+        <% if config_enabled? :validate_body_max_caps_percent %>
+          <%= form.number_field :validate_body_max_caps_percent %>
+          <p class="help-text"><%= t("help.validate_body_max_caps_percent", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+          <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :validate_body_max_caps_percent, constraints: constraints_for(:validate_body_max_caps_percent) }) %>
+        <% end %>
+
+        <% if config_enabled? :validate_body_max_marks_together %>
+          <%= form.number_field :validate_body_max_marks_together %>
+          <p class="help-text"><%= t("help.validate_body_max_marks_together", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+          <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :validate_body_max_marks_together, constraints: constraints_for(:validate_body_max_marks_together) }) %>
+        <% end %>
+      </div>
+<% end %>

data/app/views/decidim/decidim_awesome/admin/shared/_filters_with_date.html.erb

@@ -0,0 +1,56 @@
+<div class="filters__section">
+  <div class="fcell filter">
+    <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+      <li>
+        <a href="#" class="dropdown button">
+          <%= t("filter_label", scope: "decidim.admin.filters") %>
+        </a>
+        <%= dropdown_submenu(submenu_options_tree(i18n_ctx)) %>
+      </li>
+    </ul>
+  </div>
+  <div class="fcell search">
+    <%= search_form_for(query, url: url_for) do |form| %>
+      <%= applied_filters_hidden_field_tags %>
+      <div class="input-group">
+        <%= form.search_field(
+              search_field_predicate,
+              class: "input-group-field",
+              label: false,
+              placeholder: t(search_field_predicate,
+                             collection: collection_name,
+                             scope: "decidim.admin.filters.search_placeholder")
+            ) %>
+        <div class="input-group-button">
+          <button type="submit" class="button">
+            <%= icon "magnifying-glass", aria_label: t("search_label", scope: "decidim.admin.filters") %>
+          </button>
+        </div>
+      </div>
+      <div class="input-group mt-xs">
+        <div class="input-group-field">
+          <%= form.label t("search_field_start_date", scope: "decidim.admin.filters.label") %>
+          <%= form.date_field(:created_at_gteq,
+                              class: "input-group-field",
+                              label: false,
+                              datepicker: true) %>
+        </div>
+        <div class="input-group-field">
+          <%= form.label t("search_field_end_date", scope: "decidim.admin.filters.label") %>
+          <%= form.date_field(:created_at_lteq,
+                              class: "input-group-field",
+                              label: false,
+                              datepicker: true) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+<div class="card-section fcell grid-x">
+  <div class="cell medium-10 filter-status">
+    <%= applied_filters_tags(i18n_ctx) %>
+  </div>
+  <div class="cell auto text-right">
+    <%= admin_filters_pagination %>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -83,7 +83,7 @@
             </div>
 
             <div class="row column">
-              <%= form.upload :file, optional: false %>
+              <%= form.upload :file %>
               <% if params[:id].present? %>
                 <% if proposal.documents.present? %>
                   <%= form.hidden_field :id, value: proposal.documents.first.id %>

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -61,23 +61,15 @@
 <% end %>
 
 <% if component_settings.attachments_allowed? %>
-  <fieldset>
+  <fieldset class="attachments_container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
-    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
-      <div class="field">
-        <%= nested_form.text_field :title %>
-      </div>
-
-      <div class="field">
-        <%= nested_form.upload :file, optional: false %>
-        <% if @form.errors[:attachment].present? %>
-          <% @form.errors[:attachment].each do |message| %>
-            <small class="form-error is-visible">
-              <%= message %>
-            </small>
-          <% end %>
-        <% end %>
-      </div>
-    <% end %>
+    <div class="row column">
+      <%= form.attachment :documents,
+        multiple: false,
+        label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+        button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+        button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
+        help_i18n_scope: "decidim.forms.file_help.file" %>
+    </div>
   </fieldset>
 <% end %>

data/app/views/layouts/decidim/admin/decidim_awesome.html.erb

@@ -70,6 +70,6 @@ end %>
 
   <%= yield %>
 
-<div class="platoniq-credits"><%= link_to t("credits", scope: "decidim.decidim_awesome", version: awesome_version), "https://github.com/Platoniq/decidim-module-decidim_awesome/" %></div>
+<div class="pokecode-credits"><%= t("credits", scope: "decidim.decidim_awesome", version: link_to(awesome_version, "https://github.com/decidim-ice/decidim-module-decidim_awesome/"), company: link_to("PokeCode", "https://pokecode.net")).html_safe %></div>
 
 <% end %>

data/app/views/{v0.25 → v0.27}/layouts/decidim/_head.html.erb

@@ -17,7 +17,15 @@
 <meta property="og:description" content="<%= decidim_meta_description %>">
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
+<% if current_organization.colors["theme"] %>
+  <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 %>
 
@@ -27,15 +35,15 @@
 <%# end awesome %>
 
 <%= organization_colors %>
-<%= javascript_pack_tag "decidim_core", defer: false %>
 
 <%# awesome javascript after app %>
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
-<%= javascript_pack_tag "decidim_decidim_awesome", defer: false %>
-<%= javascript_pack_tag("decidim_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_decidim_awesome", defer: false %>
+  <%= javascript_pack_tag("decidim_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>
+<% end %>
 <%# end awesome %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
 <%= snippets.display(:head) %>
-<%= content_for :header_snippets %>