decidim-budgets 0.20.1 → 0.23.1

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

@@ -11,9 +11,9 @@
       <ul class="card__content">
         <% current_order.projects.each do |project| %>
           <li class="budget-summary__selected-item">
-            <%= link_to translated_attribute(project.title), project %>
+            <%= link_to translated_attribute(project.title), resource_locator([budget, project]).path %>
             <strong class="budget-summary__selected-number">
-              <%= budget_to_currency project.budget %>
+              <%= budget_to_currency project.budget_amount %>
             </strong>
           </li>
         <% end %>
@@ -22,7 +22,7 @@
     <p class="text-center"><%= t(".are_you_sure") %></p>
     <div class="row">
       <div class="columns medium-8 medium-offset-2">
-        <%= button_to t(".confirm"), checkout_order_path, class: "button expanded", data: { disable: true } %>
+        <%= button_to t(".confirm"), checkout_budget_order_path(budget), class: "button expanded", data: { disable: true } %>
       </div>
     </div>
     <div class="text-center">

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

@@ -1,21 +1,38 @@
-<div class="card budget-summary" data-progress-reference>
+<div class="card budget-summary" data-progress-reference data-safe-url="<%= budget_url(budget) %>">
   <div class="card__content">
     <% if include_heading %>
       <% if current_order_checked_out? %>
-        <h3 class="heading3"><%= t(".checked_out.title") %></h3>
+        <h3 class="heading3">
+          <%= t(".checked_out.title") %>
+          <% unless current_workflow.single? %>
+            <small><%= translated_attribute(budget.title) %></small>
+          <% end %>
+        </h3>
         <p>
-          <%= raw t(".checked_out.description", cancel_link: link_to(t(".cancel_order"), order_path, method: :delete, class: "cancel-order", data: { confirm: t(".are_you_sure") })) %>
+          <%= raw t(".checked_out.description", cancel_link: link_to(t(".cancel_order"), budget_order_path(return_to: "budget"), method: :delete, class: "cancel-order", data: { confirm: t(".are_you_sure") })) %>
         </p>
       <% else %>
-        <h3 class="heading3"><%= t(".title") %></h3>
-        <p><%= t(".description", minimum_budget: budget_to_currency(current_order&.minimum_budget)) %></p>
+        <h3 class="heading3">
+          <% if current_workflow.single? %>
+            <%= t(".title") %>
+          <% else %>
+            <%= translated_attribute(budget.title) %>
+          <% end %>
+        </h3>
+        <p>
+          <% if current_order.minimum_projects_rule? %>
+            <%= t(".description_minimum_projects_rule", minimum_number: current_order.minimum_projects) %>
+          <% else %>
+            <%= t(".description", minimum_budget: budget_to_currency(current_order.minimum_budget)) %>
+          <% end %>
+        </p>
       <% end %>
     <% end %>
 
-    <div class="budget-summary__total" data-total-budget="<%= component_settings.total_budget %>">
+    <div class="budget-summary__total" data-total-budget="<%= budget.total_budget %>">
       <span class="mini-title"><%= t("total_budget") %>
         <strong class="mini-title__strong mini-title__strong--highlight">
-          <%= budget_to_currency(component_settings.total_budget) %>
+          <%= budget_to_currency(budget.total_budget) %>
         </strong>
       </span>
     </div>
@@ -28,6 +45,8 @@
         <%= render partial: "order_total_budget" %>
       </span>
     </div>
+
+    <%= cell("decidim/budgets/budget_information_modal", budget) %>
   </div>
 
   <%= render partial: "order_selected_projects" %>

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

@@ -1,22 +1,30 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "projects" } %>
+
 <%= filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="projects">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img", "aria-hidden": true %>
           </button>
         </div>
       </div>
     </div>
   </div>
 
-  <% if current_participatory_space.has_subscopes? %>
-    <%= scopes_picker_filter form, :scope_id %>
+  <% if voting_finished? %>
+    <%= form.check_boxes_tree :status, filter_status_values, legend_title: t(".status"), "aria-controls": "projects" %>
+  <% end %>
+
+  <% if current_component.has_subscopes? %>
+    <%= form.check_boxes_tree :scope_id, resource_filter_scope_values(budget.scope), legend_title: t(".scope"), "aria-controls": "projects" %>
   <% end %>
 
-  <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
+  <% if current_participatory_space.categories.any? %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "projects" %>
   <% end %>
+
+  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

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

@@ -1,8 +1,8 @@
 <div class="card card--action card--list">
   <% resources.each do |project| %>
     <div class="card--list__item">
-      <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
-      <%= link_to resource_locator(project).path, class: "card--list__text card__link card__link--block" do %>
+      <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
+      <%= link_to resource_locator([project.budget, project]).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(project.title) %>
         </h5>

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

