decidim-budgets 0.28.6 → 0.29.0.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/budgets/base_cell.rb +0 -2
  3. data/app/cells/decidim/budgets/budget_list_item_cell.rb +0 -3
  4. data/app/cells/decidim/budgets/budgets_list/main_list.erb +1 -1
  5. data/app/cells/decidim/budgets/budgets_list/show.erb +1 -1
  6. data/app/cells/decidim/budgets/order_activity_cell.rb +1 -1
  7. data/app/cells/decidim/budgets/project_l_cell.rb +0 -1
  8. data/app/cells/decidim/budgets/project_vote_button_cell.rb +0 -1
  9. data/app/cells/decidim/budgets/project_voted_hint_cell.rb +0 -2
  10. data/app/cells/decidim/budgets/project_votes_count_cell.rb +0 -2
  11. data/app/commands/decidim/budgets/admin/create_budget.rb +4 -33
  12. data/app/commands/decidim/budgets/admin/create_order_reminders.rb +5 -19
  13. data/app/commands/decidim/budgets/admin/create_project.rb +19 -45
  14. data/app/commands/decidim/budgets/admin/destroy_budget.rb +3 -28
  15. data/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb +2 -7
  16. data/app/commands/decidim/budgets/admin/update_budget.rb +4 -35
  17. data/app/commands/decidim/budgets/admin/update_project.rb +17 -43
  18. data/app/controllers/decidim/budgets/admin/application_controller.rb +5 -1
  19. data/app/controllers/decidim/budgets/admin/projects_controller.rb +1 -1
  20. data/app/forms/decidim/budgets/admin/budget_form.rb +2 -2
  21. data/app/forms/decidim/budgets/admin/project_form.rb +1 -1
  22. data/app/forms/decidim/budgets/admin/project_import_proposals_form.rb +1 -1
  23. data/app/helpers/decidim/budgets/projects_helper.rb +2 -2
  24. data/app/packs/src/decidim/budgets/admin/projects.js +1 -1
  25. data/app/packs/stylesheets/budgets.scss +32 -24
  26. data/app/permissions/decidim/budgets/permissions.rb +0 -2
  27. data/app/views/decidim/budgets/admin/budgets/index.html.erb +1 -1
  28. data/app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb +3 -5
  29. data/app/views/decidim/budgets/admin/projects/_project-tr.html.erb +5 -0
  30. data/app/views/decidim/budgets/admin/projects/bulk_actions/_budget-change.html.erb +2 -2
  31. data/app/views/decidim/budgets/admin/projects/bulk_actions/_change-selected.html.erb +2 -2
  32. data/app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb +2 -2
  33. data/app/views/decidim/budgets/admin/projects/bulk_actions/_scope-change.html.erb +2 -2
  34. data/app/views/decidim/budgets/admin/projects/index.html.erb +5 -2
  35. data/app/views/decidim/budgets/admin/projects/update_attribute.js.erb +3 -3
  36. data/app/views/decidim/budgets/budgets/index.html.erb +1 -1
  37. data/app/views/decidim/budgets/projects/_budget_confirm.html.erb +3 -3
  38. data/app/views/decidim/budgets/projects/_order.html.erb +1 -1
  39. data/app/views/decidim/budgets/projects/_order_progress_progressbar_marks_right.html.erb +1 -1
  40. data/app/views/decidim/budgets/projects/_order_progress_summary_content.html.erb +22 -13
  41. data/app/views/decidim/budgets/projects/_projects.html.erb +1 -1
  42. data/app/views/decidim/budgets/projects/index.html.erb +2 -10
  43. data/app/views/decidim/budgets/projects/index.js.erb +1 -1
  44. data/config/locales/ar.yml +3 -2
  45. data/config/locales/bg.yml +4 -2
  46. data/config/locales/ca.yml +3 -2
  47. data/config/locales/cs.yml +3 -2
  48. data/config/locales/de.yml +6 -5
  49. data/config/locales/el.yml +1 -1
  50. data/config/locales/en.yml +2 -1
  51. data/config/locales/es-MX.yml +3 -2
  52. data/config/locales/es-PY.yml +3 -2
  53. data/config/locales/es.yml +2 -1
  54. data/config/locales/eu.yml +85 -93
  55. data/config/locales/fi-plain.yml +17 -16
  56. data/config/locales/fi.yml +71 -70
  57. data/config/locales/fr-CA.yml +6 -5
  58. data/config/locales/fr.yml +5 -4
  59. data/config/locales/ga-IE.yml +4 -0
  60. data/config/locales/gl.yml +7 -1
  61. data/config/locales/hu.yml +4 -3
  62. data/config/locales/id-ID.yml +3 -0
  63. data/config/locales/is-IS.yml +3 -0
  64. data/config/locales/it.yml +5 -24
  65. data/config/locales/ja.yml +2 -1
  66. data/config/locales/ko.yml +0 -8
  67. data/config/locales/lb.yml +4 -1
  68. data/config/locales/lt.yml +1 -1
  69. data/config/locales/lv.yml +3 -0
  70. data/config/locales/nl.yml +3 -3
  71. data/config/locales/no.yml +7 -1
  72. data/config/locales/pl.yml +3 -1
  73. data/config/locales/pt-BR.yml +3 -70
  74. data/config/locales/pt.yml +5 -1
  75. data/config/locales/ro-RO.yml +2 -2
  76. data/config/locales/ru.yml +3 -0
  77. data/config/locales/sk.yml +3 -0
  78. data/config/locales/sq-AL.yml +3 -10
  79. data/config/locales/sv.yml +57 -171
  80. data/config/locales/tr-TR.yml +5 -1
  81. data/config/locales/uk.yml +3 -0
  82. data/config/locales/zh-CN.yml +5 -1
  83. data/config/locales/zh-TW.yml +1 -1
  84. data/decidim-budgets.gemspec +2 -2
  85. data/lib/decidim/api/budget_type.rb +0 -6
  86. data/lib/decidim/api/budgets_type.rb +3 -1
  87. data/lib/decidim/api/project_type.rb +0 -13
  88. data/lib/decidim/budgets/project_serializer.rb +1 -0
  89. data/lib/decidim/budgets/seeds.rb +62 -21
  90. data/lib/decidim/budgets/version.rb +1 -1
  91. data/lib/decidim/budgets/workflows/base.rb +1 -1
  92. metadata +17 -21
  93. data/app/commands/decidim/budgets/admin/destroy_project.rb +0 -42
  94. data/config/locales/bn-BD.yml +0 -1
  95. data/config/locales/bs-BA.yml +0 -22
  96. data/config/locales/ca-IT.yml +0 -387
