decidim-decidim_awesome 0.10.2 → 0.10.3

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_full_editor, :allow_images_in_small_editor, :allow_videos_in_editors]).each do |key| %>
+    <div class="row column">
+      <%= 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_proposal_custom_fields.html.erb

@@ -1,24 +1,44 @@
-<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 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 <%= " 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: "add-field button small hollow mr-auto" do %>
+      <%= icon "plus", class: "small" %>
+      <%= t("new", scope: "decidim.decidim_awesome.admin.config.form_#{config_var}") %>
+    <% end %>
   <% end %>
 </div>
 

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

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

@@ -30,7 +30,7 @@
       </div>
 <% end %>
 
-<% if config_enabled? %i(validate_title_min_length validate_title_max_caps_percent validate_title_max_marks_together validate_title_start_with_caps) %>
+<% if config_enabled?(:validate_title_min_length, :validate_title_max_caps_percent, :validate_title_max_marks_together, :validate_title_start_with_caps) %>
   </div> <!-- .card-section -->
   </div><!-- .card -->
 
@@ -69,7 +69,7 @@
       </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) %>
+<% if config_enabled?(:validate_body_min_length, :validate_body_max_caps_percent, :validate_body_max_marks_together, :validate_body_start_with_caps) %>
   </div> <!-- .card-section -->
   </div><!-- .card -->
 
@@ -78,31 +78,31 @@
       <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 %>
+      <% 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 %>
+        <%= 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>
+      <% 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 %>
+        <%= 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>
+      <% 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 %>
+        <%= 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>
+      <% 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>
+        <%= 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/config/_form_styles.html.erb

@@ -10,7 +10,7 @@
     </p>
 
     <% form.object.scoped_styles&.each do |key, value| %>
-      <div class="scoped_styles_container" data-key="<%= key %>">
+      <div class="scoped_styles_container p-4 js-box-container" data-key="<%= key %>">
         <%= render(partial: "decidim/decidim_awesome/admin/config/autoedit_box_label", locals: { var: "scoped_styles", key: key, scope: "scoped_style_#{key}", delete_path: decidim_admin_decidim_awesome.scoped_style_path(key: key) }) %>
         <p class="form-error is-visible" id="custom-style-error-<%= key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
         <%= text_area_tag key, value, name: "config[scoped_styles][#{key}]", rows: 5 %>

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

@@ -1,7 +1,7 @@
 <%= decidim_form_for(@form, method: :patch, url: decidim_admin_decidim_awesome.config_path(config_var), html: { class: "awesome-edit-config" }, data: { "safe-path" => decidim_admin_decidim_awesome.config_path(config_var) }) do |f| %>
   <div class="card">
     <div class="card-divider">
-      <h2 class="card-title"><%= t(".title", setting: config_var) %></h2>
+      <%= t(".title", setting: t(config_var, scope: "decidim.decidim_awesome.admin.config.title")) %>
     </div>
     <div class="card-section">
       <%= render partial: "form_#{config_var}", locals: { form: f, errors: defined?(errors) ? errors : nil } %>

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

@@ -5,20 +5,20 @@
       <%= link_to t(".new"), decidim_admin_decidim_awesome.new_custom_redirect_path, class: "button tiny button--title" %>
     </h2>
   </div>
-  <div class="card-section">
-  <p class="help-text"><%= t(".description").html_safe %></p>
-  <div class="row column decidim_awesome-form">
-    <table class="table-list custom-redirections-table">
-      <thead>
+  <div class="card-section p-4">
+    <p class="help-text -mt-2 mb-4"><%= t(".description").html_safe %></p>
+    <div class="table-scroll decidim_awesome-form">
+      <table class="table-list custom-redirections-table">
+        <thead>
         <tr>
           <th><%= t("custom_redirect.active", scope: "activemodel.attributes") %></th>
           <th><%= t("custom_redirect.origin", scope: "activemodel.attributes") %></th>
           <th><%= t("custom_redirect.destination", scope: "activemodel.attributes") %></th>