@@ -1,35 +1,31 @@
 <div id="order-progress">
   <div class="budget-summary__progressbox" data-current-budget="<%= current_order ? current_order.total_budget : 0 %>">
-    <div class="progress budget-progress" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= component_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
-      <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
+    <div class="progress budget-progress" role="progressbar" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemin="0" aria-valuemax="100">
+      <div class="progress-meter progress-meter--minimum" style="width: <%= current_order_budget_percent_minimum %>%"></div>
       <!--Change width and text dynamically.-->
       <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
-        <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
+        <span class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</span>
       </div>
     </div>
-    <% unless current_order_checked_out? %>
-      <% if current_order_can_be_checked_out? %>
-        <button class="button small button--sc" data-toggle="budget-confirm"><%= t(".vote") %></button>
-      <% else %>
-        <button class="button small button--sc" data-toggle="budget-confirm" disabled><%= t(".vote") %></button>
-      <% end %>
+    <% if !current_order_checked_out? && voting_open? %>
+      <button class="button small button--sc" data-toggle="budget-confirm" <%= budget_confirm_disabled_attr %>>
+        <%= t(".vote") %>
+      </button>
     <% end %>
   </div>
 
   <div class="progressbox-fixed-wrapper" data-progressbox-fixed>
     <div class="budget-summary__progressbox budget-summary__progressbox--fixed">
-      <div class="progress budget-progress budget-progress--fixed" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= component_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
-        <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
+      <div class="progress budget-progress budget-progress--fixed" role="progressbar" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemin="0" aria-valuemax="100">
+        <div class="progress-meter progress-meter--minimum" style="width: <%= current_order_budget_percent_minimum %>%"></div>
         <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
-          <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
+          <span class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</span>
         </div>
       </div>
-      <% unless current_order_checked_out? %>
-        <% if current_order_can_be_checked_out? %>
-          <button class="button small button--sc" data-toggle="budget-confirm"><%= t(".vote") %></button>
-        <% else %>
-          <button class="button small button--sc" data-toggle="budget-confirm" disabled><%= t(".vote") %></button>
-        <% end %>
+      <% if !current_order_checked_out? && voting_open? %>
+        <button class="button small button--sc" data-toggle="budget-confirm" <%= budget_confirm_disabled_attr %>>
+          <%= t(".vote") %>
+        </button>
       <% end %>
     </div>
   </div>

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

@@ -9,12 +9,12 @@
         <ul class="budget-summary__selected-list">
           <% current_order.projects.each do |project| %>
             <li class="budget-summary__selected-item">
-              <%= link_to translated_attribute(project.title), project %>
+              <%= link_to translated_attribute(project.title), resource_locator([budget, project]).path %>
               <strong class="budget-summary__selected-number">
-                <%= budget_to_currency project.budget %>
+                <%= budget_to_currency project.budget_amount %>
               </strong>
               <% unless current_order_checked_out? %>
-                <%= button_to order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true }, form: { style: "display: inline" } do %>
+                <%= button_to budget_order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true }, form: { style: "display: inline" } do %>
                   <%= icon("trash", aria_label: t(".remove"), role: "img") %>
                 <% end %>
               <% end %>

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

@@ -1,57 +1 @@
-<div id="project-<%= project.id %>-item" class="card--list__item">
-  <div class="card--list__text">
-    <div>
-      <%= link_to project, class: "card__link" do %>
-        <h5 class="card__title budget-list__title">
-          <%= translated_attribute project.title %>
-        </h5>
-      <% end %>
-      <%= cell "decidim/tags", project, context: { extra_classes: ["tags--project"] } %>
-    </div>
-  </div>
-  <% if current_user.present? %>
-    <% if current_order && current_order.projects.include?(project) %>
-      <div class="card--list__data budget-list__data budget-list__data--added">
-        <span class="card--list__data__number budget-list__number">
-          <%= budget_to_currency(project.budget) %>
-        </span>
-        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button tiny budget--list__action success" do %>
-          <%= icon("check", class: "icon--small", aria_label: t(".remove"), role: "img") %>
-        <% end %>
-        <% if current_settings.show_votes? %>
-          <div class="card__support" style="width: 7em">
-            <span><%= t(".count", count: project.confirmed_orders_count) %></span>
-          </div>
-        <% end %>
-      </div>
-    <% else %>
-      <div class="card--list__data budget-list__data">
-        <span class="card--list__data__number budget-list__number">
-          <%= budget_to_currency(project.budget) %>
-        </span>
-        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button tiny hollow budget--list__action" do %>
-          <%= icon("check", class: "icon--small", aria_label: t(".add"), role: "img") %>
-        <% end %>
-        <% if current_settings.show_votes? %>
-          <div class="card__support" style="width: 7em">
-            <span><%= t(".count", count: project.confirmed_orders_count) %></span>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
-  <% else %>
-    <div class="card--list__data budget-list__data">
-      <span class="card--list__data__number budget-list__number">
-        <%= budget_to_currency(project.budget) %>
-      </span>
-      <a href="#" class="button tiny hollow budget--list__action disabled" data-toggle="loginModal">
-        <%= icon("check", class: "icon--small", aria_label: t(".add"), role: "img") %>
-      </a>
-      <% if current_settings.show_votes? %>
-        <div class="card__support" style="width: 7em">
-          <span><%= t(".count", count: project.confirmed_orders_count) %></span>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
-</div>
+<%= cell "decidim/budgets/project_list_item", project %>

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