@@ -4,12 +4,8 @@
4
4
  }
5
5
 
6
6
  &-summary {
7
- @apply bg-tertiary;
8
-
9
- box-shadow: 0 4px 6px 0 rgba(211, 211, 211, 0.25);
10
-
11
7
  &__content {
12
- @apply p-4 md:p-0;
8
+ @apply bg-tertiary p-4 md:h-full md:p-0;
13
9
  }
14
10
 
15
11
  &__container {
@@ -21,7 +17,7 @@
21
17
  }
22
18
 
23
19
  &__content__header {
24
- @apply col-span-2 text-2xl mb-2;
20
+ @apply col-span-2 text-2xl pb-2 mb-2;
25
21
 
26
22
  .ql-editor {
27
23
  @apply inline-block text-2xl;
@@ -37,24 +33,20 @@
37
33
  }
38
34
 
39
35
  &__progressbar {
40
- @apply my-4 relative;
36
+ @apply my-0 lg:my-4 relative;
41
37
 
42
38
  .budget-progress {
43
- @apply bg-white rounded;
39
+ @apply bg-white rounded h-2;
44
40
  }
45
41
 
46
42
  &--minimum {
47
- @apply absolute;
48
-
49
- .progress-meter--minimum-mark {
50
- @apply h-[20px] ml-auto w-[2px] bg-black block;
51
- }
43
+ @apply absolute h-2 bg-gray-3 rounded-s;
52
44
  }
53
45
 
54
46
  &--meter {
55
47
  background-color: var(--success);
56
48
 
57
- @apply h-[20px] rounded;
49
+ @apply h-2 rounded-s absolute;
58
50
  }
59
51
  }
60
52
 
@@ -71,20 +63,16 @@
71
63
  }
72
64
 
73
65
  &__progressbar-legend {
74
- @apply text-sm block;
66
+ @apply text-xs md:text-sm block;
75
67
  }
76
68
 
77
69
  &__progressbar-legend-strong {
78
- @apply font-bold block;
70
+ @apply font-semibold block text-[10px] md:text-sm text-nowrap;
79
71
  }
80
72
  }
