decidim-budgets 0.22.0 → 0.23.3

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

@@ -1,13 +1,24 @@
-<div class="card budget-summary" data-progress-reference data-safe-url="<%= projects_base_url %>">
+<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>
+        <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) %>
@@ -18,10 +29,10 @@
       <% 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>
@@ -34,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

@@ -14,8 +14,12 @@
     </div>
   </div>
 
-  <% if current_participatory_space.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "projects" %>
+  <% 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_participatory_space.categories.any? %>

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

@@ -2,7 +2,7 @@
   <% resources.each do |project| %>
     <div class="card--list__item">
       <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
-      <%= link_to resource_locator(project).path, class: "card--list__text card__link card__link--block" do %>
+      <%= 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,27 +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" 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: <%= component_settings.vote_threshold_percent %>%"></div>
+      <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 %>%">
         <span class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</span>
       </div>
     </div>
-    <% unless current_order_checked_out? %>
-      <button class="button small button--sc" data-toggle="budget-confirm" <%= budget_confirm_disabled_attr %>><%= t(".vote") %></button>
+    <% 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" 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: <%= component_settings.vote_threshold_percent %>%"></div>
+        <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 %>%">
           <span class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</span>
         </div>
       </div>
-      <% unless current_order_checked_out? %>
-        <button class="button small button--sc" data-toggle="budget-confirm" <%= budget_confirm_disabled_attr %>><%= t(".vote") %></button>
+      <% 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_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 active budget--list__action", "aria-label": t(".added_descriptive", resource_name: translated_attribute(project.title)) %>
-    <% 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", "aria-label": t(".add_descriptive", resource_name: translated_attribute(project.title)) %>
-    <% 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" aria-label="<%= t(".add_descriptive", resource_name: translated_attribute(project.title)) %>"><%= t(".add") %></button>
+    <button class="button expanded button--sc" data-toggle="loginModal">
+      <%= t(".add") %>
+    </button>
   <% end %>
 </div>

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">
   <h3 class="section-heading">
     <%= render partial: "count" %>
   </h3>
 </div>
+
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
     <%= render partial: "filters_small_view" %>

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

@@ -5,21 +5,26 @@
 
 <%
 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", role: "img", "aria-hidden": true %>
-    <%= t(".view_all_projects") %>
-  <% end %>
+
+  <div class="m-bottom">
+    <%= 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 %>
+  </div>
   <h2 class="heading2"><%= translated_attribute project.title %></h2>
 </div>
 <div class="row">
@@ -29,14 +34,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 +52,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: هذه هي المشاريع التي اخترتها لتكون جزءًا من الميزانية.
@@ -120,13 +117,6 @@ ar:
             other: المشاريع المختارة
           view: رأي
         project:
-          count:
-            zero: "%{count} يدعم"
-            one: 1 الدعم
-            two: "%{count} يدعم"
-            few: "%{count} يدعم"
-            many: "%{count} يدعم"
-            other: "%{count} يدعم"
           view: رأي
         show:
           budget: ميزانية
@@ -148,7 +138,8 @@ ar:
             announcement: إعلان
             comments_blocked: تم حظر التعليقات
             show_votes: إظهار الأصوات
-            votes_enabled: تم تمكين التصويت
+            votes_choices:
+              enabled: تم تمكين التصويت
     orders:
       checkout:
         error: حدثت مشكلة أثناء معالجة تصويتك

data/config/locales/bg.yml

@@ -0,0 +1,6 @@
+bg:
+  activemodel:
+    attributes:
+      project:
+        decidim_category_id: Категория
+        decidim_scope_id: Сфера

data/config/locales/ca.yml

@@ -1,12 +1,19 @@
 ca:
   activemodel:
     attributes:
+      budget:
+        decidim_scope_id: Àmbit
+        description: Descripció
+        title: Títol
+        total_budget: Pressupost total
+        weight: Pes
       project:
-        budget: Pressupost
+        budget_amount: Import del pressupost
         decidim_category_id: Categoria
         decidim_scope_id: Àmbit
         description: Descripció
         proposal_ids: Propostes relacionades
