decidim-decidim_awesome 0.10.2 → 0.11.2

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

@@ -1,26 +1,32 @@
 <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 class="bg-gray-6 p-4 rounded-t">
+    <h2 class="card-title flex md:flex-row justify-between sm:flex-wrap">
+      <%= t(".title") %>
+      <div class="flex gap-4">
+        <%= link_to t(global? ? ".see_spaces" : ".see_global"), admin_accountability_path(admins: !global?), class: "button button__sm button__transparent-secondary tiny button--title new" %>
+        <span class="exports button button__sm button__secondary tiny button--simple button--title" data-toggle="export-dropdown">
+            <%= t "exports.button", scope: "decidim.decidim_awesome.admin.admin_accountability" %>
+            <%= icon "arrow-down-s-fill" %>
+        </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,
+                  class: "focus-visible:outline-none" %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
       </div>
-      <%= link_to t(global? ? ".see_spaces" : ".see_global"), admin_accountability_path(admins: !global?), class: "button tiny button--title new" %>
-      </h2>
+    </h2>
   </div>
 
   <%= render partial: "decidim/decidim_awesome/admin/shared/filters_with_date", locals: { i18n_ctx: "admin_accountability" } %>
 
-  <div class="card-section">
+  <div class="card-section p-4">
     <p class="help-text"><%= t(global? ? ".global_description" : ".description") %></p>
 
     <% if global_users_missing_date %>

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

@@ -1,28 +1,31 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".title" %></h2>
-  </div>
-  <div class="card-section">
-    <p>
-      <span class="label <%= decidim_version_valid? ? "success" : "alert" %>"><%= t ".decidim_version", version: decidim_version %></span>
-      <%= check decidim_version_valid? %>
-    </p>
-  </div>
-  <div class="card-section">
-    <p><%= t(".images_migrated") %>
-    <% if images_migrated? %>
-      <%= check true %></p>
-    <% else %>
-      <%= check false %></p>
-      <div class="callout alert">
-        <p><%= t(".pending_image_migrations", total: pending_image_migrations).html_safe %></p>
-        <%= link_to t(".start_image_migrations"), migrate_images_path, method: :post, class: "button" %>
-      </div>
-    <% end %>
-  </div>
-  <div class="card-section">
-    <ul class="vertical menu">
-      <% overrides.each do |group, props| %>
+<!--
+  Force tailwind to compile these classes
+  class="fill-success fill-alert"
+-->
+
+<div class="card-section decidim-version">
+  <p>
+    <span class="label <%= decidim_version_valid? ? "success" : "alert" %>"><%= t ".decidim_version", version: decidim_version %></span>
+    <%= check decidim_version_valid? %>
+  </p>
+</div>
+
+<div class="card-section">
+  <p><%= t(".images_migrated") %>
+  <% if images_migrated? %>
+    <%= check true %></p>
+  <% else %>
+    <%= check false %></p>
+    <div class="callout alert">
+      <p><%= t(".pending_image_migrations", total: pending_image_migrations).html_safe %></p>
+      <%= link_to t(".start_image_migrations"), migrate_images_path, method: :post, class: "button" %>
+    </div>
+  <% end %>
+</div>
+
+<div class="card-section">
+  <ul class="vertical menu">
+    <% overrides.each do |group, props| %>
       <li>
         <strong><%= t ".#{group}" %></strong>
         <ul class="vertical menu">
@@ -36,16 +39,16 @@
         </ul>
         <br>
       </li>
-      <% end %>
-    </ul>
-    <ul class="vertical menu heads">
-      <li>
-        <strong><%= t ".head_tags" %></strong>
-        <ul class="vertical menu">
+    <% end %>
+  </ul>
+  <ul class="vertical menu heads">
+    <li>
+      <strong><%= t ".head_tags" %></strong>
+      <ul class="vertical menu">
         <% {
-          CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome')]",
-          JavaScript: "//script[contains(@src,'decidim_decidim_awesome')]"
-          }.each do |part, xpath| %>
+        CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome')]",
+        JavaScript: "//script[contains(@src,'decidim_decidim_awesome')]"
+        }.each do |part, xpath| %>
           <li>
             <%= part %>
             <% if head.xpath(xpath).count.positive? %>