81
73
 
82
- &__projects__container {
83
- @apply -mt-12 sm:mt-0;
84
- }
85
-
86
74
  &__card__list-project {
87
- @apply ml-auto rounded py-3 px-4 bg-background w-[30%] min-w-[120px] flex flex-col justify-center items-center lg:flex-row lg:justify-around lg:place-items-center;
75
+ @apply ml-auto rounded py-3 px-6 bg-background w-[30%] min-w-[120px] grid grid-cols-1 md:grid-cols-2 md:place-items-center;
88
76
  }
89
77
 
90
78
  &__card__list-project__amount {
@@ -144,7 +132,7 @@
144
132
  }
145
133
 
146
134
  &__list--header {
147
- @apply flex items-center justify-between -ml-2 md:ml-0;
135
+ @apply grid grid-cols-2;
148
136
  }
149
137
 
150
138
  &-list {
@@ -235,7 +223,23 @@
235
223
  }
236
224
 
237
225
  .budget-summary__button-modal {
238
- @apply col-span-12 mb-4 pb-4;
226
+ @apply hidden lg:text-secondary lg:block lg:col-span-12 lg:mb-4 lg:pb-4;
227
+ }
228
+
229
+ .budget-summary__button-dropdown {
230
+ @apply col-span-12 text-secondary lg:hidden;
231
+
232
+ &_text {
233
+ @apply flex gap-4 justify-start;
234
+
235
+ svg {
236
+ @apply w-5 h-5;
237
+ }
238
+ }
239
+
240
+ p {
241
+ @apply text-gray-4 font-normal text-[13px];
242
+ }
239
243
  }
240
244
 
241
245
  .progressbox-fixed-wrapper {
@@ -266,7 +270,11 @@
266
270
  }
267
271
 
268
272
  .budget-summary__button-modal {
269
- @apply col-span-10 col-start-2 justify-start;
273
+ @apply hidden lg:text-secondary lg:block lg:col-span-10 lg:col-start-2 lg:justify-start;
274
+ }
275
+
276
+ .budget-summary__button-dropdown {
277
+ @apply block text-secondary col-span-10 col-start-2 justify-start lg:hidden;
270
278
  }
271
279
 
272
280
  .progressbox-fixed-wrapper {
@@ -18,8 +18,6 @@ module Decidim
18
18
  can_vote?(false) if can_vote_project?(project || order&.projects&.first)
19
19
  when :report
20
20
  permission_action.allow!
21
- when :read
22
- toggle_allow(project.visible?)
23
21
  end
24
22
  end
25
23
 
@@ -25,7 +25,7 @@
25
25
  <% if current_component.has_subscopes? %>
26
26
  <%= th_resource_scope_label %>
27
27
  <% end %>
28
- <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
28
+ <th><%= t("actions.title", scope: "decidim.budgets") %></th>
29
29
  </tr>
30
30
  </thead>
31
31
  <tbody>
@@ -12,11 +12,9 @@
12
12
  <% end %>
13
13
  <% if allowed_to? :import_proposals, :project %>
14
14
  <%= import_dropdown do %>
15
- <%= link_to new_budget_proposals_import_path(budget) do %>
16
- <li class="imports--component">
17
- <%= t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")) %>
18
- </li>
19
- <% end %>
15
+ <li class="imports--component">
16
+ <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_proposals_import_path(budget) %>
17
+ </li>
20
18
  <% end %>
21
19
  <% end %>
22
20
  <%= link_to t("actions.new_project", scope: "decidim.budgets"), new_budget_project_path, class: "button button__sm button__secondary new" if allowed_to? :create, :project %>
@@ -30,6 +30,11 @@
30
30
  <%= content_tag :strong, t("no", scope: "decidim.budgets.admin.projects.index.selected_options"), class: "label" %>
31
31
  <% end %>
32
32
  </td>
33
+ <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
34
+ <td>
35
+ <%= static_map_link(project, {}, { class: "static-map__admin" }) %>
36
+ </td>
37
+ <% end %>
33
38
  <td class="table-list__actions">
34
39
  <% if allowed_to? :update, :project, project: project %>
35
40
  <%= icon_link_to "pencil-line", resource_locator([budget, project]).edit, t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
@@ -1,7 +1,7 @@
1
1
  <div id="js-budget-change-projects-actions" class="hide js-bulk-action-form">
2
2
  <%= 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 %>
3
3
 
4
- <div class="checkboxes hide">
4
+ <div class="hide">
5
5
  <% projects.each do |project| %>
6
6
  <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
7
7
  <% end %>
@@ -15,7 +15,7 @@
15
15
  class: "button button__sm button__secondary small button--simple float-left"
16
16
  ) %>