@@ -1,11 +1,40 @@
 <div id="project-<%= project.id %>-budget-button">
-  <% if current_user.present? %>
-    <% if current_order && current_order.projects.include?(project) %>
-      <%= action_authorized_button_to "vote", t(".added"), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button expanded button--sc success budget--list__action" %>
-    <% else %>
-      <%= action_authorized_button_to "vote", t(".add"), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user), class: "button expanded button--sc budget--list__action" %>
-    <% end %>
+  <% if voted_for?(project) %>
+    <%= action_authorized_button_to(
+          "vote",
+          t(".added"),
+          budget_order_line_item_path(budget, project_id: project),
+          method: :delete,
+          remote: true,
+          data: {
+            disable: true,
+            budget: project.budget_amount,
+            "redirect-url": budget_project_path(budget, project)
+          },
+          disabled: !can_have_order? || current_order_checked_out?,
+          class: "button expanded button--sc success",
+          "aria-label": t(".added_descriptive", resource_name: translated_attribute(project.title))
+        ) %>
+  <% elsif current_user.present? %>
+    <%= action_authorized_button_to(
+          "vote",
+          t(".add"),
+          budget_order_line_item_path(budget, project_id: project),
+          method: :post,
+          remote: true,
+          data: {
+            disable: true,
+            budget: project.budget_amount,
+            add: true,
+            "redirect-url": budget_project_path(budget, project)
+          },
+          disabled: !can_have_order? || current_order_checked_out?,
+          class: "button expanded button--sc",
+          "aria-label": t(".add_descriptive", resource_name: translated_attribute(project.title))
+        ) %>
   <% else %>
-    <button class="button expanded button--sc disabled" data-toggle="loginModal"><%= t(".add") %></button>
+    <button class="button expanded button--sc" data-toggle="loginModal">
+      <%= t(".add") %>
+    </button>
   <% end %>
 </div>

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

@@ -1,6 +1,13 @@
-<div class="card card--list budget-list">
+<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
+  <div class="column">
+    <%= order_selector available_orders, i18n_scope: "decidim.budgets.projects.orders" %>
+  </div>
+</div>
+
+<div class="budget-list">
   <% projects.each do |project| %>
     <%= render partial: "project", locals: { project: project } %>
   <% end %>
 </div>
+
 <%= decidim_paginate projects %>

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

@@ -1,15 +1,23 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
-<% if current_user.present? && current_settings.votes_enabled? && current_participatory_space.can_participate?(current_user) %>
-  <div class="row column">
+<%= cell("decidim/budgets/limit_announcement", budget) %>
+
+<div class="row columns">
+  <% if voting_finished? %>
+    <h2 class="heading2">
+      <%= t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)) %>
+    </h2>
+  <% else %>
     <%= render partial: "budget_summary", locals: { include_heading: true } %>
-  </div>
-<% end %>
+  <% end %>
+</div>
+
 <div class="row columns">
-  <h2 class="section-heading">
+  <h3 class="section-heading">
     <%= render partial: "count" %>
-  </h2>
+  </h3>
 </div>
+
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
     <%= render partial: "filters_small_view" %>
@@ -17,7 +25,7 @@
       <%= render partial: "filters" %>
     </div>
   </div>
-  <div id="projects" class="columns mediumlarge-8 large-9">
+  <div id="projects" class="columns mediumlarge-8 large-9" aria-live="polite">
     <%= render partial: "projects" %>
   </div>
 </div>

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

@@ -1,2 +1,10 @@
 var $projects = $('#projects');
+var $projectsCount = $('#projects-count');
+var $orderFilterInput = $('.order_filter');
+
 $projects.html('<%= j(render partial: "projects").strip.html_safe %>');
