decidim-proposals 0.29.2 → 0.30.0.rc1

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

@@ -52,7 +52,7 @@
           </strong>
         </div>
 
-        <div class="flash flex-col " style="<%= "background-color: #{form.object.bg_color}; color: #{form.object.text_color}; border-color: #{form.object.text_color} / var(--tw-border-opacity);" %>" data-announcement-preview>
+        <div class="flash flex-col" style="<%= "background-color: #{form.object.bg_color}; color: #{form.object.text_color}; border-color: #{form.object.text_color} / var(--tw-border-opacity);" %>" data-announcement-preview>
           <div class="flash__title">
             <%= decidim_escape_translated(form.object.announcement_title).presence || t(".preview") %>
           </div>

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

@@ -0,0 +1,21 @@
+<% if view == :deleted %>
+  <%= icon_link_to "refresh-line", restore_proposal_path(proposal), t("actions.restore", scope: "decidim.admin"), method: :patch, class: "action-icon--restore" %>
+  <% else %>
+  <% if allowed_to? :edit, :proposal, proposal: proposal %>
+    <%= icon_link_to "pencil-line", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <%= icon_with_link_to_proposal(proposal) %>
+
+  <%= icon_link_to "eye-line", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+  <%= resource_permissions_link(proposal) %>
+
+  <% if allowed_to?(:soft_delete, :proposal, trashable_deleted_resource: proposal) %>
+    <%= icon_link_to "delete-bin-line", soft_delete_proposal_path(proposal), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_proposal", scope: "decidim.proposals.admin") } %>
+  <% else %>
+    <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.soft_delete", scope: "decidim.admin") %>
+  <% end %>
+<% end %>

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -30,8 +30,9 @@
   <% end %>
 </div>
 
-<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/recategorize" %>
-<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/scope-change" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/merge" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/split" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/publish_answers" %>
+<% if templates_available? %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/apply_answer_template", locals: { templates: find_templates_for_select(current_component) } %>
+<% end %>

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

@@ -47,32 +47,25 @@
           <%= form.geocoding_field :address %>
         </div>
       <% end %>
-      <% if @form.categories&.any? %>
-        <div class="row column">
-          <%= form.categories_select :category_id, @form.categories, include_blank: t(".select_a_category") %>
-        </div>
-      <% end %>
-      <% if current_component.has_subscopes? %>
-        <div class="row column">
-          <%= scopes_select_field form, :scope_id, root: current_component.scope %>
-        </div>
-      <% end %>
-      <% if component_settings.attachments_allowed? %>
-        <%= render partial: "decidim/admin/shared/gallery", locals: { form: } %>
+
+      <% if @form.taxonomy_filters&.any? %>
+        <% @form.taxonomy_filters.each do |filter| %>
+          <div class="row column">
+            <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+          </div>
+        <% end %>
       <% end %>
+
       <% if component_settings.attachments_allowed? %>
         <div class="row column">
-          <legend><%= t(".attachment_legend") %></legend>
-          <%= form.fields_for :attachment, @form.attachment do |form| %>
-            <%= form.text_field :title %>
-            <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
-            <% if params[:id].present? %>
-              <% if proposal.documents.present? %>
-                <%= form.hidden_field :id, value: proposal.documents.first.id %>
-                <%= form.check_box :delete_file, label: t(".delete_attachment"), value: proposal.documents.first.id %>
-              <% end %>
-            <% end %>
-          <% end %>
+          <%= form.attachment :documents,
+                              multiple: true,
+                              label: t("decidim.proposals.proposals.edit.add_attachments"),
+                              button_label: t("decidim.proposals.proposals.edit.add_attachments"),
+                              button_edit_label: t("decidim.proposals.proposals.edit.edit_attachments"),
+                              button_class: "button button__lg button__transparent-secondary w-full",
+                              help_i18n_scope: "decidim.forms.file_help.file",
+                              help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit") %>
         </div>
       <% end %>
     </div>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -1,4 +1,6 @@