17
17
 
18
- <button id="js-cancel-budget-change-projects" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button">
18
+ <button id="js-cancel-budget-change-projects" class="button button__sm button__secondary js-cancel-bulk-action" type="button">
19
19
  <%= t("decidim.budgets.admin.projects.index.cancel") %>
20
20
  </button>
21
21
  <% end %>
@@ -1,6 +1,6 @@
1
1
  <div id="js-change-selected-projects-actions" class="hide js-bulk-action-form">
2
2
  <%= 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 %>
3
- <div class="checkboxes hide">
3
+ <div class="hide">
4
4
  <% projects.each do |project| %>
5
5
  <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
6
6
  <% end %>
@@ -10,6 +10,6 @@
10
10
 
11
11
  <%= 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") %>
12
12
 
13
- <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>
13
+ <button id="js-cancel-edit-selected" class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
14
14
  <% end %>
15
15
  </div>
@@ -1,6 +1,6 @@
1
1
  <div id="js-recategorize-projects-actions" class="hide js-bulk-action-form">
2
2
  <%= 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 %>
3
- <div class="checkboxes hide">
3
+ <div class="hide">
4
4
  <% projects.each do |project| %>
5
5
  <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
6
6
  <% end %>
@@ -10,6 +10,6 @@
10
10
 
11
11
  <%= 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") %>
12
12
 
13
- <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>
13
+ <button id="js-cancel-edit-category" class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
14
14
  <% end %>
15
15
  </div>
@@ -1,7 +1,7 @@
1
1
  <div id="js-scope-change-projects-actions" class="hide js-bulk-action-form">
2
2
  <%= 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 %>
3
3
 
4
- <div class="checkboxes hide">
4
+ <div class="hide">
5
5
  <% projects.each do |project| %>
6
6
  <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
7
7
  <% end %>
@@ -15,7 +15,7 @@
15
15
  class: "button button__sm button__secondary small button--simple float-left"
16
16
  ) %>
17
17
 
18
- <button id="js-cancel-scope-change-projects" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button">
18
+ <button id="js-cancel-scope-change-projects" class="button button__sm button__secondary js-cancel-bulk-action" type="button">
19
19
  <%= t("decidim.budgets.admin.projects.index.cancel") %>
20
20
  </button>
21
21
  <% end %>
@@ -5,7 +5,7 @@
5
5
  <div>
6
6
  <%= link_to decidim_escape_translated(budget.title), budgets_path %> &gt;
7
7
  <%= t(".title") %>
8
- <span id="js-selected-resources-count" class="component-counter component-counter--inline" title="<%= t("decidim.budgets.admin.projects.index.selected") %>"></span>
8
+ <span id="js-selected-resources-count" class="component-counter" title="<%= t("decidim.budgets.admin.projects.index.selected") %>"></span>
9
9
  </div>
10
10
  <%= render partial: "bulk-actions" %>
11
11
  </h1>
@@ -24,7 +24,10 @@
24
24
  <% end %>
25
25
  <th><%= sort_link(query, :confirmed_orders_count, t("index.confirmed_orders_count")) %></th>
26
26
  <th><%= sort_link(query, :selected, t(".selected")) %></th>
27
- <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
27
+ <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
28
+ <th><%= t("models.project.fields.map", scope: "decidim.budgets") %></th>
29
+ <% end %>
30
+ <th><%= t("actions.title", scope: "decidim.budgets") %></th>
28
31
  </tr>
29
32
  </thead>
30
33
  <tbody>
@@ -1,15 +1,15 @@
1
1
  <% if flash.now[:error].present? %>
2
2
  $("<%= form_selector %> <%= attribute_selector %>").addClass("is-invalid-input")
3
- $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(alert), text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
3
+ $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(alert), text: flash.now[:error] }) %>").appendTo("div[data-callout-wrapper]");
4
4
  <% end %>
