release/0.27 stable bcn

config/i18n-tasks.yml

@@ -320,6 +320,7 @@ ignore_unused:
   - decidim.assemblies.admin.assembly_members.form.explanation
   - decidim.assemblies.admin.assembly_members.form.image_guide
   - decidim.assemblies.admin.assembly_members.form.non_user_avatar_help
+  - decidim.initiatives.create_initiative.select_initiative_type.*
   - decidim.blogs.admin_log.*
   - decidim.templates.admin_log.*
   - decidim.forms.upload_help.explanation

decidim-admin/app/controllers/concerns/decidim/admin/participatory_space_admin_context.rb

@@ -54,7 +54,12 @@ def permissions_context
       end
 
       def layout
-        current_participatory_space_manifest.context(current_participatory_space_context).layout
+        space_manifest = if current_participatory_space_manifest.is_a? Decidim::ResourceManifest
+                           Decidim.participatory_space_manifests.find { |manifest| manifest.model_class_name == current_participatory_space.class.name }
+                         else
+                           current_participatory_space_manifest
+                         end
+        space_manifest.context(current_participatory_space_context).layout
       end
     end
   end

decidim-budgets/app/cells/decidim/budgets/budget_information_modal_cell.rb

@@ -7,7 +7,7 @@ class BudgetInformationModalCell < BaseCell
       alias budget model
 
       def more_information
-        translated_attribute(current_settings.more_information_modal).presence || translated_attribute(settings.more_information_modal)
+        translated_attribute(current_settings.more_information_modal).presence || translated_attribute(settings.more_information_modal).presence
       end
 
       def component_name

decidim-budgets/app/cells/decidim/budgets/budget_m_cell.rb

@@ -5,7 +5,6 @@ module Budgets
     # This cell renders the Medium (:m) budget card
     # for an given instance of a Decidim::Budgets::Budget
     class BudgetMCell < Decidim::CardMCell
-      include ActiveSupport::NumberHelper
       include Decidim::Budgets::ProjectsHelper
 
       def statuses

decidim-budgets/app/cells/decidim/budgets/budgets_header_cell.rb

@@ -9,6 +9,10 @@ class BudgetsHeaderCell < BaseCell
       def landing_page_content
         translated_attribute(current_settings.landing_page_content).presence || translated_attribute(settings.landing_page_content)
       end
+
+      def landing_page_instructions
+        translated_attribute(current_settings.landing_page_instructions).presence || translated_attribute(settings.landing_page_instructions)
+      end
     end
   end
 end

decidim-budgets/app/cells/decidim/budgets/project_list_item/project_text.erb

@@ -12,6 +12,12 @@
       <%= cell "decidim/budgets/project_tags", model, context: { extra_classes: ["tags--project"] } %>
     </div>
 
+    <% unless voting_finished? %>
+      <div class="hide-for-medium">
+        <%= budget_to_currency(model.budget_amount) %>
+      </div>
+    <% end %>
+
     <div class="budget-list__data__number budget-list__number hide-for-medium">
       <%= cell("decidim/budgets/project_votes_count",
       model,

decidim-budgets/app/cells/decidim/budgets/project_list_item_cell.rb

@@ -5,7 +5,6 @@ module Budgets
     # This cell renders a horizontal project card
     # for an given instance of a Project in a budget list
     class ProjectListItemCell < Decidim::ViewModel
-      include ActiveSupport::NumberHelper
       include Decidim::LayoutHelper
       include Decidim::ActionAuthorizationHelper
       include Decidim::Budgets::ProjectsHelper

decidim-budgets/app/cells/decidim/budgets/project_m_cell.rb

@@ -5,7 +5,6 @@ module Budgets
     # This cell renders the Medium (:m) project card
     # for an given instance of a Project
     class ProjectMCell < Decidim::CardMCell
-      include ActiveSupport::NumberHelper
       include Decidim::Budgets::ProjectsHelper
 
       private

decidim-budgets/app/cells/decidim/budgets/project_vote_button/show.erb

@@ -9,7 +9,7 @@
         disable: true,
         budget: model.budget_amount,
         allocation: resource_allocation,
-        "redirect-url": resource_path
+        "redirect-url": budget_projects_path(model.budget)
       },
       disabled: vote_button_disabled?,
       title: vote_button_label do %>

decidim-budgets/app/controllers/decidim/budgets/application_controller.rb

@@ -8,6 +8,7 @@ module Budgets
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
+      helper Decidim::FocusModeHelper
       helper_method :current_workflow, :voting_finished?, :voting_open?
 
       def current_workflow

decidim-budgets/app/helpers/decidim/budgets/projects_helper.rb

@@ -4,6 +4,7 @@ module Decidim
   module Budgets
     # A helper to render order and budgets actions
     module ProjectsHelper
+      include ActiveSupport::NumberHelper
       include Decidim::ApplicationHelper
       include Decidim::MapHelper
 
@@ -16,7 +17,7 @@ def budget_to_currency(budget)
 
       # Return a percentage of the current order budget from the total budget
       def current_order_budget_percent
-        current_order&.budget_percent.to_f.floor
+        current_order&.budget_percent.to_f.floor.clamp(0, 100)
       end
 
       # Return the minimum percentage of the current order budget from the total budget

decidim-budgets/app/packs/src/decidim/budgets/progressFixed.js