-<tr data-id="<%= proposal.id %>" <%= "data-published-state=false" if proposal.answered? && !proposal.published_state? %>>
+<tr data-id="<%= proposal.id %>"
+    data-allow-answer="<%= allowed_to?(:create, :proposal_answer, proposal:) && !proposal.emendation? %>"
+    <%= "data-published-state=false" if proposal.answered? && !proposal.published_state? %>>
   <td>
     <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check  js-proposal-id-#{proposal.id}" %><br>
   </td>
@@ -6,24 +8,16 @@
     <% if allowed_to? :edit, :proposal, proposal: proposal %>
       <%= link_to present(proposal).title(html_escape: true), proposal_path(proposal) %><br>
     <% else %>
-      <%= present(proposal).title(html_escape: true) %><br>
+      <span class="text-md">
+        <%= present(proposal).title(html_escape: true) %><br>
+      </span>
     <% end %>
-    <div class="flex items-center gap-x-1 mt-2">
-      <% if proposal.category %>
-        <%= icon "price-tag-3-line", class: "fill-gray w-4 h-4" %>
-        <%= translated_attribute proposal.category.name %>
-      <% end %>
-      <div class="flex items-center gap-x-1">
-        <%= icon "scan-line", class: "fill-gray w-4 h-4" %>
-        <span>
-          <% if proposal.scope %>
-             <%= translated_attribute proposal.scope.name %>
-          <% else %>
-             <%= t("decidim.scopes.global") %>
-          <% end %>
-        </span>
+    <% proposal.taxonomies.each do |taxonomy| %>
+      <div class="flex items-center gap-x-1 mt-1 text-xs">
+        <%= icon "price-tag-3-line", class: "fill-gray w-3 h-3" %>
+        <%= translated_attribute taxonomy.name %>
       </div>
-    </div>
+    <% end %>
   </td>
   <td class="table-list__date">
     <%= l proposal.published_at, format: :decidim_short %>
@@ -67,16 +61,6 @@
   </td>
 
   <td class="table-list__actions">
-    <% if allowed_to? :edit, :proposal, proposal: proposal %>
-      <%= icon_link_to "pencil-line", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
-    <% else %>
-      <span class="action-space icon"></span>
-    <% end %>
-
-    <%= icon_with_link_to_proposal(proposal) %>
-
-    <%= icon_link_to "eye-line", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
-
-    <%= resource_permissions_link(proposal) %>
+    <%= render partial: "decidim/proposals/admin/proposals/actions", locals: { proposal:, view: } %>
   </td>
 </tr>

data/app/views/decidim/proposals/admin/proposals/_proposals-thead.html.erb