5
5
 
6
6
  <% if flash.now[:alert].present? %>
7
7
  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
8
- $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(warning), text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
8
+ $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(warning), text: flash.now[:alert] }) %>").appendTo("div[data-callout-wrapper]");
9
9
  <% end %>
10
10
 
11
11
  <% if flash.now[:notice].present? %>
12
- $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(success), text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
12
+ $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(success), text: flash.now[:notice] }) %>").appendTo("div[data-callout-wrapper]");
13
13
 
14
14
  <% @moved_items&.each do |id| %>
15
15
  $(".table-list [data-id='<%= id %>']").remove()
@@ -17,7 +17,7 @@
17
17
  <%= cell("decidim/budgets/budgets_header", current_workflow) %>
18
18
  </section>
19
19
 
20
- <section class="layout-main__section layout-main__heading flex flex-col items-start">
20
+ <section class="layout-main__section layout-main__heading">
21
21
  <%= cell("decidim/budgets/budgets_list", current_workflow) %>
22
22
  </section>
23
23
  <% end %>
@@ -1,4 +1,4 @@
1
- <%= decidim_modal id: "budget-confirm", class:"verification-modal" do %>
1
+ <%= decidim_modal id: "budget-confirm", class: "verification-modal" do %>
2
2
  <div data-dialog-container>
3
3
  <%= icon "check-double-line" %>
4
4
  <h3 class="h3" id="dialog-title-budget-confirm" data-dialog-title>
@@ -8,7 +8,7 @@
8
8
  <% if current_order.present? %>
9
9
  <h4 class="h4 mb-4"><%= translated_attribute(budget.title) %></h4>
10
10
  <p class="mb-4"><%= t(".description") %></p>
11
- <div class="card card--secondary">
11
+ <div class="card">
12
12
  <% current_order.projects.each do |project| %>
13
13
  <div class="card__list card__list__project-voted">
14
14
  <div class="card__list__content">
@@ -17,7 +17,7 @@
17
17
  </div>
18
18
  </div>
19
19
  <div class="budget__card__list-project">
20
- <span class="budget-list__data__number budget-list__number-show-for-medium">
20
+ <span>
21
21
  <%= budget_to_currency project.budget_amount %>
22
22
  </span>
23
23
  </div>
@@ -1 +1 @@
1
- <%= order_selector available_orders, i18n_scope: "decidim.budgets.projects.orders", css_class: "items-start pl-4" %>
1
+ <%= order_selector available_orders, i18n_scope: "decidim.budgets.projects.orders" %>
@@ -1,5 +1,4 @@
1
1
  <span class="budget-summary__progressbar-legend budget-summary__progressbar-marks_right" data-total-allocation="<%= current_order.available_allocation %>">
2
- <%= t("budget", scope: "decidim.budgets.projects.order_progress") %>
3
2
  <strong class="budget-summary__progressbar-legend-strong">
4
3
  <% if current_order.projects_rule? %>
5
4
  <%= current_order.maximum_projects %>
@@ -7,4 +6,5 @@
7
6
  <%= budget_to_currency(budget.total_budget) %>
8
7
  <% end %>
9
8
  </strong>
9
+ <%= t("budget", scope: "decidim.budgets.projects.order_progress") %>
10
10
  </span>
@@ -20,32 +20,31 @@
20
20
  <% end %>
21
21
  <% end %>
22
22
  <div class="budget-summary__progressbar">
23
- <div class="progress 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">
24
- <div class="progress-meter budget-summary__progressbar--minimum" style="width: <%= current_order_budget_percent_minimum %>%">
25
- <span class="progress-meter--minimum-mark"></span>
23
+ <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">
24
+ <div class="budget-summary__progressbar--minimum" style="width: <%= current_order_budget_percent_minimum %>%">
26
25
  </div>
27
- <div class="progress-meter budget-summary__progressbar--meter" style="width: <%= current_order_budget_percent %>%"> </div>
26
+ <div class="budget-summary__progressbar--meter" style="width: <%= current_order_budget_percent %>%"> </div>
28
27
  </div>
29
28
  <div class="budget-summary__progressbar-marks">
30
- <span class="budget-summary__progressbar-legend">
31
- <%= t("assigned", scope: "decidim.budgets.projects.order_progress") %>
29
+ <span class="budget-summary__progressbar-legend" style="width: <%= current_order_budget_percent_minimum %>%;">
32
30
  <strong id="order-total-budget<%= "-responsive" if responsive %>" class="budget-summary__progressbar-legend-strong">