@@ -10,9 +10,9 @@ $(() => {
 
     let progressPosition = progressRef.getBoundingClientRect().bottom;
     if (progressPosition > 0) {
-      progressFix.classList.remove(progressVisibleClass);
+      progressFix?.classList?.remove(progressVisibleClass);
     } else {
-      progressFix.classList.add(progressVisibleClass);
+      progressFix?.classList?.add(progressVisibleClass);
     }
   }
 

decidim-budgets/app/packs/src/decidim/budgets/projects.js

@@ -1,3 +1,5 @@
+require("src/decidim/focus_mode.js");
+
 $(() => {
   const $projects = $("#projects, #project");
   const $budgetSummaryTotal = $(".budget-summary__total");
@@ -12,6 +14,16 @@ $(() => {
     event.preventDefault();
   };
 
+  const allowExitFrom = ($el) => {
+    if ($el.parents("#loginModal").length > 0) {
+      return true;
+    } else if ($el.parents("#authorizationModal").length > 0) {
+      return true;
+    }
+
+    return false;
+  }
+
   $voteButton.on("click", "span", () => {
     $(".budget-list__action").click();
   });
@@ -32,4 +44,34 @@ $(() => {
       cancelEvent(event);
     }
   });
+
+  if ($("#order-progress [data-toggle=budget-confirm]").length > 0) {
+    const safeUrl = $(".budget-summary").attr("data-safe-url").split("?")[0];
+    $(document).on("click", "a", (event) => {
+      if (allowExitFrom($(event.currentTarget))) {
+        window.exitUrl = null;
+      } else {
+        window.exitUrl = event.currentTarget.href;
+      }
+    });
+    $(document).on("submit", "form", (event) => {
+      if (allowExitFrom($(event.currentTarget))) {
+        window.exitUrl = null;
+      } else {
+        window.exitUrl = event.currentTarget.action;
+      }
+    });
+
+    window.addEventListener("beforeunload", (event) => {
+      const currentAllocation = parseInt($budgetSummary.attr("data-current-allocation"), 10);
+      const exitUrl = window.exitUrl;
+      window.exitUrl = null;
+
+      if (currentAllocation === 0 || (exitUrl && exitUrl.startsWith(safeUrl))) {
+        return;
+      }
+
+      event.returnValue = true;
+    });
+  }
 });

decidim-budgets/app/packs/stylesheets/decidim/budgets/budget/_budget-meter.scss

@@ -1,5 +1,22 @@
 .budget-summary__total{
   margin-bottom: .5rem;
+
+  .mini-title{
+    display: block;
+
+    &__strong{
+      line-height: 1rem;
+    }
+  }
+
+  @include breakpoint(medium){
+    align-content: center;
+    display: flex;
+
+    .mini-title:nth-of-type(2){
+      margin-left: auto;
+    }
+  }
 }
 
 .budget-summary__progressbox{

decidim-budgets/app/packs/stylesheets/decidim/budgets/budget/_progress.scss

@@ -4,6 +4,17 @@
   position: relative;
 }
 
+.budget-progress .progress-meter{
+  &:not(&--minimum){
+    background-color: tint($success, 80%);
+  }
+
+  .progress-meter-text{
+    color: $body-font-color;
+    font-size: 1rem;
+  }
+}
+
 .progress-meter--minimum{
   background: repeating-linear-gradient(-55deg, rgba(white, .2), rgba(white, .2) 8px, rgba(black, .03) 8px, rgba(black, .03) 16px);
   position: absolute;
@@ -16,4 +27,22 @@
   text-align: right;
   padding-left: 1rem;
   padding-right: .5rem;
+
+  @include breakpoint(smallmedium down){
+    text-align: center;
+    padding: 0;
+    left: 0;
+  }
+}
+
+.progress-text-wrapper{
+  height: 100%;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  padding: 1em;
+}
+
+.progress-text{
+  font-size: 1em;
 }

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

@@ -1,5 +1,34 @@
 <%= render partial: "decidim/shared/component_announcement" %>
+<% start_date, end_date = %w(start_date end_date).map { |attribute| current_component.participatory_space.try(:active_step)&.try(attribute) || current_component.participatory_space.try(attribute) } %>
+<% instructions = translated_attribute(current_component.current_settings.landing_page_instructions).presence || translated_attribute(current_component.settings.landing_page_instructions) %>
 
-<%= cell("decidim/budgets/budgets_header", current_workflow) %>
+<div class="row">
+  <div class="columns medium-7 mediumlarge-8">
+    <%= cell("decidim/budgets/budgets_header", current_workflow) %>
+    <%= cell("decidim/budgets/budgets_list", current_workflow) %>
+  </div>
 
-<%= cell("decidim/budgets/budgets_list", current_workflow) %>
+  <% if start_date.present? || instructions.present? %>
+    <div class="columns section view-side medium-4">
+      <% if start_date %>
+        <div class="card extra">
+          <div class="card__content">
+            <h3><%= t(".date") %></h3>
+            <%= cell("decidim/date_range", { start: start_date, end: end_date, extra_classes: "extra__date-container--horizontal" }) %>
+          </div>
+        </div>
+      <% end %>
+
+      <% if instructions.present? %>
+        <div class="card extra">
+          <div class="card__content">
+            <h3><%= t(".instructions") %></h3>
+            <div class="text-left">
+              <%== instructions %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,11 +1,13 @@
 var $orderTotalBudget = $('#order-total-budget');
+var $orderRemainingBudget = $('#order-remaining-budget');
 var $orderSelectedProjects = $('#order-selected-projects');
 var $orderProgress = $('#order-progress');
 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($orderRemainingBudget[0], '<%= j(render partial: "decidim/budgets/projects/order_remaining_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 %>')
@@ -20,5 +22,3 @@ if ($projectItem.length > 0) {
 if ($projectBudgetButton.length > 0) {
   morphdom($projectBudgetButton[0], '<%= j(render partial: "decidim/budgets/projects/project_budget_button", locals: { project: project }).strip.html_safe %>');
 }
-
-window.DecidimBudgets.checkProgressPosition();