decidim-budgets 0.27.9 → 0.28.0.rc4

data/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -1,51 +1,47 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= title.html_safe %>
-    </h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
-
-    <div class="row column">
-      <%= form.number_field :budget_amount %>
-    </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
 
-    <% if @form.geocoding_enabled? %>
       <div class="row column">
-        <%= form.geocoding_field :address %>
+        <%= form.translated :editor, :description, aria: { label: :description } %>
       </div>
-    <% end %>
 
-    <% if current_component.has_subscopes? %>
       <div class="row column">
-        <%= scopes_picker_field form, :decidim_scope_id, root: budget.scope %>
+        <%= form.number_field :budget_amount %>
       </div>
-    <% end %>
 
-    <div class="row column">
-      <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
-    </div>
+      <% if @form.geocoding_enabled? %>
+        <div class="row column">
+          <%= form.geocoding_field :address %>
+        </div>
+      <% end %>
+
+      <% if current_component.has_subscopes? %>
+        <div class="row column">
+          <%= scopes_select_field form, :decidim_scope_id, root: budget.scope %>
+        </div>
+      <% end %>
 
-    <% if Decidim::Budgets.enable_proposal_linking %>
       <div class="row column">
-        <%= proposals_picker(form, :proposals, proposals_picker_projects_path) %>
+        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
       </div>
-    <% end %>
 
-    <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
-
-    <% if form.object.persisted? %>
+    <% if Decidim::Budgets.enable_proposal_linking %>
       <div class="row column">
-        <%= form.check_box :selected %>
+        <%= render partial: "decidim/proposals/proposals/proposals_picker", locals: { form:, field: :proposals } %>
       </div>
     <% end %>
+
+      <%= render partial: "decidim/admin/shared/gallery", locals: { form: } %>
+
+      <% if form.object.persisted? %>
+        <div class="row column">
+          <%= form.check_box :selected %>
+        </div>
+      <% end %>
+    </div>
   </div>
 </div>

data/app/views/decidim/budgets/admin/projects/_project-tr.html.erb

@@ -6,47 +6,49 @@
     <%= project.id %><br>
   </td>
   <td>
-    <%= translated_attribute(project.title) %><br>
+    <% if allowed_to? :update, :project, project: project %>
+      <%= link_to translated_attribute(project.title), resource_locator([budget, project]).edit %><br>
+    <% else %>
+      <%= translated_attribute(project.title) %><br>
+    <% end %>
   </td>
   <td>
     <% if project.category %>
       <%= translated_attribute project.category.name %>
     <% end %>
   </td>
-  <% if current_component.has_subscopes? %>
-    <%= td_resource_scope_for(project.scope) %>
-  <% end %>
+  <%= td_resource_scope_for(project.scope) %>
   <td>
     <%= project.confirmed_orders_count %>
   </td>
   <td>
     <% if project.selected? %>
-      <%= content_tag :strong, t("yes", scope: "decidim.budgets.admin.projects.index.selected_options"), class: "label" %>
+      <%= content_tag :strong, t("projects.index.selected", scope: "decidim.budgets.admin"), class: "text-success" %>
     <% else %>
-      <%= content_tag :strong, t("no", scope: "decidim.budgets.admin.projects.index.selected_options"), class: "label secondary" %>
+      <%= content_tag :span, "close-line", class: "text-muted" %>
     <% end %>
   </td>
   <td class="table-list__actions">
-    <%= icon_link_to "eye", resource_locator([budget, project]).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
-
     <% if allowed_to? :update, :project, project: project %>
-      <%= icon_link_to "pencil", resource_locator([budget, project]).edit, t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
+      <%= icon_link_to "pencil-line", resource_locator([budget, project]).edit, t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
     <% end %>
 
     <% if allowed_to? :update, :project, project: project %>
-        <%= icon_link_to "folder", project_attachment_collections_path(project), t("actions.attachment_collections", scope: "decidim.budgets"), class: "action-icon--attachment_collections" %>
+      <%= icon_link_to "folder-line", project_attachment_collections_path(project), t("actions.attachment_collections", scope: "decidim.budgets"), class: "action-icon--attachment_collections" %>
     <% end %>
 
     <% if allowed_to? :update, :project, project: project %>
-      <%= icon_link_to "paperclip", project_attachments_path(project), t("actions.attachments", scope: "decidim.budgets"), class: "action-icon--attachments" %>
+      <%= icon_link_to "attachment-line", project_attachments_path(project), t("actions.attachments", scope: "decidim.budgets"), class: "action-icon--attachments" %>
     <% end %>
 