-          <th class="redirect-status"><%= link_to(t(".check_redirections"), "#", class: "button small pull-right secondary check-custom-redirections") if current_config.present? %></th>
-          <th class="actions"></th>
+          <th class="redirect-status"><%= link_to(t(".check_redirections"), "#", class: "button button__secondary button__xs pull-right secondary check-custom-redirections") if current_config.present? %></th>
+          <th class="actions"><%= t("decidim.decidim_awesome.admin.actions") %></th>
         </tr>
-      </thead>
-      <tbody>
+        </thead>
+        <tbody>
         <% current_config.each do |origin, item| %>
           <tr class="custom-redirection" data-origin="<%= origin %>" data-item="<%= item.to_json %>">
             <td><%= check item["active"] %></td>
@@ -26,12 +26,13 @@
             <td><%= item["destination"] %></td>
             <td class="redirect-status"></td>
             <td class="table-list__actions">
-              <%= icon_link_to "pencil", decidim_admin_decidim_awesome.edit_custom_redirect_path(md5(origin)), t(".edit"), class: "action-icon--edit" %>
-              <%= icon_link_to "circle-x", decidim_admin_decidim_awesome.custom_redirect_path(md5(origin)), t(".remove"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
+              <%= icon_link_to "pencil-line", decidim_admin_decidim_awesome.edit_custom_redirect_path(md5(origin)), t(".edit"), class: "action-icon--edit" %>
+              <%= icon_link_to "close-circle-line", decidim_admin_decidim_awesome.custom_redirect_path(md5(origin)), t(".remove"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
             </td>
           </tr>
         <% end %>
-      </tbody>
-    </table>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>

data/app/views/decidim/decidim_awesome/admin/maintenance/_private_data.html.erb

@@ -0,0 +1,44 @@
+<div class="mb-8">
+  <p class="help-text"><%= t(".help_html", time_ago: time_ago) %>
+</div>
+
+<% if collection.empty? %>
+  <div class="callout warning"><%= t(".no_data", time_ago: time_ago) %></div>
+<% else %>
+  <div class="table-scroll autorefresh" data-url="<%= maintenance_path(:private_data).split("?").first %>">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t(".component") %></th>
+          <th><%= t(".items_count") %></th>
+          <th><%= t(".last_date") %></th>
+          <th><%= t("decidim.decidim_awesome.admin.actions") %></th>
+        </tr>
+      </thead>
+
+      <tbody>
+      <% collection.each do |resource| %>
+        <% item = present(resource) %>
+        <tr data-id="<%= item.id %>">
+          <td><%= link_to item.name, item.path %></td>
+          <td data-autorefresh="total"><%= item.total %></td>
+          <td data-autorefresh="time_ago"><%= item.time_ago %></td>
+          <td data-autorefresh="done">
+            <% if item.locked? %>
+              <span class="loading-spinner primary" title="<%= t(".removing") %>"></span>
+            <% elsif item.destroyable? %>
+              <%= link_to destroy_private_data_maintenance_path(:private_data, resource_id: item), method: :delete, class: "button button__primary button__xs tiny", data: { confirm: t(".confirm_delete") } do %>
+                <%= icon "trash" %>
+                <%= t(".delete") %>
+              <% end %>
+            <% else %>
+              <span class="not-destroyable" title="<%= t(".not_destroyable") %>"><%= icon "ban" %></span>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>
+<%= paginate collection, theme: "decidim" %>

data/app/views/decidim/decidim_awesome/admin/maintenance/show.html.erb

@@ -0,0 +1,44 @@
+<div class="card-section section_<%= current_view %>">
+  <%= render current_view %>
+</div>
+
+<script>
+  document.addEventListener("DOMContentLoaded", function() {
+    const wrappers = document.querySelectorAll('.autorefresh');
+
+    function updateTableWithJsonData(element) {
+      const trs = element.querySelectorAll('tr[data-id]');
+      const tr_ids = [...trs].map(tr => parseInt(tr.dataset.id, 10));
+
+      fetch(element.dataset.url + "?" + new URLSearchParams({resources: tr_ids}))
+        .then(response => response.json())
+        .then(data => {
+          trs.forEach(tr => {
+            const items = tr.querySelectorAll('[data-autorefresh]');
+            const id = parseInt(tr.dataset.id, 10);
+            const newData = data.find(item => item.id === id);
+            // console.log("newData", newData, "items", items, "id", id, "tr", tr, "data", data);
+            if (newData) {
+              items.forEach(item => {
+                const field = item.dataset.autorefresh;
+                if (field && newData[field]) {
+                  item.innerHTML = newData[field];
+                }
+              });
+              if (newData.locked) {
+                setTimeout(() => updateTableWithJsonData(element), 1000);
+              }
+            }
+          });
+        })
+        .catch(error => {
+          console.error('Error fetching data:', error);
+        });
+    }
+
+    wrappers.forEach(element => {
+      updateTableWithJsonData(element);
+    });
+  });
+</script>
+</script>

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

@@ -5,39 +5,38 @@
       <%= link_to t(".new"), decidim_admin_decidim_awesome.new_menu_hack_path, class: "button tiny button--title" %>
     </h2>
   </div>
-  <div class="card-section">
-  <div class="row column decidim_awesome-form">
+  <div class="table-scroll">
     <table class="table-list">
       <thead>
-        <tr>
-          <th><%= t("menu.raw_label", scope: "activemodel.attributes") %></th>
-          <th><%= t("menu.url", scope: "activemodel.attributes") %></th>
-          <th><%= t("menu.position", scope: "activemodel.attributes") %></th>
-          <th><%= t("menu.target", scope: "activemodel.attributes") %></th>
-          <th><%= t("menu.visibility", scope: "activemodel.attributes") %></th>
-          <th class="actions"></th>
-        </tr>
+      <tr>
+        <th><%= t("menu.raw_label", scope: "activemodel.attributes") %></th>
+        <th><%= t("menu.url", scope: "activemodel.attributes") %></th>
+        <th><%= t("menu.position", scope: "activemodel.attributes") %></th>
+        <th><%= t("menu.target", scope: "activemodel.attributes") %></th>
+        <th><%= t("menu.visibility", scope: "activemodel.attributes") %></th>
+        <th class="actions"><%= t("decidim.decidim_awesome.admin.actions") %></th>
+      </tr>
       </thead>
       <tbody>
-        <% current_items.each do |item| %>
-          <tr<%= " class=menu_hack-addition" if item.try(:overrided?) == false %>>
-            <td><%= item.label %></td>
-            <td><%= item.url %></td>
-            <td><%= item.position %></td>
-            <td><%= target_options.invert[item.try(:target)||""] %></td>
-            <td><%= visibility_options.invert[item.try(:visibility)] %></td>
-            <td class="table-list__actions">
-              <%= icon_link_to "pencil", decidim_admin_decidim_awesome.edit_menu_hack_path(md5(item.url)), t(".edit"), class: "action-icon--edit" %>
-              <% if item.respond_to?(:overrided?) %>
-                <%= icon_link_to "circle-x", decidim_admin_decidim_awesome.menu_hack_path(md5(item.url)), t(".remove#{'_hack' if item.overrided?}"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
-              <% else %>
-                  <span class="action-icon">
-                    <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
-                  </span>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
+      <% current_items.each do |item| %>
+        <tr<%= " class=menu_hack-addition" if item.try(:overrided?) == false %>>
+          <td><%= item.label %></td>
+          <td><%= item.url %></td>
+          <td><%= item.position %></td>
+          <td><%= target_options.invert[item.try(:target)||""] %></td>
+          <td><%= visibility_options.invert[item.try(:visibility)] %></td>
+          <td class="table-list__actions">
+            <%= icon_link_to "pencil", decidim_admin_decidim_awesome.edit_menu_hack_path(md5(item.url)), t(".edit"), class: "action-icon--edit" %>
+            <% if item.respond_to?(:overrided?) %>
+              <%= icon_link_to "circle-x", decidim_admin_decidim_awesome.menu_hack_path(md5(item.url)), t(".remove#{'_hack' if item.overrided?}"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
+            <% else %>
+                <span class="action-icon">
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                </span>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
       </tbody>
     </table>
   </div>

data/app/views/decidim/decidim_awesome/admin/proposals/_editor.html.erb

@@ -1,6 +1,9 @@
-<%= admin_editor_for_proposal_body(form) %>
-<% unless awesome_proposal_custom_fields.blank? %>
-  <div class="proposal_custom_field">
-    <div class="loading-spinner"></div>
-  </div>
+<% if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) && editor = admin_editor_for_proposal_body(form) %>
+  <%= editor %>
+<% else %>
+  <%= form.translated :editor, :body, hashtaggable: true, aria: { label: :body } %>
+<% end %>
+
+<% if Decidim::DecidimAwesome.enabled?(:proposal_private_custom_fields) && private_custom_fields = awesome_proposal_custom_fields_for(:private_body) %>
+  <%= render_proposal_custom_fields_override(private_custom_fields, form, :private_body) if private_custom_fields.present? %>
 <% end %>

data/app/views/decidim/decidim_awesome/admin/proposals/_private_body.html.erb

@@ -0,0 +1,20 @@
+<div class="card-section" data-component="accordion" id="accordion-private_body">
+  <button class="card-divider-button" data-controls="panel-private_body" type="button">
+    <%= icon "arrow-right-s-line" %>
+    <h2 class="card-title">
+      <%= t "decidim.decidim_awesome.admin.proposal_custom_fields.private_body" %>
+    </h2>
+  </button>
+  <div id="panel-private_body">
+    <div class="component__show_private_data-grid">
+      <div><%= Decidim::ContentProcessor.render_without_format(render_sanitized_content(proposal, :private_body)).html_safe %></div>
+      <% if proposal&.extra_fields&.private_body_updated_at %>
+        <div class="date_info">
+          <%= t("decidim.decidim_awesome.admin.proposal_custom_fields.private_data_last_update", time_ago: time_ago_in_words(proposal.extra_fields.private_body_updated_at)) if proposal.extra_fields.private_body.present? %>
+          <%= t("decidim.decidim_awesome.admin.proposal_custom_fields.private_data_last_remove", time_ago: time_ago_in_words(proposal.extra_fields.private_body_updated_at)) if proposal.extra_fields.private_body.blank? %>
+          <%= link_to t("decidim.decidim_awesome.admin.proposal_custom_fields.remove_private_data"), decidim_admin_decidim_awesome.maintenance_path(:private_data) if proposal.extra_fields.private_body_updated_at && proposal.extra_fields.private_body_updated_at < Decidim::DecidimAwesome.private_data_expiration_time.ago %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/decidim_awesome/amendments/_modal.html.erb

@@ -0,0 +1,16 @@
+<!--the modal window will be used in another pr-->
+<div class="reveal show limit_amendments_modal limit-amendments-modal" id="LimitAmendmentsModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="LimitAmendmentsModal-label" data-limit-amendments="<%= current_component.settings&.limit_pending_amendments %>">
+  <div class="reveal__content">
+    <div class="instructions"><%= t("decidim.decidim_awesome.amendments.modal.explanation_html",
+                                    proposal_link: present(@proposal).proposal_path + "#comments") %></div>
+
+    <% if current_component.current_settings&.amendments_visibility == "all" %>
+      <div class="instructions"><%= t("decidim.decidim_awesome.amendments.modal.current_amendment_html",
+                                    amendment_link: present(@proposal.amendment.emendation).proposal_path) %></div>
+    <% end %>
+
+    <div class="text-center">
+      <button class="button vote-action" data-close><%= t("decidim.decidim_awesome.amendments.modal.dismiss") %></button>
+    </div>
+  </div>
+</div>

data/app/views/decidim/decidim_awesome/custom_fields/_form_render.html.erb

@@ -1,5 +1,13 @@
-<div class="proposal_custom_field" id="proposa-custom-field-<%= name %>" data-spec="<%= spec.to_json %>" data-name="<%= "#{form.object_name}[#{name}]" %>">
-  <div class="loading-spinner"></div>
+<div class="decidim_awesome-custom_fields <%= name %>">
+  <% if name == :private_body %>
+    <p class="private_body-disclosure help-text"><%= icon "lock-locked" %><%= t("decidim.decidim_awesome.proposal_private_custom_fields_disclosure") %></p>
+  <% end %>
+  <div class="proposal_custom_field proposal_custom_field--<%= name %>"
+       id="proposal-custom-field-<%= name %>"
+       data-spec="<%= spec.to_json %>"
+       data-name="<%= "#{form.object_name}[#{name}]" %>">
+    <div class="loading-spinner"></div>
+  </div>
 </div>
 
 <%= form.hidden_field name %>

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

@@ -0,0 +1,21 @@
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:awesome_admin_menu).render %>
+<% end %>
+
+<%= stylesheet_pack_tag "decidim_admin_decidim_awesome", media: "all" %>
+<%= javascript_pack_tag "decidim_admin_decidim_awesome", defer: true %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= link_to t("decidim.admin.menu.decidim_awesome"), decidim_admin_decidim_awesome.config_path(:editors), target: "_blank" %>
+    </div>
+  </div>
+
+  <%= yield %>
+
+  <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 %>
+
+<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>

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

@@ -1,75 +1,3 @@
-<% def icon_aria_selected_link_to(text, link, icon_name, options = {})
-  aria_selected_link_to(safe_join([icon(icon_name), text]), link, options)
-end %>
-
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav">
-    <div class="secondary-nav__title">
-      <%= t "layouts.decidim.admin.decidim_awesome.title" %>
-    </div>
-
-    <ul>
-      <% if menus[:editors] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:editors)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.editors", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:editors), "text" %>
-        </li>
-      <% end %>
-      <% if menus[:proposals] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposals)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.proposals", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposals), "document" %>
-        </li>
-      <% end %>
-      <% if menus[:surveys] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:surveys)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.surveys", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:surveys), "spreadsheet" %>
-        </li>
-      <% end %>
-      <% if menus[:styles] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:styles)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.styles", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:styles), "brush" %>
-        </li>
-      <% end %>
-      <% if menus[:proposal_custom_fields] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposal_custom_fields)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.proposal_custom_fields", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposal_custom_fields), "layers" %>
-        </li>
-      <% end %>
-      <% if menus[:admins] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:admins)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.admins", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:admins), "people" %>
-        </li>
-      <% end %>
-      <% if menus[:menu_hacks] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.menu_hacks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.menu_hacks_path, "menu" %>
-        </li>
-      <% end %>
-      <% if menus[:custom_redirects] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.custom_redirects_path) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.custom_redirects", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.custom_redirects_path, "share-boxed" %>
-        </li>
-      <% end %>
-      <% if menus[:livechat] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:livechat)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.livechat", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:livechat), "chat" %>
-        </li>
-      <% end %>
-      <li <% if is_active_link?(decidim_admin_decidim_awesome.checks_path) %> class="is-active" <% end %>>
-        <%= icon_aria_selected_link_to I18n.t("menu.checks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.checks_path, "pulse" %>
-      </li>
-    </ul>
-  </div>
-<% end %>
-
-<%= render "layouts/decidim/admin/application" do %>
-  <div class="process-title">
-    <div class="process-title-content">
-      <%= link_to t("decidim.admin.menu.decidim_awesome"), decidim_admin_decidim_awesome.config_path(:editors), target: "_blank" %>
-    </div>
-  </div>
-
+<%= render "layouts/decidim/decidim_awesome/admin/base" do %>
   <%= yield %>
-
-<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/layouts/decidim/decidim_awesome/admin/maintenance.html.erb

@@ -0,0 +1,19 @@
+<%= render "layouts/decidim/decidim_awesome/admin/base" do %>
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
+      <%= t("layouts.decidim.decidim_awesome.admin.maintenance.title", title: t(current_view, scope: "layouts.decidim.decidim_awesome.admin.maintenance.titles")) %>
+
+      <% available_views.each do |view, parts| %>
+        <% next if view == current_view %>
+
+        <%= link_to parts[:path], class: "button button__secondary button__xs tiny button--title" do %>
+          <%= icon parts[:icon] %>
+          <%= parts[:title] %>
+        <% end %>
+      <% end %>
+    </h2>
+  </div>
+  <div class="card">
+    <%= yield %>
+  </div>
+<% end %>