decidim-proposals 0.27.4 → 0.28.0.rc5

data/app/packs/stylesheets/decidim/proposals/proposals.scss

@@ -0,0 +1,97 @@
+@import "tom-select/dist/scss/tom-select";
+
+.proposal-list {
+  &__aside {
+    &__button-container {
+      @apply flex flex-col gap-4 md:gap-10 w-full;
+    }
+  }
+
+  &__map {
+    /* negative main padding values */
+    @apply md:-ml-16 -mt-6 md:-mt-12 aspect-square md:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 md:[&+*]:mt-12;
+  }
+}
+
+.proposal {
+  &__cost {
+    @apply space-y-3 bg-background rounded p-4 text-black;
+
+    &-period {
+      @apply text-gray-2 uppercase text-sm;
+    }
+  }
+
+  &__aside {
+    &-vote {
+      @apply flex flex-row-reverse md:flex-col gap-4 items-center md:items-stretch justify-between first:[&>*]:grow last:[&>*]:w-1/4 md:last:[&>*]:w-auto;
+    }
+  }
+
+  &__container {
+    [data-decidim-map] {
+      @apply aspect-[5/1];
+    }
+  }
+}
+
+.proposal-participatory {
+  &__heading {
+    @apply pb-6 border-b-4 border-background font-sans font-semibold text-xl md:text-3xl;
+  }
+
+  &__section {
+    @apply p-4 rounded hover:bg-background-4 space-y-4 transition;
+  }
+
+  &__section + &__section {
+    @apply mt-2;
+  }
+
+  &__title {
+    @apply block font-semibold text-xl text-secondary;
+  }
+
+  &__text {
+    @apply text-md text-gray-2;
+  }
+
+  &__button {
+    @apply inline-flex items-center gap-1 px-0 md:px-6 border-gray-3 border-0 md:border-r first:pl-0 last:pr-0 last:border-r-0 text-sm text-secondary;
+
+    & > span {
+      @apply underline;
+    }
+
+    & > svg {
+      @apply w-3.5 h-3.5 fill-current text-gray;
+    }
+  }
+
+  &__section:hover &__title {
+    @apply underline;
+  }
+
+  &__section:hover .label {
+    @apply text-white bg-secondary;
+  }
+}
+
+/* overwrite tom-select defaults */
+.ts {
+  &-control {
+    @apply border-gray text-md min-h-[40px];
+
+    input {
+      @apply font-normal text-black text-md;
+    }
+  }
+
+  &-dropdown {
+    @apply text-md text-gray-2 font-normal;
+
+    .active {
+      @apply text-white bg-secondary;
+    }
+  }
+}

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

@@ -72,7 +72,7 @@ module Decidim
         end
 
         def user_valuator_role
-          @user_valuator_role ||= space.user_roles(:valuator).find_by(user: user)
+          @user_valuator_role ||= space.user_roles(:valuator).find_by(user:)
         end
 
         def user_is_valuator?
@@ -84,7 +84,7 @@ module Decidim
         def valuator_assigned_to_proposal?
           @valuator_assigned_to_proposal ||=
             Decidim::Proposals::ValuationAssignment
-            .where(proposal: proposal, valuator_role: user_valuator_role)
+            .where(proposal:, valuator_role: user_valuator_role)
             .any?
         end
 
@@ -112,7 +112,7 @@ module Decidim
           component_settings.participatory_texts_enabled?
         end
 
-        # There's no special condition to create proposal notes, only
+        # There is no special condition to create proposal notes, only
         # users with access to the admin section can do it.
         def can_create_proposal_note?
           allow! if permission_action.subject == :proposal_note

data/app/permissions/decidim/proposals/permissions.rb

@@ -62,7 +62,7 @@ module Decidim
       def remaining_votes
         return 1 unless vote_limit_enabled?
 
-        proposals = Proposal.where(component: component)
+        proposals = Proposal.where(component:)
         votes_count = ProposalVote.where(author: user, proposal: proposals).size
         component_settings.vote_limit - votes_count
       end