+    <%= icon_link_to "eye-line", resource_locator([budget, project]).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview", data: { "external-link": false } %>
+
     <%= resource_permissions_link(project) %>
 
     <% if allowed_to? :destroy, :project, project: project %>
-      <%= icon_link_to "circle-x", resource_locator([budget, project]).show, t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
+      <%= icon_link_to "delete-bin-line", resource_locator([budget, project]).show, t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
     <% else %>
-      <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
+      <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
     <% end %>
   </td>
 </tr>

data/app/views/decidim/budgets/admin/projects/bulk_actions/_budget-change.html.erb

@@ -0,0 +1,22 @@
+<div id="js-budget-change-projects-actions" class="hide js-bulk-action-form">
+  <%= form_tag(update_budget_budget_projects_path, method: :post, remote: true, id: "js-form-budget-change-projects", class: "form form-defaults flex items-center gap-x-2") do %>
+
+    <div class="checkboxes hide">
+      <% projects.each do |project| %>
+        <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
+      <% end %>
+    </div>
+
+    <%= budgets_select_tag(:reference_id) %>
+
+    <%= submit_tag(
+          t("decidim.budgets.admin.projects.index.update_budget_button"),
+          id: "js-submit-budget-change-projects",
+          class: "button button__sm button__secondary small button--simple float-left"
+        ) %>
+
+    <button id="js-cancel-budget-change-projects" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button">
+      <%= t("decidim.budgets.admin.projects.index.cancel") %>
+    </button>
+  <% end %>
+</div>

data/app/views/decidim/budgets/admin/projects/bulk_actions/_change-selected.html.erb

@@ -1,5 +1,5 @@
 <div id="js-change-selected-projects-actions" class="hide js-bulk-action-form">