+$projectsCount.html('<%= j(render partial: "count").strip.html_safe %>');
+$orderFilterInput.val('<%= order %>');
+
+var $dropdownMenu = $('.dropdown.menu', $projects);
+$dropdownMenu.foundation();

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

@@ -5,19 +5,22 @@
 
 <%
 edit_link(
-  resource_locator(project).edit,
+  resource_locator([project.budget, project]).edit,
   :update,
   :project,
   project: project
 )
 %>
 
+<%= cell("decidim/budgets/limit_announcement", budget) %>
+
 <div class="row column view-header">
-  <% if current_user.present? && current_settings.votes_enabled? && current_participatory_space.can_participate?(current_user) %>
+  <% unless voting_finished? %>
     <%= render partial: "budget_summary", locals: { include_heading: false } %>
   <% end %>
-  <%= link_to projects_path, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small" %>
+
+  <%= link_to resource_locator(budget).path(filter_link_params), class: "muted-link" do %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".view_all_projects") %>
   <% end %>
   <h2 class="heading2"><%= translated_attribute project.title %></h2>
@@ -29,14 +32,17 @@ edit_link(
       <div class="card__content">
         <div class="m-bottom">
           <span class="definition-data__title"><%= t(".budget") %></span>
-          <span class="definition-data__number"><%= budget_to_currency project.budget %></span>
+          <span class="definition-data__number"><%= budget_to_currency project.budget_amount %></span>
         </div>
-        <% if current_settings.show_votes? %>
-          <div class="card__support__data">
-            <span><%= t("decidim.budgets.projects.project.count", count: project.confirmed_orders_count) %></span>
-          </div>
+
+        <%= cell("decidim/budgets/project_votes_count", project, layout: :one_line, class: "display-block") %>
+
+        <% if voting_finished? %>
+          <%= cell("decidim/budgets/project_voted_hint", project, class: "display-block") %>
+        <% elsif voting_open? %>
+          <%= render partial: "project_budget_button", locals: { project: project } %>
         <% end %>
-        <%= render partial: "project_budget_button", locals: { project: project } %>
+
         <%= render partial: "decidim/shared/follow_button", locals: { followable: project, large: false  } %>
       </div>
     </div>
@@ -44,8 +50,9 @@ edit_link(
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
+      <%= cell("decidim/budgets/project_selected_status", project, as_label: true) %>
       <%= decidim_sanitize translated_attribute project.description %>
-      <%= cell "decidim/tags", project, context: { extra_classes: ["tags--project"] } %>
+      <%= cell "decidim/budgets/project_tags", project, context: { extra_classes: ["tags--project"] } %>
     </div>
     <%= linked_resources_for project, :proposals, "included_proposals" %>
     <%= linked_resources_for project, :results, "included_projects" %>

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/ar.yml

@@ -2,7 +2,6 @@ ar:
   activemodel:
     attributes:
       project:
-        budget: ميزانية
         decidim_category_id: الفئة
         decidim_scope_id: نطاق
         description: وصف
@@ -26,7 +25,6 @@ ar:
         destroy: حذف
         edit: تعديل
         import: استيراد مقترحات للمشاريع
-        new: مشروع جديد
         preview: معاينة
         title: أفعال
       admin:
@@ -71,7 +69,6 @@ ar:
             title: عنوان
       projects:
         budget_confirm:
-          are_you_sure: هل توافق؟ بمجرد تأكيد تصويتك ، لا يمكنك تغييره.
           cancel: إلغاء
           confirm: تؤكد
           description: هذه هي المشاريع التي اخترتها لتكون جزءًا من الميزانية.
@@ -100,7 +97,7 @@ ar:
             other: "%{count} مشاريع"
         filters:
           category: الفئة
-          category_prompt: اختر تصنيف
+          scope: نطاق
           search: بحث
         filters_small_view:
           close_modal: إغلاق مشروط
@@ -120,19 +117,7 @@ ar:
             other: المشاريع المختارة
           view: رأي
         project:
-          add: إضافة
-          count:
-            zero: "%{count} يدعم"
-            one: 1 الدعم
-            two: "%{count} يدعم"
-            few: "%{count} يدعم"
-            many: "%{count} يدعم"
-            other: "%{count} يدعم"
-          remove: إزالة
           view: رأي
-        project_budget_button:
-          add: إضافة
-          added: وأضاف
         show:
           budget: ميزانية
           view_all_projects: عرض جميع المشاريع
@@ -153,7 +138,8 @@ ar:
             announcement: إعلان
             comments_blocked: تم حظر التعليقات
             show_votes: إظهار الأصوات
-            votes_enabled: تم تمكين التصويت
+            votes_choices:
+              enabled: تم تمكين التصويت
     orders:
       checkout:
         error: حدثت مشكلة أثناء معالجة تصويتك