@@ -56,16 +59,16 @@
               <code class="help-text code-block"><%= head_addons(part) %></code>
             <% end %>
           </li>
-          <% end %>
-        </ul>
-      </li>
-      <li>
-        <strong><%= t ".admin_head_tags" %></strong>
-        <ul class="vertical menu">
+        <% end %>
+      </ul>
+    </li>
+    <li>
+      <strong><%= t ".admin_head_tags" %></strong>
+      <ul class="vertical menu">
         <% {
-          CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_admin_decidim_awesome')]",
-          JavaScript: "//script[contains(@src,'decidim_admin_decidim_awesome')]"
-          }.each do |part, xpath| %>
+        CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_admin_decidim_awesome')]",
+        JavaScript: "//script[contains(@src,'decidim_admin_decidim_awesome')]"
+        }.each do |part, xpath| %>
           <li>
             <%= part %>
             <% if admin_head.xpath(xpath).count.positive? %>
@@ -76,9 +79,8 @@
               <code class="help-text code-block"><%= admin_addons(part) %></code>
             <% end %>
           </li>
-          <% end %>
-        </ul>
-      </li>
-    </ul>
-  </div>
+        <% end %>
+      </ul>
+    </li>
+  </ul>
 </div>

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

@@ -2,6 +2,11 @@
     <%= t("config.#{var}",
         scope: "activemodel.attributes",
         id: "<span class='awesome-auto-edit' data-var='#{var}' data-scope='#{scope}' data-key='#{key}'>#{key}</span>").html_safe %>
-    <%= icon_link_to "pencil", "#", t("edit_label", scope: "decidim.decidim_awesome.admin.config.form"), class: "action-icon--edit awesome-auto-edit", data: { "scope" => "#{scope}" } %>
-    <%= link_to t("remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}"), delete_path, method: :delete, class: "float-right delete-box", data: { confirm: t("sure_to_remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}") } %>
+
+    <%= icon_link_to "pencil-line", "#", t("edit_label", scope: "decidim.decidim_awesome.admin.config.form"), class: "awesome-auto-edit", data: { "scope" => "#{scope}" } %>
+
+    <%= link_to delete_path, method: :delete, class: "awesome-auto-delete", title: t("remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}"), data: { confirm: t("sure_to_remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}") } do %>
+        <%= icon "delete-bin-line" %>
+        <%= t("delete", scope: "decidim.decidim_awesome.admin.config.form_#{var}") %>
+    <% end %>
 <% end %>

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

@@ -1,27 +1,34 @@
-<div class="constraints-editor" data-key="<%= key %>">
-  <div class="callout" style="display:none" data-closable>
-    <p></p>
-    <button class="close-button" aria-label="Dismiss alert" type="button" data-close>
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-
-  <h5><%= t ".title" %></h5>
+<div class="constraints-editor mb-8 mt-4" data-key="<%= key %>">
+  <%= cell "decidim/announcement", "<p></p>".html_safe, hidden: true %>
+  <h5 class="mb-2"><%= t ".title" %></h5>
   <% if constraints.blank? %>
     <span class="label warning"><%= t ".always" %></span>
   <% end %>
 
   <ul class="constraints-list<%= " inactive" if constraints&.detect{|c| c.settings["participatory_space_manifest"]=="none" } %>">
     <% constraints&.each do |constraint| %>