-  <%= form_tag(update_selected_budget_projects_path, method: :post, remote: true, id: "js-form-change-selected-projects", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(update_selected_budget_projects_path, method: :post, remote: true, id: "js-form-change-selected-projects", class: "form form-defaults flex items-center gap-x-2") do %>
     <div class="checkboxes hide">
       <% projects.each do |project| %>
         <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
@@ -8,8 +8,8 @@
 
     <%= bulk_selections %>
 
-    <%= submit_tag(t("decidim.budgets.admin.projects.index.update"), id: "js-submit-edit-selected", class: "button small button--simple float-left") %>
+    <%= submit_tag(t("decidim.budgets.admin.projects.index.update"), id: "js-submit-edit-selected", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-edit-selected" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
+    <button id="js-cancel-edit-selected" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/budgets/admin/projects/bulk_actions/_dropdown.html.erb

@@ -1,10 +1,11 @@
 <div id="js-bulk-actions-wrapper">
   <button
     id="js-bulk-actions-button"
-    class="button button--nomargin tiny success light dropdown hide"
+    class="button button__sm button__secondary"
     type="button"
     data-toggle="js-bulk-actions-dropdown">
     <%= t("decidim.budgets.admin.projects.index.actions") %>
+    <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
   </button>
 
   <div
@@ -15,7 +16,7 @@
     data-dropdown="dropdown"
     data-auto-focus="false"
     data-events="resize">
-    <ul class="list-reset">
+    <ul>
       <li>
         <button type="button" data-action="recategorize-projects">
           <%= t("decidim.budgets.admin.projects.index.change_category") %>
@@ -31,6 +32,11 @@
           <%= t("decidim.budgets.admin.projects.index.change_selected") %>
         </button>
       </li>
+      <li>
+        <button type="button" data-action="budget-change-projects">
+          <%= t("decidim.budgets.admin.projects.index.change_budget") %>
+        </button>
+      </li>
     </ul>
   </div>
 </div>

data/app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb

@@ -1,5 +1,5 @@
 <div id="js-recategorize-projects-actions" class="hide js-bulk-action-form">
-  <%= form_tag(update_category_budget_projects_path, method: :post, remote: true, id: "js-form-recategorize-projects", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(update_category_budget_projects_path, method: :post, remote: true, id: "js-form-recategorize-projects", class: "form form-defaults flex items-center gap-x-2") do %>
     <div class="checkboxes hide">
       <% projects.each do |project| %>
         <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
@@ -8,8 +8,8 @@
 
     <%= bulk_categories_select current_component.categories %>
 
-    <%= submit_tag(t("decidim.budgets.admin.projects.index.update"), id: "js-submit-edit-category", class: "button small button--simple float-left") %>
+    <%= submit_tag(t("decidim.budgets.admin.projects.index.update"), id: "js-submit-edit-category", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-edit-category" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
+    <button id="js-cancel-edit-category" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/budgets/admin/projects/bulk_actions/_scope-change.html.erb

@@ -1,24 +1,21 @@
 <div id="js-scope-change-projects-actions" class="hide js-bulk-action-form">
-  <%= form_tag(update_scope_budget_projects_path, method: :post, remote: true, id: "js-form-scope-change-projects", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(update_scope_budget_projects_path, method: :post, remote: true, id: "js-form-scope-change-projects", class: "form form-defaults flex items-center gap-x-2") do %>
+
     <div class="checkboxes hide">
       <% projects.each do |project| %>
         <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
       <% end %>
     </div>
 
-    <%= scopes_picker_tag(
-          :scope_id,
-          try(:current_participatory_space)&.scope,
-          field: t("models.project.fields.scope", scope: "decidim.budgets")
-        ) %>
+    <%= scopes_select_tag(:scope_id) %>
 
     <%= submit_tag(
           t("decidim.budgets.admin.projects.index.update_scope_button"),
           id: "js-submit-scope-change-projects",
-          class: "button small button--simple float-left"
+          class: "button button__sm button__secondary small button--simple float-left"
         ) %>
 
-    <button id="js-cancel-scope-change-projects" class="button tiny clear compact js-cancel-bulk-action" type="button">
+    <button id="js-cancel-scope-change-projects" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button">
       <%= t("decidim.budgets.admin.projects.index.cancel") %>
     </button>
   <% end %>

data/app/views/decidim/budgets/admin/projects/edit.html.erb

@@ -1,8 +1,18 @@
 <% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
-<%= decidim_form_for([budget, @form], html: { class: "form edit_project" })  do |f| %>
-  <%= render partial: "form", object: f, locals: { title: "#{decidim_escape_translated(budget.title)} &gt; #{t(".title")}" } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= "#{translated_attribute(budget.title)} #{t(".title")}" %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for([budget, @form], html: { class: "form-defaults form edit_project" })  do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -1,42 +1,37 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card with-overflow">
-  <div class="card-divider">
-    <h2 class="card-title flex--sbc">
+<div class="card">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <div>
-        <%= link_to decidim_escape_translated(budget.title).html_safe, budgets_path %> &gt;
+        <%= link_to translated_attribute(budget.title), budgets_path %> &gt;
         <%= t(".title") %>
         <span id="js-selected-resources-count" class="component-counter component-counter--inline" title="<%= t("decidim.budgets.admin.projects.index.selected") %>"></span>
       </div>
       <%= render partial: "bulk-actions" %>
     </h2>
   </div>
-
   <%= admin_filter_selector(:projects) %>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= check_box_tag "projects_bulk", "all", false, class: "js-check-all" %></th>
-            <th><%= sort_link(query, :id, t("models.project.fields.id", scope: "decidim.budgets"), default_order: :desc) %>
-            <th><%= sort_link(query, :title, t("models.project.fields.title", scope: "decidim.budgets")) %></th>
-            <th><%= sort_link(query, :category_name, t("models.project.fields.category", scope: "decidim.budgets") ) %></th>
-            <% if current_component.has_subscopes? %>
-              <%= th_scope_sort_link %>
-            <% end %>
-            <th><%= sort_link(query, :confirmed_orders_count, t("index.confirmed_orders_count")) %></th>
-            <th><%= sort_link(query, :selected, t(".selected")) %></th>
-            <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% projects.each do |project| %>
-            <%= render partial: "project-tr", locals: { project: project } %>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate projects, theme: "decidim" %>
-    </div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= check_box_tag "projects_bulk", "all", false, class: "js-check-all" %></th>
+          <th><%= sort_link(query, :id, t("models.project.fields.id", scope: "decidim.budgets"), default_order: :desc) %>
+          <th><%= sort_link(query, :title, t("models.project.fields.title", scope: "decidim.budgets")) %></th>
+          <th><%= sort_link(query, :category_name, t("models.project.fields.category", scope: "decidim.budgets") ) %></th>
+          <%= th_scope_sort_link %>
+          <th><%= sort_link(query, :confirmed_orders_count, t("index.confirmed_orders_count")) %></th>
+          <th><%= sort_link(query, :selected, t(".selected")) %></th>
+          <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% projects.each do |project| %>
+          <%= render partial: "project-tr", locals: { project: } %>
+        <% end %>
+      </tbody>
+    </table>
+    <%= decidim_paginate projects %>
   </div>
   <div class="card-divider">
     <strong><%= t ".finished_orders" %>:&nbsp;</strong><span><%= finished_orders.count %></span>
@@ -45,4 +40,4 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_budgets_admin" %>
+<%= append_javascript_pack_tag "decidim_budgets_admin" %>

data/app/views/decidim/budgets/admin/projects/new.html.erb

@@ -1,8 +1,18 @@
 <% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
-<%= decidim_form_for([budget, @form], html: { class: "form new_project" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: "#{decidim_escape_translated(budget.title)} &gt; #{t(".title")}" } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= "#{translated_attribute(budget.title)} &gt; #{t(".title")}".html_safe %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for([budget, @form], html: { class: "form-defaults form new_project" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/budgets/admin/projects/update_attribute.js.erb

@@ -1,19 +1,23 @@
 <% if flash.now[:error].present? %>
   $("<%= form_selector %> <%= attribute_selector %>").addClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
+  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(alert), text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
 <% end %>
 
 <% if flash.now[:alert].present? %>
   $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
+  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(warning), text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
 <% end %>
 
 <% if flash.now[:notice].present? %>
-  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(success), text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+
+   <% @moved_items&.each do |id| %>
+    $(".table-list [data-id='<%= id %>']").remove()
+  <% end %>
 
   <% project_ids.each do |id| %>
     $(".table-list [data-id='<%= id %>']")
-      .replaceWith("<%= escape_javascript(render partial: %q{project-tr}, locals: { project: Decidim::Budgets::Project.find(id) }) %>");
+      .replaceWith("<%= escape_javascript(render partial: %q(project-tr), locals: { project: Decidim::Budgets::Project.find(id) }) %>");
   <% end %>
 
   $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")

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

@@ -1,33 +1,45 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, url: budget_proposals_import_path(budget), html: { class: "form import_proposals" }) do |f| %>
-  <% if @form.origin_components.any? %>
-    <div class="card">
-      <div class="card-divider">
-        <h2 class="card-title"><%= t(".title") %></h2>
-      </div>
 
-      <div class="card-section">
-        <div class="row column">
-          <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component"), label: t(".origin_component_id") %>
-        </div>
-        <% if current_component.scopes_enabled? %>
-          <div class="row column">
-            <%= scopes_picker_field f, :scope_id, root: budget.scope %>
+<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(@form, url: budget_proposals_import_path(budget), html: { class: "form form-defaults import_proposals" }) do |f| %>
+      <% if @form.origin_components.any? %>
+        <div class="form__wrapper">
+          <div class="card">
+            <div class="card-divider"></div>
+            <div class="card-section">
+              <div class="row column">
+                <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component"), label: t(".origin_component_id") %>
+              </div>
+              <% if current_component.scopes_enabled? %>
+                <div class="row column">
+                  <%= scopes_select_field f, :scope_id, root: budget.scope %>
+                </div>
+              <% end %>
+              <div class="row column">
+                <%= f.number_field :default_budget, label: t(".default_budget") %>
+              </div>
+              <div class="row column">
+                <%= f.check_box :import_all_accepted_proposals, label: t(".import_all_accepted_proposals") %>
+              </div>
+            </div>
           </div>
-        <% end %>
-        <div class="row column">
-          <%= f.number_field :default_budget, label: t(".default_budget") %>
-        </div>
-        <div class="row column">
-          <%= f.check_box :import_all_accepted_proposals, label: t(".import_all_accepted_proposals") %>
         </div>
-      </div>
-    </div>
 
-    <div class="button--double form-general-submit">
-      <%= f.submit t(".create") %>
-    </div>
-  <% else %>
-      <p><%= t(".no_components") %></p>
-  <% end %>
-<% end %>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+      <% else %>
+        <p><%= t(".no_components") %></p>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/budgets/budgets/index.html.erb

@@ -1,5 +1,23 @@
-<%= render partial: "decidim/shared/component_announcement" %>
+<% add_decidim_page_title component_name %>
+<%= append_javascript_pack_tag "decidim_budgets" %>
+<%= append_stylesheet_pack_tag "decidim_budgets", media: "all" %>
 
-<%= cell("decidim/budgets/budgets_header", current_workflow) %>
+<% content_for :aside do %>
+  <h1 class="title-decorator"><%= component_name %></h1>
+<% end %>
 
-<%= cell("decidim/budgets/budgets_list", current_workflow) %>
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+  <%= render partial: "decidim/shared/component_announcement" %>
+
+  <% if current_workflow.budgets.empty? %>
+    <%= cell("decidim/announcement", t("empty", scope: "decidim.budgets.budgets_list")) %>
+  <% end %>
+
+  <section class="layout-main__section">
+    <%= cell("decidim/budgets/budgets_header", current_workflow) %>
+  </section>
+
+  <section class="layout-main__section layout-main__heading">
+    <%= cell("decidim/budgets/budgets_list", current_workflow) %>
+  </section>
+<% end %>

data/app/views/decidim/budgets/budgets/index.js.erb

@@ -0,0 +1,6 @@
+var $budgets = $('#budgets');
+
+if ($budgets.length > 0) {
+  $budgets.html('<%= j(cell("decidim/budgets/budgets_list", current_workflow).main_list).strip.html_safe %>');
+  document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $budgets[0] }));
+}

data/app/views/decidim/budgets/line_items/update_budget.js.erb

@@ -1,24 +1,34 @@
-var $orderTotalBudget = $('#order-total-budget');
-var $orderSelectedProjects = $('#order-selected-projects');
-var $orderProgress = $('#order-progress');
+var $orderSelectedProjectsCount = $('#order-selected-projects-count');
+var $orderProgress = document.querySelectorAll('[id^=order-progress] .budget-summary__content');
 var $projectItem = $('#project-<%= project.id %>-item');
 var $projectBudgetButton = $('#project-<%= project.id %>-budget-button');
 var $budgetConfirm = $('#budget-confirm');
 
-morphdom($orderTotalBudget[0], '<%= j(render partial: "decidim/budgets/projects/order_total_budget").strip.html_safe %>');
-morphdom($orderSelectedProjects[0], '<%= j(render partial: "decidim/budgets/projects/order_selected_projects").strip.html_safe %>');
-morphdom($orderProgress[0], '<%= j(render partial: "decidim/budgets/projects/order_progress").strip.html_safe %>');
-morphdom($budgetConfirm[0], '<%= j(render partial: "decidim/budgets/projects/budget_confirm").strip.html_safe %>')
+$orderProgress.forEach((orderProgress) => {
+  var $orderTotalBudget = $(orderProgress).find("[id^=order-total-budget]");
+  $orderTotalBudget.html('<%= j(render partial: "decidim/budgets/projects/order_total_budget").strip.html_safe %>');
 
-$("#order-progress").foundation();
-$(".budget-summary__selected").foundation();
+  if(orderProgress.dataset.orderProgressResponsive) {
+    morphdom(orderProgress, '<%= j(render partial: "decidim/budgets/projects/order_progress_summary_content", locals: { include_heading: true, responsive: true }).strip.html_safe %>');
+  } else {
+    morphdom(orderProgress, '<%= j(render partial: "decidim/budgets/projects/order_progress_summary_content", locals: { include_heading: true, responsive: false }).strip.html_safe %>');
+  }
+})
+morphdom($budgetConfirm[0], '<%= j(render partial: "decidim/budgets/projects/budget_confirm").strip.html_safe %>')
+if ($orderSelectedProjectsCount.length > 0) {
+  morphdom($orderSelectedProjectsCount[0], '<%= j(render partial: "decidim/budgets/projects/projects_count", locals: { count: current_order.projects.size }).strip.html_safe %>')
+}
 
 if ($projectItem.length > 0) {
-  morphdom($projectItem[0], '<%= j(render partial: "decidim/budgets/projects/project", locals: { project: project }).strip.html_safe %>');
+  <% if params[:action] == "destroy" && params[:show_only_added] == "true" %>
+    $projectItem[0].remove();
+  <% else %>
+    morphdom($projectItem[0], '<%= j(render partial: "decidim/budgets/projects/project", locals: { project: }).strip.html_safe %>');
+  <% end %>
 }
 
 if ($projectBudgetButton.length > 0) {
-  morphdom($projectBudgetButton[0], '<%= j(render partial: "decidim/budgets/projects/project_budget_button", locals: { project: project }).strip.html_safe %>');
+  morphdom($projectBudgetButton[0], '<%= j(render partial: "decidim/budgets/projects/project_budget_button", locals: { project: }).strip.html_safe %>');
 }
 
 window.DecidimBudgets.checkProgressPosition();

data/app/views/decidim/budgets/projects/_addition_selector.html.erb

@@ -0,0 +1,16 @@
+<%= filter_form_for filter, url_for, data: { filters: "", component: "accordion" } do |form| %>
+  <%= form.collection_radio_buttons(
+        :addition_type,
+        filter_addition_type_values(added_count: search.result.with_order(current_order).size),
+        :first,
+        :last
+      ) do |builder|
+      builder.label(class: "button button__xs button__pill #{filter.addition_type == builder.value ? 'button__pill--active' : ''}") do %>
+      <span>
+        <%= builder.text[:text] %>
+      </span>
+      <%= render partial: "projects_count", locals: { count: builder.text[:count] } %>
+      <%= builder.radio_button(class: "!hidden") %>
+    <% end %>
+  <% end %>
+<% end %>