33
31
  <%= render partial: "decidim/budgets/projects/order_total_budget" %>
34
32
  </strong>
33
+ <%= t("assigned", scope: "decidim.budgets.projects.order_progress") %>
35
34
  </span>
36
35
  <% if current_order.minimum_budget > 0 %>
37
36
  <span class="budget-summary__progressbar-legend budget-summary__progressbar-marks_center">
38
- <%= t("minimum", scope: "decidim.budgets.projects.order_progress") %>
39
37
  <strong class="budget-summary__progressbar-legend-strong">
40
38
  <%= budget_to_currency(current_order.minimum_budget) %>
41
39
  </strong>
40
+ <%= t("minimum", scope: "decidim.budgets.projects.order_progress") %>
42
41
  </span>
43
42
  <% end %>
44
43
  <%= render partial: "decidim/budgets/projects/order_progress_progressbar_marks_right" %>
45
44
  </div>
46
45
  </div>
47
46
  </div>
48
- <div class="budget-summary__progressbox-buttons">
47
+ <div class="budget-summary__progressbox-buttons layout-aside__ctas-buttons" data-sticky-buttons>
49
48
  <% if !current_order_checked_out? && voting_open? %>
50
49
  <button class="button button__secondary button__lg w-full" data-dialog-open="budget-confirm" <%= budget_confirm_disabled_attr %>>
51
50
  <%= t("vote", scope: "decidim.budgets.projects.budget_summary") %>
@@ -67,11 +66,10 @@
67
66
  <div class="w-screen max-w-screen progressbox-fixed-wrapper" data-progressbox-fixed>
68
67
  <div class="gap-0 layout-item py-4 items-center budget-summary__progressbar">
69
68
  <div class="budget-summary__progressbox layout-item__main">
70
- <div class="progress budget-progress relative" role="progressbar" aria-valuenow="<%= current_order_budget_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemin="0" aria-valuemax="100">
71
- <div class="progress-meter budget-summary__progressbar--minimum" style="width: <%= current_order_budget_percent_minimum %>%">
72
- <span class="progress-meter--minimum-mark"></span>
69
+ <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">
70
+ <div class="budget-summary__progressbar--minimum" style="width: <%= current_order_budget_percent_minimum %>%">
73
71
  </div>
74
- <div class="progress-meter budget-summary__progressbar--meter" style="width: <%= current_order_budget_percent %>%">
72
+ <div class="budget-summary__progressbar--meter" style="width: <%= current_order_budget_percent %>%">
75
73
  </div>
76
74
  </div>
77
75
  <div class="budget-summary__progressbar-marks">
@@ -92,7 +90,7 @@
92
90
  <%= render partial: "decidim/budgets/projects/order_progress_progressbar_marks_right" %>
93
91
  </div>
94
92
  </div>
95
- <div class="layout-item__aside budget-summary__progressbox-buttons">
93
+ <div class="layout-item__aside budget-summary__progressbox-buttons hidden lg:block">
96
94
  <% if !current_order_checked_out? && voting_open? %>
97
95
  <button class="button button__secondary button__lg mt-2 md:mt-0 w-full" data-dialog-open="budget-confirm" <%= budget_confirm_disabled_attr %>>
98
96
  <span>
@@ -111,3 +109,14 @@
111
109
  </div>
112
110
  </div>
113
111
  </div>
112
+
113
+ <div class="budget-summary__button-dropdown">
114
+ <button id="dropdown-trigger-button-dropdown" data-component="dropdown" data-target="dropdown-menu-button-dropdown" class="budget-summary__button-dropdown_text">
115
+ <%= t("more_information", scope: "decidim.budgets.budget_information_modal") %>
116
+ <%= icon "arrow-down-s-line" %>
117
+ <%= icon "arrow-up-s-line" %>
118
+ </button>
119
+ <p id="dropdown-menu-button-dropdown">
120
+ <%= cell("decidim/budgets/budget_information_modal", @budget).call(:more_information) %>
121
+ </p>
122
+ </div>
@@ -3,7 +3,7 @@
3
3
  <%= render partial: "addition_selector" %>
4
4
  </div>
5
5
 