-        <li>
-            <% constraint.settings.reverse_each do |k, val| %>
-              <span class="label <%= k %> constraint-<%= val %>"><%= translate_constraint_value constraint, k %></span>
-            <% end %>
-          <a href="<%= constraint_path(id: constraint.id, key: key) %>" class="edit-condition"><%= t ".edit" %></a>
-          <%= link_to t(".delete"), constraint_path(id: constraint.id), remote: true, method: :delete %>
-        </li>
-      <% end %>
+      <li>
+        <% constraint.settings.reverse_each do |k, val| %>
+          <span class="label <%= k %> constraint-<%= val %>"><%= translate_constraint_value constraint, k %></span>
+        <% end %>
+
+        <div class="inline-flex items-center gap-1 ml-10">
+          <button id="<%= "edit-#{key}-#{constraint.id}" %>" type="button" name="button" class="edit-condition button button__xs button__transparent-secondary" data-dialog-open="<%= "edit-modal-#{key}" %>" data-constraints-url="<%= constraint_path(id: constraint.id, key: key) %>">
+            <%= t ".edit" %>
+          </button>
+
+          <%= link_to t(".delete"), constraint_path(id: constraint.id), remote: true, method: :delete, class: "button button__xs button__transparent-primary" %>
+        </div>
+      </li>
+    <% end %>
   </ul>
-  <a href="<%= new_constraint_path(key: key) %>" class="add-condition" data-open="constraintsModal"><%= t ".add_condition" %></a>
+
+  <button id="<%= "new-#{key}" %>" type="button" name="button" class="add-condition button button__xs button__secondary" data-dialog-open="<%= "new-modal-#{key}" %>" data-constraints-url="<%= new_constraint_path(key: key) %>">
+    <%= icon "add-box-line" %>
+    <%= t ".add_condition" %>
+  </button>
 
 </div>
+
+<%= decidim_modal id: "edit-modal-#{key}", data: { constraint: key }, remote: true %>
+<%= decidim_modal id: "new-modal-#{key}", data: { constraint: key }, remote: true %>

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

@@ -1,21 +1,22 @@
-<div class="row column decidim_awesome-form">
+<div class="form__wrapper row column decidim_awesome-form">
   <% if config_enabled? :scoped_admins %>
     <p class="help-text"><%= t("help.scoped_admins", scope: "decidim.decidim_awesome.admin.config.form") %></p>
 
     <% form.object.scoped_admins&.each do |key, value| %>
-      <div class="scoped_admins_container" data-key="<%= key %>">
+      <div class="card p-4 scoped_admins_container js-box-container" data-key="<%= key %>">
         <%= render(partial: "decidim/decidim_awesome/admin/config/autoedit_box_label", locals: { var: "scoped_admins", key: key, scope: "scoped_admin_#{key}", delete_path: decidim_admin_decidim_awesome.scoped_admin_path(key: key) }) %>
         <p class="form-error is-visible" id="scoped-admin-error-<%= $key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
 
-        <%= select_tag "config[scoped_admins][#{key}]", options_from_collection_for_select(users_for(value), :id, :text, proc { true }), { include_blank: false ,  class: "multiusers-select", multiple: true, data: { url: decidim_admin_decidim_awesome.users_path } } %>
+        <%= select_tag "config[scoped_admins][#{key}]", options_for_select(users_for(value), value), { include_blank: false ,  class: "multiusers-select", multiple: true, data: { url: decidim_admin_decidim_awesome.users_path } } %>
 
         <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: "scoped_admin_#{key}", constraints: constraints_for("scoped_admin_#{key}") }) %>
       </div>
     <% end %>
 
-    <%= link_to t("new", scope: "decidim.decidim_awesome.admin.config.form_scoped_admins"), decidim_admin_decidim_awesome.scoped_admins_path, method: :post %>
+    <%= link_to decidim_admin_decidim_awesome.scoped_admins_path, method: :post, class: "button button__sm button__text-secondary mr-auto" do %>
+      <%= icon("add-box-line") %>
+      <%= t("new", scope: "decidim.decidim_awesome.admin.config.form_scoped_admins") %>
+    <% end %>
 
   <% end %>
 </div>
-
-<%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>

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

