decidim-budgets 0.29.1 → 0.30.0.rc1

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

@@ -13,13 +13,8 @@
     <% end %>
   </td>
   <td>
-    <% if project.category %>
-      <%= translated_attribute project.category.name %>
-    <% end %>
+    <%= project.taxonomies.map { |taxonomy| decidim_sanitize_translated(taxonomy.name) }.join(", ") %>
   </td>
-  <% if current_component.has_subscopes? %>
-    <%= td_resource_scope_for(project.scope) %>
-  <% end %>
   <td>
     <%= project.confirmed_orders_count %>
   </td>
@@ -36,26 +31,6 @@
     </td>
   <% end %>
   <td class="table-list__actions">
-    <% if allowed_to? :update, :project, project: project %>
-      <%= 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-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 "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 "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 "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
-    <% end %>
+    <%= render partial: "decidim/budgets/admin/projects/actions", locals: { project:, view: } %>
   </td>
 </tr>

data/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb

@@ -0,0 +1,14 @@
+<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>
+  <th class="!text-left"><%= sort_link(query, :title, t("models.project.fields.title", scope: "decidim.budgets")) %></th>
+  <th><%= sort_link(query, :taxonomies_name, t("models.project.fields.taxonomies", scope: "decidim.budgets") ) %></th>
+  <th><%= sort_link(query, :confirmed_orders_count, t("index.confirmed_orders_count")) %></th>
+  <th><%= sort_link(query, :selected, t("projects.index.selected", scope: "decidim.budgets.admin")) %></th>
+  <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
+    <th><%= t("models.project.fields.map", scope: "decidim.budgets") %></th>
+  <% end %>
+  <th><%= t("actions.title", scope: "decidim.budgets") %></th>
+</tr>
+</thead>

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

@@ -17,16 +17,13 @@
     data-auto-focus="false"
     data-events="resize">
     <ul>
-      <li>
-        <button type="button" data-action="recategorize-projects">
-          <%= t("decidim.budgets.admin.projects.index.change_category") %>
-        </button>
-      </li>
-      <li>
-        <button type="button" data-action="scope-change-projects">
-          <%= t("decidim.budgets.admin.projects.index.change_scope") %>
-        </button>
-      </li>
+      <% if current_component_taxonomy_filters&.any? %>
+        <li>
+          <button type="button" data-action="taxonomy-change-projects">
+            <%= t("decidim.budgets.admin.projects.index.change_taxonomies") %>
+          </button>
+        </li>
+      <% end %>
       <li>
         <button type="button" data-action="change-selected-projects">
           <%= t("decidim.budgets.admin.projects.index.change_selected") %>

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

@@ -0,0 +1,23 @@
+<div id="js-taxonomy-change-projects-actions" class="item_show__header__action-options js-bulk-action-form hide">
+  <%= form_tag(update_taxonomies_budget_projects_path, method: :post, id: "js-form-taxonomy-change-projects", class: "form form-defaults w-full") do %>
+    <div class="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>
+
+    <% 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.budgets.admin.projects.index.change_taxonomies"), id: "js-submit-taxonomy-change-projects", 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.budgets.admin.projects.index.cancel") %></button>
+    </div>
+  <% end %>
+</div>

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

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
-  <div class="item_show__header">
+  <div class="item_show__header item_show__header--with-action-options">
     <h1 class="item_show__header-title">
       <div>
         <%= link_to decidim_escape_translated(budget.title), budgets_path %> &gt;
@@ -9,33 +9,31 @@
       </div>
       <%= render partial: "bulk-actions" %>
     </h1>
+
+    <%= render partial: "decidim/budgets/admin/projects/bulk_actions/taxonomy_change" %>
   </div>
   <%= admin_filter_selector(:projects) %>
   <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>
-          <th class="!text-left"><%= 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>
-          <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
-            <th><%= t("models.project.fields.map", scope: "decidim.budgets") %></th>
-          <% end %>
-          <th><%= t("actions.title", scope: "decidim.budgets") %></th>
-        </tr>
-      </thead>
+      <%= render partial: "projects-thead" %>
       <tbody>
-        <% projects.each do |project| %>
-          <%= render partial: "project-tr", locals: { project: } %>
-        <% end %>
+        <%= render partial: "decidim/budgets/admin/projects/project-tr",
+                   collection: projects,
+                   as: :project,
+                   locals: { view: :index } %>
       </tbody>
     </table>