6
- <div class="collection-sort-controls">
6
+ <div data-collection-sort-controls>
7
7
  <%= render partial: "order" %>
8
8
  </div>
9
9
  </div>
@@ -1,12 +1,4 @@
1
- <% add_decidim_meta_tags(
2
- description: translated_attribute(budget.description),
3
- title: t("decidim.components.pagination.page_title",
4
- component_name: t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)),
5
- current_page: projects.current_page,
6
- total_pages: projects.total_pages ),
7
- url: budget_url(budget),
8
- resource: budget) %>
9
-
1
+ <% add_decidim_page_title t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)) %>
10
2
  <%= append_javascript_pack_tag "decidim_budgets" %>
11
3
  <%= append_stylesheet_pack_tag "decidim_budgets" %>
12
4
 
@@ -64,7 +56,7 @@
64
56
  </section>
65
57
  <% end %>
66
58
 
67
- <section id="projects" class="layout-main__section layout-main__heading budget__projects__container">
59
+ <section id="projects" class="layout-main__section layout-main__heading">
68
60
  <%= render partial: "projects" %>
69
61
  </section>
70
62
  <% else %>
@@ -1,5 +1,5 @@
1
1
  var $projects = $('#projects .budget-list');
2
- var $order = $('.budget__list--header .collection-sort-controls');
2
+ var $order = $('.budget__list--header [data-collection-sort-controls]');
3
3
  var $projectsCount = $('#projects-count');
4
4
  var $orderFilterInput = $('.order_filter');
5
5
 
@@ -8,6 +8,7 @@ ar:
8
8
  total_budget: الميزانية الإجمالية
9
9
  project:
10
10
  decidim_category_id: الفئة
11
+ decidim_scope_id: نطاق
11
12
  description: وصف
12
13
  proposal_ids: المقترحات ذات الصلة
13
14
  title: عنوان
@@ -30,6 +31,7 @@ ar:
30
31
  actions:
31
32
  attachment_collections: المجلدات
32
33
  attachments: مرفقات
34
+ confirm_destroy: هل أنت متأكد أنك تريد حذف هذا المشروع؟
33
35
  destroy: حذف
34
36
  edit: تعديل
35
37
  edit_projects: إدارة المشاريع
@@ -80,7 +82,6 @@ ar:
80
82
  update: "%{user_name} تحديث المشروع %{resource_name} في %{space_name} الفضاء"
81
83
  budget_information_modal:
82
84
  continue: مواصلة
83
- more_information: المزيد من المعلومات
84
85
  budgets_list:
85
86
  budgets: الميزانيات
86
87
  models:
@@ -116,6 +117,7 @@ ar:
116
117
  other: "%{count} مشاريع"
117
118
  filters:
118
119
  category: الفئة
120
+ scope: نطاق
119
121
  search: بحث
120
122
  show:
121
123
  budget: ميزانية
@@ -125,7 +127,6 @@ ar:
125
127
  components:
126
128
  budgets:
127
129
  actions:
128
- comment: تعليق
129
130
  vote: تصويت
130
131
  name: الميزانيات
131
132
  settings:
@@ -11,7 +11,7 @@ bg:
11
11
  project:
12
12
  budget_amount: Бюджетна сума
13
13
  decidim_category_id: Категория
14
- decidim_scope_id: Обхват
14
+ decidim_scope_id: Сфера
15
15
  description: Описание
16
16
  proposal_ids: Свързани предложения
17
17
  proposals: Предложения
@@ -44,6 +44,7 @@ bg:
44
44
  actions:
45
45
  attachment_collections: Папки
46
46
  attachments: Прикачени файлове
47
+ confirm_destroy: Сигурни ли сте, че искате да изтриете този проект?
47
48
  destroy: Изтрий
48
49
  edit: Редактирай
49
50
  edit_projects: Обедини проекти
@@ -171,7 +172,7 @@ bg:
171
172
  back_to: Назад към %{component_name}
172
173
  close_modal: Затвори прозореца
173
174
  continue: Продължи
174
- more_information: Още информация
175
+ more_information: Повече информация относно бюджета
175
176
  budgets_list:
176
177
  budgets: Бюджети
177
178
  cancel_order:
@@ -210,6 +211,7 @@ bg:
210
211
  fields:
211
212
  category: Категория
212
213
  id: ID