@@ -1,18 +1,14 @@
-<div class="row column decidim_awesome-form">
-  <p class="help-text"><%= t("help.drag_and_drop_supported", scope: "decidim.decidim_awesome.admin.config.form") %></p>
-  <p class="help-text"><%= t("help.original_editor_override", scope: "decidim.decidim_awesome.admin.config.form") %></p>
-
-  <% enabled_configs([:allow_images_in_full_editor, :allow_images_in_small_editor]).each do |key| %>
-    <%= form.check_box key %>
-    <p class="help-text"><%= t("help.#{key}", scope: "decidim.decidim_awesome.admin.config.form") %></p>
-
-    <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: key, constraints: constraints_for(key) }) %>
-  <% end %>
-
-  <% enabled_configs([:use_markdown_editor, :allow_images_in_markdown_editor]).each do |key| %>
-    <%= form.check_box key %>
-    <p class="help-text"><%= t("help.#{key}", scope: "decidim.decidim_awesome.admin.config.form") %></p>
-
-    <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: key, constraints: constraints_for(key) }) %>
+<div class="form__wrapper decidim_awesome-form">
+  <div class="row column">
+    <p class="help-text"><%= t("help.drag_and_drop_supported", scope: "decidim.decidim_awesome.admin.config.form") %>
+    <%= t("help.original_editor_override", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+  </div>
+
+  <% enabled_configs([:allow_images_in_editors, :allow_videos_in_editors]).each do |key| %>
+    <div class="row column card p-4">
+      <%= form.check_box key, help_text: t("help.#{key}", scope: "decidim.decidim_awesome.admin.config.form") %>
+
+      <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: key, constraints: constraints_for(key) }) %>
+    </div>
   <% end %>
 </div>

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

@@ -1,44 +1,60 @@
-<div class="row column decidim_awesome-form">
+<div class="form__wrapper decidim_awesome-form">
   <% if config_enabled? :intergram_for_public %>
+  <div class="row column">
     <%= form.check_box :intergram_for_public %>
-    <p class="help-text"><%= t("help.intergram_about", scope: "decidim.decidim_awesome.admin.config.form").html_safe %></p>
+    <span class="help-text mb-4" style="margin-top:-1rem;">
+      <%= t("help.intergram_about", scope: "decidim.decidim_awesome.admin.config.form").html_safe %>
+    </span>
 
     <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :intergram_for_public, constraints: constraints_for(:intergram_for_public) }) %>
 
     <%= fields_for "config[intergram_for_public_settings]", form.object.intergram_for_public_settings do |f| %>
-      <%= f.text_field :chat_id, label: t("intergram_chat_id", scope: "activemodel.attributes.config") %>
-      <p class="help-text"><%= t("help.intergram_config", scope: "decidim.decidim_awesome.admin.config.form").html_safe %></p>
+      <div class="mb-4">
+        <%= f.text_field :chat_id, label: t("intergram_chat_id", scope: "activemodel.attributes.config") %>
+        <p class="help-text" style="margin-top: -1rem;">
+          <%= t("help.intergram_config", scope: "decidim.decidim_awesome.admin.config.form").html_safe %>
+        </p>
+      </div>
+
       <%= f.check_box :require_login, label: t("intergram_require_login", scope: "activemodel.attributes.config") %>
-      <%= f.check_box :use_floating_button, label: t("intergram_use_floating_button", scope: "activemodel.attributes.config") %>
-      <%= f.color_field :color, label: t("intergram_color", scope: "activemodel.attributes.config") %>
+      <%= f.check_box :use_floating_button, class: "mb-4", label: t("intergram_use_floating_button", scope: "activemodel.attributes.config"), label_options: { class: "block" } %>
+      <%= f.color_field :color, class: "mb-4 block w-full p-1", label: t("intergram_color", scope: "activemodel.attributes.config") %>
 