data/app/presenters/decidim/proposals/admin_log/proposal_note_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Proposals::ProposalNote`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Proposals::Proposal`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/proposals/admin_log/valuation_assignment_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Proposals::ValuationAssignment`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -40,11 +40,11 @@ module Decidim
       def title(links: false, extras: true, html_escape: false, all_locales: false)
         return unless proposal
 
-        super proposal.title, links, html_escape, all_locales, extras: extras
+        super proposal.title, links, html_escape, all_locales, extras:
       end
 
       def id_and_title(links: false, extras: true, html_escape: false)
-        "##{proposal.id} - #{title(links: links, extras: extras, html_escape: html_escape)}"
+        "##{proposal.id} - #{title(links:, extras:, html_escape:)}"
       end
 
       def body(links: false, extras: true, strip_tags: false, all_locales: false)
@@ -53,6 +53,10 @@ module Decidim
         content_handle_locale(proposal.body, all_locales, extras, links, strip_tags)
       end
 
+      def editor_body(all_locales: false, extras: true)
+        editor_locales(proposal.body, all_locales, extras:)
+      end
+
       # Returns the proposal versions, hiding not published answers
       #
       # Returns an Array.

data/app/services/decidim/proposals/diff_renderer.rb

@@ -29,10 +29,10 @@ module Decidim
 
         diff.update(
           attribute => {
-            type: type,
+            type:,
             label: I18n.t(attribute, scope: i18n_scope),
-            old_value: old_value,
-            new_value: new_value
+            old_value:,
+            new_value:
           }
         )
       end

data/app/services/decidim/proposals/proposal_builder.rb

@@ -82,15 +82,15 @@ module Decidim
         proposal = if author.nil?
                      create_with_authors(
                        attributes: origin_attributes,
-                       original_proposal: original_proposal,
-                       action_user: action_user
+                       original_proposal:,
+                       action_user:
                      )
                    else
                      create(
                        attributes: origin_attributes,
-                       author: author,
-                       user_group_author: user_group_author,
-                       action_user: action_user
+                       author:,
+                       user_group_author:,
+                       action_user:
                      )
                    end
 
@@ -122,7 +122,7 @@ module Decidim
 
           new_attachment.save!
         rescue Errno::ENOENT, OpenURI::HTTPError => e
-          Rails.logger.warn("[ERROR] Couldn't copy attachment from proposal #{original_proposal.id} when copying to component due to #{e.message}")
+          Rails.logger.warn("[ERROR] Could not copy attachment from proposal #{original_proposal.id} when copying to component due to #{e.message}")
         end
       end
 

data/app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb

@@ -3,11 +3,9 @@
     <%= form.hidden_field :position, class: "position" %>
     <%= form.text_field :title, required: true %>
   </div>
-</div>
-<% if proposal.article? %>
-<div class="grid-x">
+  <% if proposal.article? %>
   <div class="cell">
     <%= form.text_area :body, required: true, rows: 5 %>
   </div>
+  <% end %>
 </div>
-<% end %>

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

@@ -1,2 +1,2 @@
-<%= link_to t(".discard_all"), discard_participatory_texts_path, method: "POST", id: "discard-all", class: "button tiny button--title alert", data: { confirm: t(".are_you_sure") } %>
-<%= link_to t(".import_doc"), new_import_participatory_texts_path, id: "import-doc", class: "button tiny button--title" %>
+<%= link_to t(".discard_all"), discard_participatory_texts_path, method: "POST", id: "discard-all", class: "button button__sm button__secondary alert", data: { confirm: t(".are_you_sure") } %>
+<%= link_to t(".import_doc"), new_import_participatory_texts_path, id: "import-doc", class: "button button__sm button__secondary" %>

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

@@ -1,54 +1,66 @@
-<%= decidim_form_for(@preview_form, url: participatory_texts_path, class: "form grid-container") do |form| %>
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t(".title") %>
-      <%= render partial: "bulk-actions" %>
-    </h2>
-  </div>
-  <div class="card-section">
-    <% if @drafts.any? %>
-      <p><%= t(".info_1") %></p>
-      <ul id="participatory-text" class="accordion js-sortable mb-m"
-        data-accordion
-        data-multi-expand="true"
-        data-allow-all-closed="true">
-        <%= form.fields_for(:proposals) do |prop_form| %>
-        <% proposal= @drafts[prop_form.index] %>
-          <li class="accordion-item <%= proposal.article? ? "is-active" : nil %>" data-accordion-item>
-            <a href="#" class="accordion-title flex--sbc"><%= preview_participatory_text_section_title(proposal) %><span class="mr-m"><%= icon "menu", class: "icon--small", role: "img", "aria-hidden": true %></span></a>
-            <div class="accordion-content" data-tab-content>
-              <%= render "article-preview", { form: prop_form, proposal: proposal } %>
-            </div>
-          </li>
-        <% end %>
-      </ul>
-    <% end -%>
-  </div>
+<% add_decidim_page_title(t(".title")) %>
+
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+    <%= render partial: "bulk-actions" %>
+  </h2>
 </div>
 <% if @drafts.any? %>
-  <div class="button--double form-general-submit">
-    <%= form.submit t(".save_draft"), name: :save_draft, class: "button" %>
-    <%= form.submit t(".publish_document"), class: "button success" %>
+  <div class="item__edit item__edit-1col">
+    <div class="item__edit-form">
+      <%= decidim_form_for(@preview_form, url: participatory_texts_path, html: { class: "form-defaults form grid-container" }) do |form| %>
+        <div class="form__wrapper">
+          <div class="card">
+            <div class="row column">
+              <p class="mt-3"><%= t(".info_1") %></p>
+              <ul id="participatory-text" class="draggable-list js-connect js-list-actives accordion  mb-m mt-2.5 ml-2.5 mr-2.5"
+                  data-accordion
+                  data-sort-url="#"
+                  data-multi-expand="true"
+                  data-allow-all-closed="true">
+                <%= form.fields_for(:proposals) do |prop_form| %>
+                  <% proposal = @drafts[prop_form.index] %>
+
+                  <li class="py-4 draggable-content <%= proposal.article? ? "is-active" : nil %>" data-accordion-item draggable="true">
+                    <a href="#" class="accordion-title font-bold mt-5"><%= preview_participatory_text_section_title(proposal) %>
+                      <span class="mr-m"><%= icon "menu-line", class: "fill-black" %></span>
+                    </a>
+                    <div class="accordion-content" data-tab-content>
+                      <%= render "article-preview", { form: prop_form, proposal: } %>
+                    </div>
+                  </li>
+                <% end %>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= form.submit t(".save_draft"), name: :save_draft, class: "button button__sm button__secondary" %>
+            <%= form.submit t(".publish_document"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+      <% end -%>
+    </div>
   </div>
 <% end %>
-<% end -%>
 <script>
-$(window).on("load", function() {
-  // Not all browsers submit the buttons as form data.
-  $('button[name="save_draft"]').on("click", function(ev) {
-    ev.preventDefault();
+  $(window).on("load", function() {
+    // Not all browsers submit the buttons as form data.
+    $("button[name=\"save_draft\"]").on("click", function(ev) {
+      ev.preventDefault();
 
-    var $form = $(this).parents("form");
-    $form.append('<input type="hidden" name="save_draft" value="true" />');
-    $form.submit();
+      var $form = $(this).parents("form");
+      $form.append("<input type=\"hidden\" name=\"save_draft\" value=\"true\" />");
+      $form.submit();
+    });
+    $("#participatory-text").on("sortupdate",
+      function(event, ui) {
+        $("#participatory-text li").each(function(idx, li) {
+          input = $(li).find("input.position").val(idx + 1);
+        });
+      }
+    );
   });
-  $( "#participatory-text" ).on( "sortupdate",
-    function( event, ui ) {
-      $('#participatory-text li').each(function(idx, li) {
-        input= $(li).find("input.position").val(idx+1)
-      })
-    }
-  )
-})
 </script>

data/app/views/decidim/proposals/admin/participatory_texts/new_import.html.erb

@@ -1,39 +1,37 @@
-<%= decidim_form_for(@import, url: import_participatory_texts_path, class: "form grid-container") do |form| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t(".title") %></h2>
-    </div>
-    <div class="card-section">
-      <div class="grid-x">
-        <div class="cell">
-          <div id="import-title" class="row column">
-            <%= form.translated :text_field, :title, autofocus: true %>
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@import, url: import_participatory_texts_path, html: { class: "form form-defaults grid-container" }) do |form| %>
+      <div class="form__wrapper">
+        <div class="card pt-4">
+          <div class="card-section">
+            <div id="import-title" class="row column">
+              <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+            </div>
+
+            <div id="import-desc" class="row column">
+              <%= form.translated :text_area, :description, aria: { label: :description } %>
+            </div>
+
+            <div class="row column">
+              <%= form.upload :document, label: t(".document_legend", valid_mime_types: mime_types_with_document_examples).html_safe, button_class: "button button__sm button__transparent-secondary" %>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="grid-x">
-        <div class="cell">
-          <div id="import-desc" class="row column">
-            <%= form.translated :text_area, :description %>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <div class="flex-col-reverse md:flex-row justify-between text-white">
+              <%= t(".bottom_hint") %>
+              <%= form.submit t(".upload_document"), class: "button button__sm button__secondary" %>
+            </div>
           </div>
         </div>
       </div>
-      <div class="grid-x">
-        <div class="cell">
-          <fieldset>
-            <legend> <%= t(".document_legend", valid_mime_types: mime_types_with_document_examples).html_safe %> </legend>
-              <div class="row column">
-                <%= form.upload :document, required: true %>
-              </div>
-          </fieldset>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="grid-x align-center mt-sm">
-    <%= form.submit t(".upload_document") %>
-  </div>
-  <div class="grid-x align-center">
-    <%= t(".bottom_hint") %>
+    <% end -%>
   </div>
-<% end -%>
+</div>

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

@@ -1,12 +1,17 @@
-<%= decidim_form_for(@answer_form, url: proposal_proposal_answer_path(proposal, @answer_form), html: { class: "form edit_proposal_answer" }) do |f| %>
-  <div class="card" id="proposal-answer">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title", title: present(proposal).title %></h2>
-    </div>
+<%= decidim_form_for(@answer_form, url: proposal_proposal_answer_path(proposal, @answer_form), html: { class: "form form-defaults edit_proposal_answer" }) do |f| %>
+  <div class="form__wrapper">
+    <div class="card" id="proposal-answer">
+      <div class="card-divider">
+        <h2 class="card-title"><%= t ".title", title: present(proposal).title %></h2>
+      </div>
 
-    <div class="card-section">
-      <div class="row column">
-        <%= f.collection_radio_buttons :internal_state, [["not_answered", t(".not_answered")], ["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, prompt: true %>
+      <% if defined?(Decidim::Templates) %>
+        <%= render "decidim/templates/admin/proposal_answer_templates/template_chooser", form: f %>
+      <% end %>
+
+      <div class="row column flex items-center gap-x-4 my-2">
+        <%= f.collection_radio_buttons :internal_state, [["not_answered", t(".not_answered")], ["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, prompt: true do |builder|
+              builder.label { builder.radio_button + builder.text } end %>
       </div>
 
       <div class="row column">
@@ -28,8 +33,9 @@
       <% end %>
     </div>
   </div>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".answer_proposal") %>
+  <div class="item__edit-sticky">
+    <div class="item__edit-sticky-container">
+      <%= f.submit t(".answer_proposal"), class: "button button__sm button__secondary" %>
+    </div>
   </div>
 <% end %>

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

@@ -1,8 +1,7 @@
-<%= decidim_form_for(@notes_form, url: proposal_proposal_notes_path(proposal, @notes_form), html: { class: "form new_proposal_note" }) do |f| %>
-  <div class="row column">
-    <%= f.text_area :body, rows: 10, label: t(".note") %>
-  </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".submit") %>
+<%= decidim_form_for(@notes_form, url: proposal_proposal_notes_path(proposal, @notes_form), html: { class: "form form-defaults new_proposal_note" }) do |f| %>
+  <div class="form__wrapper">
+    <%= f.text_area :body, rows: 4, label: t(".note"), class: "rounded border border-text-gray-2 mt-2" %>
   </div>
+
+  <%= f.submit t(".submit"), class: "button button__sm button__secondary" %>
 <% end %>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb

@@ -1,45 +1,37 @@
-<section class="comments">
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t("title", scope: "decidim.proposals.admin.proposal_notes") %></h2>
-    </div>
-
-    <div class="card-section">
-      <div class="comment-thread">
-        <% proposal.notes.each do |note| %>
-          <div class="card">
-            <div class="card-divider">
-              <div class="comment">
-                <div class="comment__header">
-                  <div class="author-data">
-                    <div class="author-data__main">
-                      <div class="author author--inline">
-                        <strong><span class="author__name"><%= note.author.name %></span></strong>
-                        <span><%= l note.created_at, format: :decidim_short %></span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div class="comment__content">
-                  <%= simple_format note.body %>
+<div class="component__show_notes" data-component="accordion" id="accordion-notes">
+  <button class="card-divider-button" data-controls="panel-notes" type="button">
+    <%= icon "arrow-right-s-line" %>
+    <h2 class="card-title">
+      <%= t("title", scope: "decidim.proposals.admin.proposal_notes") %>
+    </h2>
+  </button>
+  <div id="panel-notes">
+    <div class="component__show_notes-grid">
+      <% proposal.notes.each do |note| %>
+        <div class="comment">
+          <div class="comment__header">
+            <div class="author-data">
+              <div class="author-data__main">
+                <div class="author author--inline">
+                  <strong><span class="author__name"><%= note.author.name %></span></strong>
+                  <span><%= l note.created_at, format: :decidim_short %></span>
                 </div>
               </div>
             </div>
           </div>
-        <% end %>
-      </div>
-    </div>
-    <div class="card-section">
-      <div class="add-comment">
-        <div class="card">
-          <div class="card-divider">
-            <h2 class="card-title"><%= t("leave_your_note", scope: "decidim.proposals.admin.proposal_notes") %></h2>
-          </div>
-          <div class="card-section">
-            <%= render "decidim/proposals/admin/proposal_notes/form" %>
+          <div class="comment__content">
+            <%= simple_format note.body %>
           </div>
         </div>
+      <% end %>
+    </div>
+    <div class="card add-comment">
+      <div class="card-divider">
+        <h2 class="card-title"><%= t("leave_your_note", scope: "decidim.proposals.admin.proposal_notes") %></h2>
+      </div>
+      <div class="card-section">
+        <%= render "decidim/proposals/admin/proposal_notes/form" %>
       </div>
     </div>
   </div>
-</section>
+</div>

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

@@ -1,38 +1,35 @@
-<div class="flex--cc flex-gap--1">
+<div class="flex align-middle gap-x-4 ml-auto" id="js-other-actions-wrapper">
   <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/dropdown" %>
+  <% if component_settings.participatory_texts_enabled? %>
+    <%= link_to t("actions.participatory_texts", scope: "decidim.proposals"), participatory_texts_path, id: "participatory_texts", class: "button button__sm button__secondary" %>
+  <% end %>
 
-  <div id="js-other-actions-wrapper">
-    <% if component_settings.participatory_texts_enabled? %>
-      <%= link_to t("actions.participatory_texts", scope: "decidim.proposals"), participatory_texts_path, id: "participatory_texts", class: "button tiny button--simple" %>
-    <% end %>
-
-    <% if allowed_to? :export, :proposals %>
-      <%= export_dropdown %>
-    <% end %>
+  <% if allowed_to? :export, :proposals %>
+    <%= export_dropdowns(query) %>
+  <% end %>
 
-    <% if allowed_to? :import, :proposals %>
-      <%= import_dropdown do %>
-        <li class="imports--component imports--proposals">
-          <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
+  <% if allowed_to? :import, :proposals %>
+    <%= import_dropdown do %>
+      <li class="imports--component imports--proposals">
+        <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
+      </li>
+      <% current_component.manifest.import_manifests.each do |import_manifest| %>
+        <li class="imports--file imports--<%= import_manifest.name %>">
+          <%= link_to import_manifest.message(:label, self), admin_imports_path(current_component, name: import_manifest.name) %>
         </li>
-        <% current_component.manifest.import_manifests.each do |import_manifest| %>
-          <li class="imports--file imports--<%= import_manifest.name %>">
-            <%= link_to import_manifest.message(:label, self), admin_imports_path(current_component, name: import_manifest.name) %>
-          </li>
-        <% end %>
       <% end %>
     <% end %>
+  <% end %>
 
-    <% if allowed_to? :create, :proposal %>
-      <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button tiny button--simple" %>
-    <% 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/assign_to_valuator" %>
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
-  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/publish_answers" %>
+  <% if allowed_to? :create, :proposal %>
+    <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button button__sm button__secondary" %>
+  <% 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/assign_to_valuator" %>
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
+<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/publish_answers" %>