@@ -0,0 +1,45 @@
+<thead>
+<tr>
+  <th>
+    <%= check_box_tag "proposals_bulk", "all", false, class: "js-check-all" %>
+  </th>
+  <th class="!text-left">
+    <%= sort_link(query, :translated_title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
+  </th>
+  <th>
+    <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
+  </th>
+
+  <% unless current_settings.publish_answers_immediately? %>
+    <th>
+      <%= sort_link(query, :state_published, t("models.proposal.fields.published_answer", scope: "decidim.proposals") ) %>
+    </th>
+  <% end %>
+
+  <% if current_settings.votes_enabled? %>
+    <th>
+      <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
+    </th>
+  <% end %>
+
+  <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
+    <th>
+      <%= sort_link(query, :comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
+    </th>
+  <% end %>
+
+  <th>
+    <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
+  </th>
+
+  <th>
+    <%= sort_link(query, :valuation_assignments_count, t("models.proposal.fields.valuators", scope: "decidim.proposals") ) %>
+  </th>
+
+  <th>
+    <%= t("models.proposal.fields.state", scope: "decidim.proposals") %>
+  </th>
+
+  <th><%= t("actions.title", scope: "decidim.proposals") %></th>
+</tr>
+</thead>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_apply_answer_template.html.erb

@@ -0,0 +1,22 @@
+<div id="js-apply-answer-template-actions" class="hide js-bulk-action-form">
+  <%= form_tag(update_multiple_answers_proposals_path, method: :post, id: "js-form-apply-answer-template", class: "form form-defaults flex items-center gap-x-2") do %>
+    <div class="hide">
+      <% proposals.each do |proposal| %>
+        <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      <% end %>
+    </div>
+    <%= hidden_field_tag :template_id %>
+
+    <%= bulk_templates_select(
+          current_component,
+          templates.present? ?
+            t("apply_answer_template", scope: "decidim.proposals.admin.proposals.index") :
+            t("no_templates_available", scope: "decidim.proposals.admin.proposals.index"),
+          id: "template_id_select"
+        ) %>
+
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.update"), id: "js-submit-apply-answer-template", class: "button button__sm button__secondary small button--simple float-left") %>
+
+    <button id="js-cancel-apply-answer-template" class="button button__sm button__secondary button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+  <% end %>
+</div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb

@@ -10,23 +10,20 @@
 
   <div
     id="js-bulk-actions-dropdown"
-    class="dropdown-pane"
+    class="dropdown-pane dropdown-pane--buttons"
     data-position="bottom"
     data-alignment="right"
     data-dropdown="dropdown"
     data-auto-focus="false"
     data-events="resize">
     <ul>
-      <li>
-        <button type="button" data-action="recategorize-proposals">
-          <%= t("decidim.proposals.admin.proposals.index.change_category") %>
-        </button>
-      </li>
-      <li>
-        <button type="button" data-action="scope-change-proposals">
-          <%= t("decidim.proposals.admin.proposals.index.change_scope") %>
-        </button>
-      </li>
+      <% if current_component_taxonomy_filters&.any? %>
+        <li>
+          <button type="button" data-action="taxonomy-change-proposals">
+            <%= t("decidim.proposals.admin.proposals.index.change_taxonomies") %>
+          </button>
+        </li>
+      <% end %>
       <li>
         <button type="button" data-action="merge-proposals">
           <%= t("decidim.proposals.admin.proposals.index.merge") %>
@@ -49,6 +46,13 @@
           </button>
         </li>
       <% end %>
+      <% if templates_available? %>
+        <li>
+          <button type="button" data-action="apply-answer-template">
+            <%= t("decidim.proposals.admin.proposals.index.apply_answer_template") %>
+          </button>
+        </li>
+      <% end %>
       <li>
         <button type="button" data-action="publish-answers">
           <%= t("decidim.proposals.admin.proposals.index.publish_answers") %>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_taxonomy_change.html.erb

@@ -0,0 +1,23 @@
+<div id="js-taxonomy-change-proposals-actions" class="item_show__header__action-options js-bulk-action-form hide">
+  <%= form_tag(update_taxonomies_proposals_path, method: :post, id: "js-form-taxonomy-change-proposals", class: "form form-defaults w-full") do %>
+    <div class="hide">
+      <% proposals.each do |proposal| %>
+        <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      <% end %>
+    </div>
+
+    <% current_component_taxonomy_filters.each do |filter| %>
+        <div class="row column">
+        <label class="w-full font-semibold block mb-4" for="taxonomies_for_filter_<%= filter.id %>">
+            <%= decidim_sanitize_translated(filter.name) %>
+            <%= select_tag "taxonomies[]", options_for_select(taxonomy_items_options_for_filter(filter)), include_blank: I18n.t("decidim.taxonomies.prompt"), class: "w-full mt-2", id: "taxonomies_for_filter_#{filter.id}" %>
+        </label>
+        </div>
+    <% end %>
+
+    <div class="flex justify-end gap-x-4 mt-4">
+      <%= submit_tag(t("decidim.proposals.admin.proposals.index.change_taxonomies"), id: "js-submit-taxonomy-change-proposals", class: "button button__sm button__secondary small button--simple float-left") %>
+      <button class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    </div>
+  <% end %>
+</div>

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

@@ -13,64 +13,33 @@
       </div>
     </h1>
 
+    <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/taxonomy_change" %>
     <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_valuator" %>
     <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
   </div>
   <%= admin_filter_selector(filter_prefix_key) %>
   <div class="table-scroll mt-8">
     <table class="table-list">
-      <thead>
-        <tr>
-          <th>
-            <%= check_box_tag "proposals_bulk", "all", false, class: "js-check-all" %>
-          </th>
-          <th class="!text-left">
-            <%= sort_link(query, :translated_title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
-          </th>
-          <th>
-            <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
-          </th>
-
-          <% unless current_settings.publish_answers_immediately? %>
-            <th>
-              <%= sort_link(query, :state_published, t("models.proposal.fields.published_answer", scope: "decidim.proposals") ) %>
-            </th>
-          <% end %>
-
-          <% if current_settings.votes_enabled? %>
-            <th>
-              <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
-            </th>
-          <% end %>
-
-          <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
-            <th>
-              <%= sort_link(query, :comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
-            </th>
-          <% end %>
-
-          <th>
-            <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
-          </th>
-
-          <th>
-            <%= sort_link(query, :valuation_assignments_count, t("models.proposal.fields.valuators", scope: "decidim.proposals") ) %>
-          </th>
-
-          <th>
-            <%= t("models.proposal.fields.state", scope: "decidim.proposals") %>
-          </th>
-
-          <th><%= t("actions.title", scope: "decidim.proposals") %></th>
-        </tr>
-      </thead>
+      <%= render partial: "proposals-thead" %>
       <tbody>
-        <% proposals.each do |proposal| %>
-          <%= render partial: "proposal-tr", locals: { proposal: } %>
-        <% end %>
+        <%= render partial: "decidim/proposals/admin/proposals/proposal-tr",
+                   collection: proposals,
+                   as: :proposal,
+                   locals: { view: :index } %>
       </tbody>
     </table>
   </div>
+  <% if allowed_to? :manage_trash, :proposal, participatory_space: current_participatory_space %>
+    <div class="card mt-4">
+      <%= link_to manage_trash_proposals_path, class: "flex items-center underline text-secondary" do %>
+        <%= icon "delete-bin-2-line", class: "mr-2 fill-current text-secondary", role: "img" %>
+        <%= t("actions.view_deleted_proposals", scope: "decidim.proposals.admin") %>
+        <span class="ml-2">
+          <%= icon_with_tooltip("information-line", t("actions.deleted_proposals_info", scope: "decidim.proposals.admin")) %>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
 </div>
 
 <%= decidim_paginate proposals %>

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

@@ -0,0 +1,18 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="card">
+  <div class="item_show__header item_show__header--with-action-options">
+    <h1 class="item_show__header-title"><%= t(".title") %></h1>
+  </div>
+  <%= admin_filter_selector(filter_prefix_key) %>
+    <div class="table-scroll mt-8">
+      <table class="table-list">
+        <%= render partial: "proposals-thead" %>
+        <tbody>
+          <%= render partial: "decidim/proposals/admin/proposals/proposal-tr",
+                     collection: trashable_deleted_collection,
+                     as: :proposal,
+                     locals: { view: :deleted } %>
+        </tbody>
+      </table>
+    </div>
+</div>

data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb

@@ -2,7 +2,7 @@ $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), lo
 
 <% proposal_ids.each do |id| %>
   $(".table-list [data-id='<%= id %>']")
-    .replaceWith("<%= escape_javascript(render partial: %q(proposal-tr), locals: { proposal: proposal_find(id) }) %>");
+    .replaceWith("<%= escape_javascript(render partial: %q(proposal-tr), locals: { proposal: proposal_find(id), view: :index }) %>");
 <% end %>
 
 $(".js-check-all").prop('checked', false);

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

@@ -83,30 +83,18 @@
 
       </div>
       <div class="component__show_grid-item">
-        <% if proposal.category.present? %>
+        <% if proposal.taxonomies.present? %>
           <div class="card-section">
             <div class="row column">
-              <span class="component__show-title"><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></span>
-              <div class="flex items-center gap-x-2 mt-2">
-                <%= icon "price-tag-3-line", class: "fill-gray" %>
-                <p class="component__show-icon-text">
-                  <%= translated_attribute proposal.category.name %>
-                </p>
-              </div>
-            </div>
-          </div>
-        <% end %>
-
-        <% if proposal.scope.present? %>
-          <div class="card-section">
-            <div class="row column">
-              <span class="component__show-title"><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></span>
-              <div class="flex items-center gap-x-2 mt-2">
-                <%= icon "scan-line", class: "fill-gray" %>
-                <p class="component__show-icon-text">
-                  <%= translated_attribute proposal.scope.name %>
-                </p>
-              </div>
+              <span class="component__show-title"><%= t("models.proposal.fields.taxonomies", scope: "decidim.proposals") %></span>
+              <% proposal.taxonomies.each do |taxonomy| %>
+                <div class="flex items-center gap-x-2 mt-2">
+                  <%= icon "price-tag-3-line", class: "fill-gray" %>
+                  <p class="component__show-icon-text">
+                    <%= translated_attribute taxonomy.name %>
+                  </p>
+                </div>
+              <% end %>
             </div>
           </div>
         <% end %>

data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb

@@ -13,7 +13,7 @@
 
   <% proposal_ids.each do |id| %>
     $(".table-list [data-id='<%= id %>']")
-      .replaceWith("<%= escape_javascript(render partial: %q(proposal-tr), locals: { proposal: proposal_find(id) }) %>");
+      .replaceWith("<%= escape_javascript(render partial: %q(proposal-tr), locals: { proposal: proposal_find(id), view: :index }) %>");
   <% end %>
 
   $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")

data/app/views/decidim/proposals/admin/proposals_imports/new.html.erb

@@ -29,9 +29,6 @@
               <div class="row column">
                 <%= f.check_box :keep_answers %>
               </div>
-              <div class="row column">
-                <%= scopes_picker_filter f, :scope_ids %>
-              </div>
               <div class="row column">
                 <%= f.check_box :import_proposals %>
               </div>

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

@@ -0,0 +1,9 @@
+
+<% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+  <li role="menuitem">
+    <%= link_to edit_collaborative_draft_path(@collaborative_draft), class: "button button__sm button__text button__text-secondary", id: "collaborative_draft_edit" do %>
+      <span><%= t("edit", scope:"decidim.proposals.collaborative_drafts.show") %></span>
+      <%= icon "pencil-line" %>
+    <% end %>
+  </li>
+<% end %>

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

@@ -33,21 +33,6 @@
 </section>
 <% end %>
 
-<% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-<section class="layout-aside__section">
-  <%= link_to edit_collaborative_draft_path(@collaborative_draft), class: "button button__sm button__transparent-secondary w-full", id: "collaborative_draft_edit" do %>
-    <span><%= t("edit", scope:"decidim.proposals.collaborative_drafts.show") %></span>
-    <%= icon "pencil-line" %>
-  <% end %>
-</section>
-<% end %>
-
 <section class="layout-aside__section">
   <%= render partial: "collaborator_requests" %>
 </section>
-
-<section class="layout-aside__section actions__secondary">
-  <%= follow_button_for(@collaborative_draft) %>
-  <%= cell "decidim/share_button", nil %>
-  <%= cell "decidim/report_button", @collaborative_draft %>
-</section>

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

@@ -23,12 +23,10 @@
   <%= form.geocoding_field :address %>
 <% end %>
 
-<% if @form.categories&.any? %>
-  <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
-<% end %>
-
-<% if current_component.has_subscopes? %>
-  <%= scopes_select_field form, :scope_id, root: current_component.scope %>
+<% if @form.taxonomy_filters&.any? %>
+  <% @form.taxonomy_filters.each do |filter| %>
+    <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+  <% end %>
 <% end %>
 
 <% if component_settings.attachments_allowed? %>

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

@@ -1,4 +1,8 @@
-<% add_decidim_page_title(t("name", scope: "decidim.proposals.collaborative_drafts")) %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_participatory_space.short_description),
+  title: component_name,
+  url: proposals_url,
+  resource: current_component) %>
 
 <%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
 <%= append_javascript_pack_tag "decidim_proposals" %>
@@ -8,7 +12,7 @@
   <h1 id="drafts-count" class="title-decorator"><%= component_name %></h1>
 
   <% if current_settings.creation_enabled %>
-    <%= action_authorized_link_to :create, new_collaborative_draft_path, class: "button button__sm button__transparent-secondary", data: { "redirect_url" => new_collaborative_draft_path } do %>
+    <%= action_authorized_link_to :create, new_collaborative_draft_path, permissions_holder: current_component, class: "button button__sm button__transparent-secondary", data: { "redirect_url" => new_collaborative_draft_path } do %>
       <span><%= t("new_collaborative_draft", scope: "decidim.proposals.collaborative_drafts.new_collaborative_draft_button") %></span>
       <%= icon "add-line" %>
     <% end %>

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

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t("name", scope: "decidim.proposals.collaborative_drafts")) %>
-<% add_decidim_meta_tags({
-                           description: present(@collaborative_draft).body,
-                           title: present(@collaborative_draft).title,
-                           url: collaborative_draft_url(@collaborative_draft.id)
-                         }) %>
+<% add_decidim_meta_tags(
+  description: present(@collaborative_draft).body,
+  title: present(@collaborative_draft).title,
+  url: collaborative_draft_url(@collaborative_draft.id),
+  resource: @collaborative_draft) %>
 
 <%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
 <%= append_javascript_pack_tag "decidim_proposals" %>