-      <%= f.text_field :title_open, label: t("intergram_title_open", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.title_open") %>
-      <%= f.text_field :title_closed, label: t("intergram_title_closed", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.title_closed") %>
-      <%= f.text_field :intro_message, label: t("intergram_intro_message", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.intro_message") %>
-      <%= f.text_field :auto_no_response, label: t("intergram_auto_no_response", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.auto_no_response") %>
+      <%= f.text_field :title_open, class: "mb-4", label: t("intergram_title_open", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.title_open") %>
+      <%= f.text_field :title_closed, class: "mb-4", label: t("intergram_title_closed", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.title_closed") %>
+      <%= f.text_field :intro_message, class: "mb-4", label: t("intergram_intro_message", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.intro_message") %>
+      <%= f.text_field :auto_no_response, class: "mb-4", label: t("intergram_auto_no_response", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.auto_no_response") %>
     <% end %>
+  </div>
   <% end %>
 </div>
 
-<div class="row column decidim_awesome-form">
+<div class="form__wrapper decidim_awesome-form">
   <% if config_enabled? :intergram_for_admins %>
+  <div class="row column">
     <%= form.check_box :intergram_for_admins %>
-    <p class="help-text"><%= t("help.intergram_about", scope: "decidim.decidim_awesome.admin.config.form").html_safe %></p>
+    <span class="help-text mb-4" style="margin-top:-1rem;">
+      <%= t("help.intergram_about", scope: "decidim.decidim_awesome.admin.config.form").html_safe %>
+    </span>
 
     <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: :intergram_for_admins, constraints: constraints_for(:intergram_for_admins) }) %>
 
     <%= fields_for "config[intergram_for_admins_settings]", form.object.intergram_for_admins_settings do |f| %>
-      <%= f.text_field :chat_id, label: t("intergram_chat_id", scope: "activemodel.attributes.config") %>
-      <p class="help-text"><%= t("help.intergram_config", scope: "decidim.decidim_awesome.admin.config.form").html_safe %></p>
-
-      <%= f.check_box :use_floating_button, label: t("intergram_use_floating_button", scope: "activemodel.attributes.config") %>
-      <%= f.color_field :color, label: t("intergram_color", scope: "activemodel.attributes.config") %>
-
-      <%= f.text_field :title_open, label: t("intergram_title_open", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.title_open") %>
-      <%= f.text_field :title_closed, label: t("intergram_title_closed", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.title_closed") %>
-      <%= f.text_field :intro_message, label: t("intergram_intro_message", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.intro_message") %>
-      <%= f.text_field :auto_no_response, label: t("intergram_auto_no_response", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.auto_no_response") %>
+      <div class="mb-4">
+        <%= f.text_field :chat_id, label: t("intergram_chat_id", scope: "activemodel.attributes.config") %>
+        <p class="help-text" style="margin-top: -1rem;">
+          <%= t("help.intergram_config", scope: "decidim.decidim_awesome.admin.config.form").html_safe %>
+        </p>
+      </div>
+
+      <%= f.check_box :use_floating_button, class: "mb-4", label: t("intergram_use_floating_button", scope: "activemodel.attributes.config") %>
+      <%= f.color_field :color, class: "mb-4 block w-full p-1", label: t("intergram_color", scope: "activemodel.attributes.config") %>
+
+      <%= f.text_field :title_open, class: "mb-4", label: t("intergram_title_open", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.title_open") %>
+      <%= f.text_field :title_closed, class: "mb-4", label: t("intergram_title_closed", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.title_closed") %>
+      <%= f.text_field :intro_message, class: "mb-4", label: t("intergram_intro_message", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.intro_message") %>
+      <%= f.text_field :auto_no_response, class: "mb-4", label: t("intergram_auto_no_response", scope: "activemodel.attributes.config"), placeholder: t("decidim.decidim_awesome.config.intergram.auto_no_response") %>
     <% end %>
-
+  </div>
   <% end %>
 </div>

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

@@ -1,25 +1,43 @@
-<div class="callout warning"><%= t("caution", scope: "decidim.decidim_awesome.admin.config") %></div>
-<div class="row column decidim_awesome-form">
-  <% if config_enabled? :proposal_custom_fields %>
-    <p class="help-text"><%= t("help.proposal_custom_fields", scope: "decidim.decidim_awesome.admin.config.form") %></p>
-    <p class="help-text"><%= t("help.proposal_custom_fields_example", scope: "decidim.decidim_awesome.admin.config.form") %></p>
-    <p class="help-text"><%= t("help.proposal_custom_fields_translations", scope: "decidim.decidim_awesome.admin.config.form") %></p>
-
-    <% form.object.proposal_custom_fields&.each do |key, value| %>
-      <div class="proposal_custom_fields_container" data-key="<%= key %>">
-        <%= render(partial: "decidim/decidim_awesome/admin/config/autoedit_box_label", locals: { var: "proposal_custom_fields", key: key, scope: "proposal_custom_field_#{key}", delete_path: decidim_admin_decidim_awesome.proposal_custom_field_path(key: key) }) %>
+<%
+  priv = (config_var == "proposal_private_custom_fields")
+  field = priv ? "proposal_private_custom_field" : "proposal_custom_field"
+%>
+<div class="form__wrapper row column decidim_awesome-form">
+  <% if config_enabled? config_var %>
+    <% if priv %>
+      <div>
+        <p class="help-text text-alert"><%= t("help.proposal_private_custom_fields", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+        <p class="help-text"><%= t("help.proposal_private_custom_fields_translations",
+            scope: "decidim.decidim_awesome.admin.config.form",
+            warning: content_tag(:i, t("decidim.decidim_awesome.proposal_private_custom_fields_disclosure")),
+            key: content_tag("code", "decidim.decidim_awesome.proposal_private_custom_fields_disclosure")
+          ).html_safe %></p>
+      </div>
+    <% else %>
+      <div class="colors-help">
+        <p class="help-text"><%= t("help.proposal_custom_fields", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+        <p class="help-text"><%= t("help.proposal_custom_fields_example", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+        <p class="help-text"><%= t("help.proposal_custom_fields_translations", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+      </div>
+    <% end %>
+    <% form.object.send(config_var)&.each do |key, value| %>
+      <div class="card p-4 proposal_custom_fields_container<%= " private" if priv %> js-box-container" data-key="<%= key %>" data-var="<%= config_var %>">
+        <%= render("decidim/decidim_awesome/admin/config/autoedit_box_label", var: config_var, key: key, scope: "#{field}_#{key}", delete_path: decidim_admin_decidim_awesome.proposal_custom_field_path(key: key, private: priv)) %>
         <p class="form-error is-visible"><%= errors[key.to_sym].join("<br>") if errors %></p>
-        <%= hidden_field_tag key, value, name: "config[proposal_custom_fields][#{key}]" %>
-        <div class="proposal_custom_fields_editor">
+
+        <%= hidden_field_tag key, value, name: "config[#{config_var}][#{key}]" %>
+
+        <div class="proposal_custom_fields_editor mt-4<%= " private" if priv %>">
           <div class="loading-spinner"></div>
         </div>
-        <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: "proposal_custom_field_#{key}", constraints: constraints_for("proposal_custom_field_#{key}") }) %>
+
+        <%= render("decidim/decidim_awesome/admin/config/constraints", key: "#{field}_#{key}", constraints: constraints_for("#{field}_#{key}")) %>
       </div>
     <% end %>
 
-    <%= link_to t(".new"), decidim_admin_decidim_awesome.proposal_custom_fields_path, method: :post %>
-
+    <%= link_to decidim_admin_decidim_awesome.proposal_custom_fields_path(private: priv), method: :post, class: "button button__sm button__text-secondary mr-auto" do %>
+      <%= icon("add-box-line") %>
+      <%= t("new", scope: "decidim.decidim_awesome.admin.config.form_#{config_var}") %>
+    <% end %>
   <% end %>
 </div>
-
-<%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>

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

@@ -0,0 +1 @@
+<%= render "form_proposal_custom_fields", **local_assigns %>