214
+ map: Карта
213
215
  title: Заглавие
214
216
  order_summary_mailer:
215
217
  order_summary:
@@ -172,7 +172,7 @@ ca:
172
172
  back_to: Tornar a %{component_name}
173
173
  close_modal: Tancar el modal
174
174
  continue: Continuar
175
- more_information: Més informació
175
+ more_information: Més informació sobre el pressupost
176
176
  budgets_list:
177
177
  budgets: Pressupostos
178
178
  cancel_order:
@@ -211,6 +211,7 @@ ca:
211
211
  fields:
212
212
  category: Categoria
213
213
  id: ID
214
+ map: Mapa
214
215
  title: Títol
215
216
  order_summary_mailer:
216
217
  order_summary:
@@ -292,7 +293,7 @@ ca:
292
293
  other: vots
293
294
  you_voted: Has votat això
294
295
  project_budget_button:
295
- add: Afegir
296
+ add: Afegir al teu vot
296
297
  add_descriptive: Afegeix el projecte %{resource_name} al teu vot.
297
298
  added: Afegit al teu vot
298
299
  added_descriptive: El projecte %{resource_name} s'ha afegit al teu vot.
@@ -48,7 +48,7 @@ cs:
48
48
  actions:
49
49
  attachment_collections: Složky
50
50
  attachments: Přílohy
51
- confirm_destroy: Opravdu chcete odstranit tento projekt?
51
+ confirm_destroy: Opravdu chcete tento projekt smazat?
52
52
  destroy: Smazat
53
53
  edit: Upravit
54
54
  edit_projects: Spravovat projekty
@@ -178,7 +178,7 @@ cs:
178
178
  back_to: Zpět na %{component_name}
179
179
  close_modal: Zavřít okno
180
180
  continue: Pokračovat
181
- more_information: Více informací
181
+ more_information: Více informací o rozpočtu
182
182
  budgets_list:
183
183
  budgets: Rozpočty
184
184
  cancel_order:
@@ -219,6 +219,7 @@ cs:
219
219
  fields:
220
220
  category: Kategorie
221
221
  id: ID
222
+ map: Mapa
222
223
  title: Titul
223
224
  order_summary_mailer:
224
225
  order_summary:
@@ -3,7 +3,7 @@ de:
3
3
  activemodel:
4
4
  attributes:
5
5
  budget:
6
- decidim_scope_id: Themenbereich
6
+ decidim_scope_id: Bereich
7
7
  description: Beschreibung
8
8
  title: Titel
9
9
  total_budget: Gesamtbudget
@@ -11,7 +11,7 @@ de:
11
11
  project:
12
12
  budget_amount: Höhe des Budgets
13
13
  decidim_category_id: Kategorie
14
- decidim_scope_id: Themenbereich
14
+ decidim_scope_id: Umfang
15
15
  description: Beschreibung
16
16
  proposal_ids: Ähnliche Vorschläge
17
17
  proposals: Vorschläge
@@ -172,7 +172,7 @@ de:
172
172
  back_to: Zurück zu %{component_name}
173
173
  close_modal: Dialog schließen
174
174
  continue: Weiter
175
- more_information: Mehr Informationen
175
+ more_information: Weitere Informationen zum Budget
176
176
  budgets_list:
177
177
  budgets: Budgets
178
178
  cancel_order:
@@ -211,6 +211,7 @@ de:
211
211
  fields:
212
212
  category: Kategorie
213
213
  id: ID
214
+ map: Karte
214
215
  title: Titel
215
216
  order_summary_mailer:
216
217
  order_summary:
@@ -253,7 +254,7 @@ de:
253
254
  title: Sie haben noch nicht abgestimmt
254
255
  filters:
255
256
  category: Kategorie
256
- scope: Themenbereich
257
+ scope: Umfang
257
258
  search: Suche
258
259
  status: Status
259
260
  status_values:
@@ -333,7 +334,7 @@ de:
333
334
  more_information_modal: Weitere Informationen
334
335
  projects_per_page: Projekte pro Seite
335
336
  resources_permissions_enabled: Berechtigungen können für jedes Projekt festgelegt werden
336
- scope_id: Themenbereich
337
+ scope_id: Bereich
337
338
  scopes_enabled: Bereiche aktiviert
338
339
  title: Titel
339
340
  total_budget: Gesamtbudget; Gesamtetat