+    <% if allowed_to? :manage_trash, :project, participatory_space: current_participatory_space %>
+      <div class="card mt-4">
+        <%= link_to manage_trash_budget_projects_path(budget), 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_projects", scope: "decidim.budgets") %>
+          <span class="ml-2">
+          <%= icon_with_tooltip("information-line", t("actions.deleted_budgets_info", scope: "decidim.budgets")) %>
+        </span>
+        <% end %>
+      </div>
+    <% end %>
     <%= decidim_paginate projects %>
   </div>
   <div class="card-divider">

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

@@ -0,0 +1,26 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="card">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <div>
+        <%= link_to decidim_escape_translated(budget.title), budgets_path %> &gt;
+        <%= t(".title") %>
+        <span id="js-selected-resources-count" class="component-counter" title="<%= t("decidim.budgets.admin.projects.index.selected") %>"></span>
+      </div>
+      <%= render partial: "bulk-actions" %>
+    </h1>
+  </div>
+  <%= admin_filter_selector(:projects) %>
+  <div class="table-scroll">
+    <table class="table-list">
+      <%= render partial: "projects-thead" %>
+      <tbody>
+        <%= render partial: "decidim/budgets/admin/projects/project-tr",
+                   collection: trashable_deleted_collection,
+                   as: :project,
+                   locals: { view: :deleted } %>
+      </tbody>
+    </table>
+    <%= decidim_paginate projects %>
+  </div>
+</div>

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

@@ -17,7 +17,7 @@
 
   <% 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), view: :index }) %>");
   <% end %>
 
   $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")

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

@@ -17,11 +17,6 @@
               <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>

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

@@ -1,4 +1,9 @@
-<% add_decidim_page_title component_name %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_component.participatory_space.try(:description)),
+  title: component_name,
+  url: budgets_url,
+  resource: current_component) %>
+
 <%= append_javascript_pack_tag "decidim_budgets" %>
 <%= append_stylesheet_pack_tag "decidim_budgets", media: "all" %>
 

data/app/views/decidim/budgets/order_summary_mailer/order_summary.html.erb

@@ -1,18 +1,8 @@
-<% if @component.try(:scopes_enabled) %>
-<%= t(
-  ".voted_on_space_with_scope",
-  budget_name: translated_attribute(@budget.title),
-  space_name: translated_attribute(@space.title),
-  scope_name: translated_attribute(@component.scope.name),
-  scope_type: translated_attribute(@component.scope.scope_type.name)
-) %>
-<% else %>
 <%= t(
   ".voted_on_space",
   budget_name: translated_attribute(@budget.title),
   space_name: translated_attribute(@space.title)
 ) %>
-<% end %>
 
 <p><%= t(".selected_projects") %></p>
 

data/app/views/decidim/budgets/orders/status.html.erb

@@ -0,0 +1,52 @@
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="flex flex-col gap-4 items-center text-center my-12">
+    <div class="success-image">
+      <svg class="animation-success__checkmark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
+        <circle class="animation-success__checkmark__circle" cx="26" cy="26" r="25" fill="none" />
+        <path class="animation-success__checkmark__check" fill="none" d="M14.1 27.2l7.1 7.2 16.7-16.8" />
+      </svg>
+    </div>
+
+    <h1 class="h1 inline-block">
+      <%= t("title", scope: "decidim.budgets.order.status") %>
+    </h1>
+
+    <p>
+      <%= t(
+            "votes_count",
+            scope: "decidim.budgets.order.status",
+            count: current_order.total_projects,
+            budget_name: translated_attribute(current_order.budget.title)
+          ) %>
+    </p>
+
+    <% if pending_to_vote_budgets.present? %>
+      <p class="text-bold">
+        <%= t("pending_to_vote_budgets", scope: "decidim.budgets.order.status", count: pending_to_vote_budgets.count) %>
+      </p>
+    <% end %>
+  </div>
+
+  <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+    <button class="button button__sm md:button__lg button__text-secondary">
+      <span><%= t("share_vote", scope: "decidim.budgets.order.status") %></span>
+      <%= icon "share-line", class: "fill-current" %>
+    </button>
+
+    <button class="button button__sm md:button__lg button__transparent-secondary">
+      <span><%= t("download_vote", scope: "decidim.budgets.order.status") %></span>
+      <%= icon "download-line", class: "fill-current" %>
+    </button>
+
+    <%= link_to budgets_path, class: "button button__sm md:button__lg button__secondary" do %>
+      <span>
+        <% if pending_to_vote_budgets.present? %>
+          <%= t("continue_voting", scope: "decidim.budgets.order.status") %>
+        <% else %>
+          <%= t("view_votes", scope: "decidim.budgets.order.status", count: current_order.total_projects) %>
+        <% end %>
+      </span>
+      <%= icon "arrow-right-line", class: "fill-current" %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -23,7 +23,7 @@
       <div class="budget-progress" role="progressbar" aria-label="<%= t("budget", scope: "decidim.budgets.projects.order_progress") %>" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %> %" aria-valuemin="0" aria-valuemax="100">
         <div class="budget-summary__progressbar--minimum" style="width: <%= current_order_budget_percent_minimum %>%">
         </div>