@@ -25,14 +25,23 @@
       </div>
     <% end %>
 
-    <div class="layout-author">
-      <%= cell "decidim/coauthorships", @collaborative_draft, context_actions: [] %>
-
-      <% if @collaborative_draft.state %>
+    <% if @collaborative_draft.state %>
+      <div class="layout-author has_status">
         <span class="<%= collaborative_drafts_state_class(@collaborative_draft.state) %> label">
           <%= humanize_collaborative_draft_state(@collaborative_draft.state) %>
         </span>
-      <% end %>
+      </div>
+    <% end %>
+
+    <div class="layout-author <%= "has_status" if @collaborative_draft.state %>">
+      <div class="relative flex items-center justify-center w-full">
+        <div class="w-10/12 flex items-center gap-4">
+          <%= cell "decidim/coauthorships", @collaborative_draft, context_actions: [] %>
+        </div>
+        <%= render "decidim/shared/resource_actions", resource: @collaborative_draft do %>
+          <%= render "decidim/proposals/collaborative_drafts/collaborative_actions" %>
+        <% end %>
+      </div>
     </div>
   </section>
 
@@ -44,7 +53,14 @@
 
   <%= attachments_for @collaborative_draft %>
 
-  <%= render partial: "actions" %>
+  <%= cell "decidim/tags", @collaborative_draft %>
+
+  <section class="layout-main__section layout-main__buttons" data-buttons>
+    <%= cell "decidim/comments_button", nil %>
+    <div class="ml-auto lg:ml-0">
+      <%= cell "decidim/share_widget", @collaborative_draft %>
+    </div>
+  </section>
 
   <% content_for :item_footer do %>
     <%= comments_for @collaborative_draft %>