+        selected: Seleccionat per implementar
         title: Títol
   activerecord:
     models:
@@ -21,12 +28,33 @@ ca:
         confirm_destroy: Estàs segura que vols eliminar aquest projecte?
         destroy: Esborrar
         edit: Editar
+        edit_projects: Gestionar projectes
         import: Importa propostes a projectes
-        new: Nou projecte
+        new: Nou %{name}
         preview: Previsualitzar
         title: Accions
       admin:
+        budgets:
+          create:
+            invalid: S'ha produït un error en crear aquest pressupost
+            success: Pressupost creat correctament
+          destroy:
+            invalid: S'ha produït un error en eliminar aquest pressupost
+            success: Pressupost eliminat correctament
+          edit:
+            title: Edita el pressupost
+            update: Actualitza el pressupost
+          index:
+            title: Pressupostos
+          new:
+            create: Crea pressupost
+            title: Nou pressupost
+          update:
+            invalid: S'ha produït un error en actualitzar aquest pressupost
+            success: Pressupost actualitzat correctament
         models:
+          budget:
+            name: Pressupost
           project:
             name: Projecte
         projects:
@@ -41,6 +69,7 @@ ca:
           index:
             finished_orders: Vots finalitzats
             pending_orders: Vots en procés
+            selected: Seleccionat
             title: Projectes
           new:
             create: Crear
@@ -57,11 +86,39 @@ ca:
             no_components: No hi ha cap component de propostes en aquest espai participatiu per importar les propostes a projectes.
             select_component: Selecciona un component
       admin_log:
+        budget:
+          create: "%{user_name} ha creat el pressupost %{resource_name} a l'espai %{space_name}"
+          delete: "%{user_name} ha eliminat el pressupost %{resource_name} de l'espai %{space_name}"
+          update: "%{user_name} ha actualitzat el pressupost %{resource_name} de l'espai %{space_name}"
         project:
           create: "%{user_name} ha creat el projecte %{resource_name} a l'espai %{space_name}"
           delete: "%{user_name} ha eliminat el projecte %{resource_name} de l'espai %{space_name}"
           update: "%{user_name} ha actualitzat el projecte %{resource_name} de l'espai %{space_name}"
+      budget:
+        view: Veure tots els projectes de pressupost
+      budget_information_modal:
+        back_to: Tornar a %{component_name}
+        close_modal: Tancar el modal
+        continue: Continuar
+        more_information: Més informació
+      budgets_list:
+        cancel_order:
+          more_than_one: eliminar el teu vot a %{name} i començar de nou
+          only_one: eliminar el teu vot i començar de nou.
+        finished_message: Has finalitzat el procés de votació. Gràcies per participar-hi!
+        highlighted_cta: Votar a %{name}
+        if_change_opinion: Si has canviat d'opinió, pots
+        my_budgets: Els meus pressupostos
+        voted_on: Has votat a %{links}
+      limit_announcement:
+        cant_vote: No pots votar a aquests pressupostos. <a href="%{landing_path}"> Prova amb un altre pressupost </a>.
+        limit_reached: Tens vots actius a %{links}. Per votar en aquest pressupot has d' <a href="%{landing_path}">esborrar el teu vot i començar de nou</a>.
       models:
+        budget:
+          fields:
+            name: Nom
+            projects_count: Número de projectes
+            total_budget: Pressupost total
         project:
           fields:
             title: Títol
@@ -69,11 +126,11 @@ ca:
         order_summary:
           selected_projects: 'Els projectes que has seleccionat són:'
           subject: Has votat a l'espai de participació %{space_name}
-          voted_on_space: Has votat en el pressupost de l'espai de participació %{space_name}.
-          voted_on_space_with_scope: Has votat en el pressupost de l'espai de participació %{space_name} a %{scope_name} (%{scope_type}).
+          voted_on_space: Has votat al pressupost %{budget_name} de l'espai de participació %{space_name}.
+          voted_on_space_with_scope: Has votat al pressupost %{budget_name} de l'espai de participació %{space_name} de %{scope_name} (%{scope_type}).
       projects:
         budget_confirm:
-          are_you_sure: Hi estàs d'acord? Un cop hagis confirmat el teu vot, no podràs canviar-lo.
+          are_you_sure: Si canvies d'opinió, pots modificar el teu vot més tard.
           cancel: Cancel·lar
           confirm: Confirmar
           description: Aquests són els projectes que has seleccionat per formar part del pressupost.
@@ -101,6 +158,11 @@ ca:
           category: Categoria
           scope: Àmbit
           search: Cerca
+          status: Estat
+          status_values:
+            all: Tots
+            not_selected: No seleccionat
+            selected: Seleccionat
         filters_small_view:
           close_modal: Tancar finestra
           filter: Filtra
@@ -120,18 +182,22 @@ ca:
           lowest_cost: Menor cost
           most_voted: Més votats
           random: Ordre aleatori
+          selected: Seleccionat
         project:
           add: Afegir el projecte %{resource_name} al teu vot
-          count:
-            one: 1 suport
-            other: "%{count} suports"
           remove: Esborrar el projecte %{resource_name} del teu vot
+          selected: Seleccionat
           view: Veure
+          votes:
+            one: vot
+            other: vots
+          you_voted: Has votat
         project_budget_button:
           add: Afegir al teu vot
           add_descriptive: Afegir el projecte %{resource_name} al teu vot
           added: Afegit al teu vot
           added_descriptive: El projecte %{resource_name} s'ha afegit al teu vot
+        projects_for: Projectes per a %{name}
         show:
           budget: Pressupost
           view_all_projects: Veure tots els projectes
@@ -144,22 +210,48 @@ ca:
           global:
             announcement: Avís
             comments_enabled: Comentaris habilitats
+            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
             form:
               errors:
                 budget_voting_rule_only_one: Cal activar com a mínim una norma per a la votació
                 budget_voting_rule_required: Es requereix una norma per a la votació
+            landing_page_content: Pàgina d'inici de pressupostos
+            more_information_modal: Finestra de "Més informació"
             projects_per_page: Projectes per pàgina
             resources_permissions_enabled: Es poden establir permisos d'accions per a cada trobada
+            scope_id: Àmbit
+            scopes_enabled: Àmbits habilitats
+            title: Títol
             total_budget: Pressupost total
-            vote_minimum_budget_projects_number: Nombre màxim de projectes a votar
+            vote_minimum_budget_projects_number: Número màxim de projectes a votar
             vote_rule_minimum_budget_projects_enabled: 'Activar norma: Número mínim de projectes a votar'
             vote_rule_threshold_percent_enabled: 'Activar norma: percentatge mínim del pressupost'
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
+            workflow: Workflow
+            workflow_choices:
+              all: 'Votar a tots: permet a les participants votar a tots els pressupostos.'
+              one: 'Votar a un: permet a les participants votar a qualsevol pressupost, però només a un.'
           step:
             announcement: Avís
             comments_blocked: Comentaris bloquejats
+            highlighted_heading: Capçalera destacada
+            landing_page_content: Pàgina d'inici de pressupostos
+            list_heading: Títol de la llista
+            more_information_modal: Finestra de "Més informació"
             show_votes: Mostra els suports
-            votes_enabled: S'ha habilitat la votació
+            title: Títol
+            votes: Votació
+            votes_choices:
+              disabled: Votació inhabilitada
+              enabled: S'ha habilitat la votació
+              finished: Votació finalitzada
+    events:
+      budgets:
+        budget_published:
+          email_intro: 'Ja està activa la fase %{resource_title} per a %{participatory_space_title}. Pots veure-la des d''aquesta pàgina:'
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai %{participatory_space_title}. Pots deixar de rebre notificacions a través de l'enllaç anterior.
+          email_subject: El component %{resource_title} ja està actiu per %{participatory_space_title}.
+          notification_title: El pressupost <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title} ja està actiu.
     orders:
       checkout:
         error: S'ha produït un error en processar el teu vot