-        <div class="budget-summary__progressbar--meter" style="width: <%= current_order_budget_percent %>%"> </div>
+        <div class="budget-summary__progressbar--meter bg-success" style="width: <%= current_order_budget_percent %>%"> </div>
       </div>
       <div class="budget-summary__progressbar-marks">
         <span class="budget-summary__progressbar-legend" style="width: <%= current_order_budget_percent_minimum %>%;">
@@ -59,7 +59,7 @@
     <% end %>
   </div>
   <div class="budget-summary__button-modal">
-    <button type="button" data-dialog-open="budget-modal-info" aria-haspopup="dialog" tabindex="0" class="button button__text button__xs">
+    <button type="button" data-dialog-open="budget-modal-info" aria-haspopup="dialog" tabindex="0" class="button button__text button__xs underline font-bold">
       <%= t("more_information", scope: "decidim.budgets.budget_information_modal") %>
     </button>
   </div>
@@ -69,7 +69,7 @@
         <div class="budget-progress relative" role="progressbar" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemin="0" aria-valuemax="100">
           <div class="budget-summary__progressbar--minimum" style="width: <%= current_order_budget_percent_minimum %>%">
           </div>
-          <div class="budget-summary__progressbar--meter" style="width: <%= current_order_budget_percent %>%">
+          <div class="budget-summary__progressbar--meter bg-success" style="width: <%= current_order_budget_percent %>%">
           </div>
         </div>
         <div class="budget-summary__progressbar-marks">

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

@@ -1,4 +1,12 @@
-<% add_decidim_page_title t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)) %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(budget.description),
+  title: t("decidim.components.pagination.page_title",
+           component_name: t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)),
+           current_page: projects.current_page,
+           total_pages: projects.total_pages ),
+  url: budget_url(budget),
+  resource: budget) %>
+
 <%= append_javascript_pack_tag "decidim_budgets" %>
 <%= append_stylesheet_pack_tag "decidim_budgets" %>
 
@@ -27,22 +35,7 @@
 
     <% if Decidim::Map.available?(:geocoding, :dynamic) && component_settings.geocoding_enabled? %>
       <div class="budget-list__map">
-        <%= dynamic_map_for projects_data_for_map(all_geocoded_projects) do %>
-          <template id="marker-popup">
-            <div class="space-y-6">
-              <a href="${link}" class="card__list">
-                <div class="card__list-content">
-                  <h3 class="h4 card__list-title">${title}</h3>
-                  <div class="card__list-metadata">
-                    {{each JSON.parse(items)}}
-                      <span>{{html icon}}{{html text}}</span>
-                    {{/each}}
-                  </div>
-                </div>
-              </a>
-            </div>
-          </template>
-        <% end %>
+        <%= cell "decidim/map", all_geocoded_projects, metadata_card: "decidim/budgets/project_metadata" %>
       </div>
     <% end %>
 

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

@@ -8,4 +8,14 @@ $order.html('<%= j(render partial: "order").strip.html_safe %>');
 $projectsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 $orderFilterInput.val('<%= order %>');
 
+var $map = $("#map");
+var controller = $map.data("map-controller");
+if (controller) {
+  var markerData = JSON.parse('<%= escape_javascript cell("decidim/map", all_geocoded_projects, metadata_card: "decidim/budgets/project_metadata").geocoded_data.to_json.html_safe %>');
+  controller.clearMarkers();
+  if (markerData.length > 0){
+    controller.addMarkers(markerData);
+  }
+}
+
 document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $projects[0] }));

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

@@ -1,7 +1,7 @@
 <% add_decidim_meta_tags(
   title: translated_attribute(project.title),
-  description: translated_attribute(project.description)
-) %>
+  description: translated_attribute(project.description),
+  resource: project) %>
 
 <%
 edit_link(
@@ -37,9 +37,17 @@ edit_link(
         </div>
       <% end %>
       <%= cell("decidim/budgets/project_selected_status", project, as_label: true) %>
-      <h1 class="h1 decorator budget__definition-project__title editor-content">
-        <%= decidim_sanitize translated_attribute project.title %>
-      </h1>
+
+      <div class="layout-author">
+        <div class="relative flex items-center justify-center w-full">
+          <div class="w-10/12 flex items-center gap-4">
+            <h1 class="h1 decorator budget__definition-project__title editor-content">
+              <%= decidim_sanitize translated_attribute project.title %>
+            </h1>
+          </div>
+          <%= render "decidim/shared/resource_actions", resource: project, skip_report: true %>
+        </div>
+      </div>
     </section>
     <section class="layout-main__section">
       <div class="editor-content">
@@ -67,10 +75,14 @@ edit_link(
         </div>
       <% end %>
     </section>
+
+    <%= cell("decidim/tags", project) %>
+
     <section class="layout-main__section layout-main__buttons" data-buttons>
       <%= cell "decidim/comments_button", nil %>
-      <div class="ml-auto">
-        <%= cell "decidim/budgets/project_tags", project %>
+
+      <div class="ml-auto lg:ml-0">
+        <%= cell "decidim/share_widget", project %>
       </div>
     </section>
 
@@ -88,10 +100,6 @@ edit_link(
           <%= budget_to_currency project.budget_amount %>
         </div>
       </section>
-      <section class="layout-aside__section actions__secondary">
-        <%= render partial: "decidim/shared/follow_button", class: "text-center", locals: { followable: project, large: false } %>
-        <%= cell "decidim/share_button", nil %>
-      </section>
     <% end %>
     <% content_for :item_footer do %>
       <%= comments_for project, polymorphic: [project.budget] %>

data/config/locales/ar.yml

@@ -7,8 +7,6 @@ ar:
         title: العنوان
         total_budget: الميزانية الإجمالية
       project:
-        decidim_category_id: الفئة
-        decidim_scope_id: نطاق
         description: وصف
         proposal_ids: المقترحات ذات الصلة
         title: عنوان
@@ -22,17 +20,10 @@ ar:
         many: مشاريع
         other: مشاريع
   decidim:
-    admin:
-      filters:
-        projects:
-          category_id_eq:
-            label: الفئة
     budgets:
       actions:
         attachment_collections: المجلدات
         attachments: مرفقات
-        confirm_destroy: هل أنت متأكد أنك تريد حذف هذا المشروع؟
-        destroy: حذف
         edit: تعديل
         edit_projects: إدارة المشاريع
         import: استيراد مقترحات للمشاريع
@@ -57,7 +48,6 @@ ar:
           index:
             actions: الإجراءات
             cancel: إلغاء
-            change_category: تغيير الفئة
             finished_orders: الانتهاء من الأصوات
             pending_orders: في انتظار الأصوات
             selected_options:
@@ -90,8 +80,10 @@ ar:
             name: الإسم
         project:
           fields:
-            category: الفئة
             title: عنوان
+      order:
+        status:
+          title: تم قبول تصويتك بنجاح
       projects:
         budget_confirm:
           cancel: إلغاء
@@ -116,8 +108,6 @@ ar:
             many: "%{count} مشاريع"
             other: "%{count} مشاريع"
         filters:
-          category: الفئة
-          scope: نطاق
           search: بحث
         show:
           budget: ميزانية
@@ -127,6 +117,7 @@ ar:
     components:
       budgets:
         actions:
+          comment: تعليق
           vote: تصويت
         name: الميزانيات
         settings: