decidim-proposals 0.19.0 → 0.22.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (227) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/config/admin/decidim_proposals_manifest.js +1 -0
  3. data/app/assets/images/decidim/gamification/badges/accepted_proposals.svg +1 -234
  4. data/app/assets/images/decidim/gamification/badges/proposal_votes.svg +1 -95
  5. data/app/assets/images/decidim/gamification/badges/proposals.svg +1 -229
  6. data/app/assets/images/decidim/proposals/icon.svg +1 -3
  7. data/app/assets/javascripts/decidim/proposals/admin/proposals.es6 +24 -11
  8. data/app/assets/javascripts/decidim/proposals/admin/proposals_form.js.es6 +0 -5
  9. data/app/assets/javascripts/decidim/proposals/admin/proposals_picker.js.es6 +35 -0
  10. data/app/cells/decidim/proposals/collaborative_draft_link_to_proposal_cell.rb +1 -1
  11. data/app/cells/decidim/proposals/collaborative_draft_m/footer.erb +1 -1
  12. data/app/cells/decidim/proposals/collaborative_draft_m_cell.rb +1 -1
  13. data/app/cells/decidim/proposals/cost_report/show.erb +35 -0
  14. data/app/cells/decidim/proposals/cost_report_cell.rb +42 -0
  15. data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb +3 -3
  16. data/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb +1 -1
  17. data/app/cells/decidim/proposals/irreversible_action_modal/show.erb +2 -2
  18. data/app/cells/decidim/proposals/irreversible_action_modal_cell.rb +1 -1
  19. data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb +1 -1
  20. data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb +1 -1
  21. data/app/cells/decidim/proposals/proposal_m/footer.erb +4 -1
  22. data/app/cells/decidim/proposals/proposal_m_cell.rb +37 -9
  23. data/app/cells/decidim/proposals/proposal_tags/show.erb +18 -10
  24. data/app/cells/decidim/proposals/proposal_tags_cell.rb +5 -0
  25. data/app/cells/decidim/proposals/proposals_picker/proposals.erb +12 -0
  26. data/app/cells/decidim/proposals/proposals_picker/show.erb +14 -0
  27. data/app/cells/decidim/proposals/proposals_picker_cell.rb +72 -0
  28. data/app/commands/decidim/proposals/admin/answer_proposal.rb +24 -46
  29. data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb +61 -0
  30. data/app/commands/decidim/proposals/admin/create_proposal.rb +6 -1
  31. data/app/commands/decidim/proposals/admin/create_proposal_note.rb +15 -0
  32. data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb +85 -0
  33. data/app/commands/decidim/proposals/admin/publish_answers.rb +67 -0
  34. data/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb +62 -0
  35. data/app/commands/decidim/proposals/admin/update_proposal.rb +1 -1
  36. data/app/commands/decidim/proposals/admin/update_proposal_scope.rb +75 -0
  37. data/app/commands/decidim/proposals/create_collaborative_draft.rb +1 -1
  38. data/app/commands/decidim/proposals/create_proposal.rb +1 -1
  39. data/app/commands/decidim/proposals/gallery_methods.rb +2 -51
  40. data/app/commands/decidim/proposals/update_proposal.rb +1 -1
  41. data/app/controllers/concerns/decidim/proposals/admin/filterable.rb +82 -0
  42. data/app/controllers/concerns/decidim/proposals/admin/picker.rb +21 -0
  43. data/app/controllers/concerns/decidim/proposals/orderable.rb +13 -2
  44. data/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb +16 -6
  45. data/app/controllers/decidim/proposals/admin/proposal_notes_controller.rb +8 -9
  46. data/app/controllers/decidim/proposals/admin/proposals_controller.rb +105 -29
  47. data/app/controllers/decidim/proposals/admin/valuation_assignments_controller.rb +58 -0
  48. data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb +19 -3
  49. data/app/controllers/decidim/proposals/proposals_controller.rb +45 -11
  50. data/app/controllers/decidim/proposals/versions_controller.rb +9 -16
  51. data/app/events/decidim/proposals/admin/proposal_note_created_event.rb +27 -0
  52. data/app/events/decidim/proposals/admin/update_proposal_scope_event.rb +11 -0
  53. data/app/forms/decidim/proposals/admin/participatory_text_proposal_form.rb +13 -0
  54. data/app/forms/decidim/proposals/admin/preview_participatory_text_form.rb +2 -2
  55. data/app/forms/decidim/proposals/admin/proposal_answer_form.rb +27 -2
  56. data/app/forms/decidim/proposals/admin/proposal_base_form.rb +129 -0
  57. data/app/forms/decidim/proposals/admin/proposal_form.rb +2 -120
  58. data/app/forms/decidim/proposals/admin/valuation_assignment_form.rb +37 -0
  59. data/app/forms/decidim/proposals/proposal_form.rb +4 -0
  60. data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb +13 -1
  61. data/app/helpers/decidim/proposals/admin/filterable_helper.rb +17 -0
  62. data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb +35 -0
  63. data/app/helpers/decidim/proposals/admin/proposal_rankings_helper.rb +63 -0
  64. data/app/helpers/decidim/proposals/admin/proposals_helper.rb +122 -0
  65. data/app/helpers/decidim/proposals/admin/proposals_picker_helper.rb +30 -0
  66. data/app/helpers/decidim/proposals/application_helper.rb +51 -30
  67. data/app/helpers/decidim/proposals/collaborative_draft_helper.rb +9 -9
  68. data/app/helpers/decidim/proposals/control_version_helper.rb +1 -37
  69. data/app/helpers/decidim/proposals/proposal_cells_helper.rb +1 -1
  70. data/app/helpers/decidim/proposals/proposal_endorsements_helper.rb +0 -145
  71. data/app/helpers/decidim/proposals/proposal_votes_helper.rb +2 -2
  72. data/app/helpers/decidim/proposals/proposal_wizard_helper.rb +24 -7
  73. data/app/helpers/decidim/proposals/proposals_helper.rb +66 -0
  74. data/app/models/decidim/proposals/proposal.rb +167 -29
  75. data/app/models/decidim/proposals/valuation_assignment.rb +24 -0
  76. data/app/permissions/decidim/proposals/admin/permissions.rb +77 -11
  77. data/app/permissions/decidim/proposals/permissions.rb +1 -22
  78. data/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb +1 -1
  79. data/app/presenters/decidim/proposals/admin_log/valuation_assignment_presenter.rb +51 -0
  80. data/app/presenters/decidim/proposals/admin_log/value_types/valuator_role_user_presenter.rb +19 -0
  81. data/app/presenters/decidim/proposals/collaborative_draft_presenter.rb +2 -28
  82. data/app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb +22 -0
  83. data/app/presenters/decidim/proposals/proposal_presenter.rb +41 -10
  84. data/app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb +1 -2
  85. data/app/queries/decidim/proposals/metrics/endorsements_metric_manage.rb +15 -12
  86. data/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb +5 -4
  87. data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb +2 -8
  88. data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb +3 -9
  89. data/app/services/decidim/proposals/collaborative_draft_search.rb +18 -10
  90. data/app/services/decidim/proposals/diff_renderer.rb +2 -0
  91. data/app/services/decidim/proposals/proposal_builder.rb +1 -1
  92. data/app/services/decidim/proposals/proposal_search.rb +45 -47
  93. data/app/types/decidim/proposals/proposal_input_filter.rb +29 -0
  94. data/app/types/decidim/proposals/proposal_input_sort.rb +22 -0
  95. data/app/types/decidim/proposals/proposal_type.rb +32 -11
  96. data/app/types/decidim/proposals/proposals_type.rb +22 -15
  97. data/app/validators/proposal_length_validator.rb +38 -0
  98. data/app/views/decidim/proposals/admin/participatory_texts/index.html.erb +9 -1
  99. data/app/views/decidim/proposals/admin/proposal_answers/_form.html.erb +35 -0
  100. data/app/views/decidim/proposals/admin/proposal_notes/_form.html.erb +1 -1
  101. data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb +3 -3
  102. data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb +8 -2
  103. data/app/views/decidim/proposals/admin/proposals/_form.html.erb +4 -24
  104. data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb +25 -17
  105. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb +15 -0
  106. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb +21 -1
  107. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb +14 -0
  108. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_scope-change.html.erb +25 -0
  109. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_valuator.html.erb +15 -0
  110. data/app/views/decidim/proposals/admin/proposals/index.html.erb +16 -7
  111. data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb +12 -0
  112. data/app/views/decidim/proposals/admin/proposals/show.html.erb +186 -0
  113. data/app/views/decidim/proposals/admin/proposals/update_category.js.erb +3 -2
  114. data/app/views/decidim/proposals/admin/proposals/update_scope.js.erb +27 -0
  115. data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +6 -4
  116. data/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb +9 -7
  117. data/app/views/decidim/proposals/collaborative_drafts/_new_collaborative_draft_button.html.erb +4 -4
  118. data/app/views/decidim/proposals/collaborative_drafts/_reject_request_access_form.html.erb +1 -1
  119. data/app/views/decidim/proposals/collaborative_drafts/_wizard_aside.html.erb +4 -2
  120. data/app/views/decidim/proposals/collaborative_drafts/compare.html.erb +2 -0
  121. data/app/views/decidim/proposals/collaborative_drafts/complete.html.erb +2 -0
  122. data/app/views/decidim/proposals/collaborative_drafts/edit.html.erb +3 -1
  123. data/app/views/decidim/proposals/collaborative_drafts/index.html.erb +4 -2
  124. data/app/views/decidim/proposals/collaborative_drafts/new.html.erb +4 -0
  125. data/app/views/decidim/proposals/collaborative_drafts/show.html.erb +29 -30
  126. data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +6 -4
  127. data/app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb +0 -16
  128. data/app/views/decidim/proposals/proposals/_filters.html.erb +19 -17
  129. data/app/views/decidim/proposals/proposals/_proposal_badge.html.erb +1 -4
  130. data/app/views/decidim/proposals/proposals/_proposal_preview.html.erb +1 -11
  131. data/app/views/decidim/proposals/proposals/_proposal_similar.html.erb +2 -2
  132. data/app/views/decidim/proposals/proposals/_proposals.html.erb +14 -0
  133. data/app/views/decidim/proposals/proposals/_vote_button.html.erb +14 -7
  134. data/app/views/decidim/proposals/proposals/_wizard_aside.html.erb +4 -2
  135. data/app/views/decidim/proposals/proposals/_wizard_header.html.erb +4 -3
  136. data/app/views/decidim/proposals/proposals/compare.html.erb +2 -0
  137. data/app/views/decidim/proposals/proposals/complete.html.erb +2 -0
  138. data/app/views/decidim/proposals/proposals/edit.html.erb +3 -1
  139. data/app/views/decidim/proposals/proposals/edit_draft.html.erb +2 -0
  140. data/app/views/decidim/proposals/proposals/index.html.erb +7 -12
  141. data/app/views/decidim/proposals/proposals/new.html.erb +6 -2
  142. data/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb +1 -1
  143. data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb +10 -3
  144. data/app/views/decidim/proposals/proposals/participatory_texts/_view_index.html.erb +1 -1
  145. data/app/views/decidim/proposals/proposals/preview.html.erb +7 -8
  146. data/app/views/decidim/proposals/proposals/show.html.erb +62 -71
  147. data/app/views/decidim/proposals/versions/index.html.erb +14 -32
  148. data/app/views/decidim/proposals/versions/show.html.erb +16 -34
  149. data/config/locales/ar.yml +74 -66
  150. data/config/locales/bg-BG.yml +237 -0
  151. data/config/locales/ca.yml +173 -65
  152. data/config/locales/cs.yml +187 -79
  153. data/config/locales/da-DK.yml +1 -0
  154. data/config/locales/de.yml +266 -162
  155. data/config/locales/el-GR.yml +1 -0
  156. data/config/locales/el.yml +876 -0
  157. data/config/locales/en.yml +179 -71
  158. data/config/locales/es-MX.yml +173 -63
  159. data/config/locales/es-PY.yml +173 -63
  160. data/config/locales/es.yml +173 -65
  161. data/config/locales/et-EE.yml +1 -0
  162. data/config/locales/eu.yml +43 -63
  163. data/config/locales/fi-plain.yml +173 -65
  164. data/config/locales/fi.yml +215 -107
  165. data/config/locales/fr-CA.yml +876 -0
  166. data/config/locales/fr.yml +151 -65
  167. data/config/locales/ga-IE.yml +1 -0
  168. data/config/locales/gl.yml +43 -63
  169. data/config/locales/hr-HR.yml +1 -0
  170. data/config/locales/hu.yml +153 -75
  171. data/config/locales/id-ID.yml +43 -62
  172. data/config/locales/is-IS.yml +274 -0
  173. data/config/locales/it.yml +172 -82
  174. data/config/locales/ja-JP.yml +886 -0
  175. data/config/locales/lt-LT.yml +1 -0
  176. data/config/locales/lv-LV.yml +858 -0
  177. data/config/locales/mt-MT.yml +1 -0
  178. data/config/locales/nl.yml +274 -188
  179. data/config/locales/no.yml +786 -0
  180. data/config/locales/pl.yml +194 -66
  181. data/config/locales/pt-BR.yml +44 -67
  182. data/config/locales/pt.yml +437 -331
  183. data/config/locales/ro-RO.yml +840 -0
  184. data/config/locales/ru.yml +14 -47
  185. data/config/locales/sk-SK.yml +896 -0
  186. data/config/locales/sk.yml +869 -0
  187. data/config/locales/sl.yml +26 -0
  188. data/config/locales/sr-CS.yml +126 -0
  189. data/config/locales/sv.yml +253 -162
  190. data/config/locales/tr-TR.yml +43 -63
  191. data/config/locales/uk.yml +14 -47
  192. data/db/migrate/20181003074440_fix_user_groups_ids_in_proposals_endorsements.rb +4 -0
  193. data/db/migrate/20191206154128_add_endorsements_counter_cache_to_proposals.rb +7 -0
  194. data/db/migrate/20200120215928_move_proposal_endorsements_to_core_endorsements.rb +52 -0
  195. data/db/migrate/20200203111239_add_proposal_valuation_assignments.rb +12 -0
  196. data/db/migrate/20200210135152_add_costs_to_proposals.rb +9 -0
  197. data/db/migrate/20200212120110_sync_proposals_state_with_amendments_state.rb +28 -0
  198. data/db/migrate/20200227175922_add_state_published_at_to_proposals.rb +7 -0
  199. data/db/migrate/20200306123652_publish_existing_proposals_state.rb +15 -0
  200. data/db/migrate/20200730131631_move_proposal_endorsed_event_notifications_to_resource_endorsed_event.rb +20 -0
  201. data/lib/decidim/proposals.rb +1 -0
  202. data/lib/decidim/proposals/admin_engine.rb +7 -3
  203. data/lib/decidim/proposals/component.rb +47 -23
  204. data/lib/decidim/proposals/engine.rb +2 -6
  205. data/lib/decidim/proposals/test/capybara_proposals_picker.rb +49 -0
  206. data/lib/decidim/proposals/test/factories.rb +56 -10
  207. data/lib/decidim/proposals/valuatable.rb +21 -0
  208. data/lib/decidim/proposals/version.rb +1 -1
  209. metadata +94 -53
  210. data/app/assets/javascripts/decidim/proposals/identity_selector_dialog.js.es6 +0 -56
  211. data/app/cells/decidim/proposals/endorsers_list/show.erb +0 -17
  212. data/app/cells/decidim/proposals/endorsers_list_cell.rb +0 -31
  213. data/app/commands/decidim/proposals/attachment_methods.rb +0 -43
  214. data/app/commands/decidim/proposals/endorse_proposal.rb +0 -59
  215. data/app/commands/decidim/proposals/unendorse_proposal.rb +0 -40
  216. data/app/controllers/decidim/proposals/proposal_endorsements_controller.rb +0 -60
  217. data/app/models/decidim/proposals/proposal_endorsement.rb +0 -37
  218. data/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb +0 -22
  219. data/app/views/decidim/proposals/admin/proposal_notes/index.html.erb +0 -3
  220. data/app/views/decidim/proposals/admin/shared/_info_proposal.html.erb +0 -20
  221. data/app/views/decidim/proposals/proposal_endorsements/_identity.html.erb +0 -9
  222. data/app/views/decidim/proposals/proposal_endorsements/identities.html.erb +0 -12
  223. data/app/views/decidim/proposals/proposal_endorsements/update_buttons_and_counters.js.erb +0 -20
  224. data/app/views/decidim/proposals/proposal_widgets/show.html.erb +0 -4
  225. data/app/views/decidim/proposals/proposals/_endorsement_button.html.erb +0 -11
  226. data/app/views/decidim/proposals/proposals/_endorsement_identities_cabin.html.erb +0 -13
  227. data/app/views/decidim/proposals/versions/_version.html.erb +0 -20
@@ -1,6 +1,3 @@
1
- <% if proposal.answered? %>
2
- <span class="<%= proposal_state_badge_css_class(proposal.state) %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
3
- <% end %>
4
- <% if proposal.withdrawn? %>
1
+ <% if proposal.published_state? || proposal.withdrawn? %>
5
2
  <span class="<%= proposal_state_badge_css_class(proposal.state) %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
6
3
  <% end %>
@@ -1,11 +1 @@
1
- <div class="row column view-header">
2
- <h2 class="heading2"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
3
- <% unless component_settings.participatory_texts_enabled? %>
4
- <%= cell("decidim/coauthorships", @proposal) %>
5
- <% end %>
6
- </div>
7
- <div class="row column">
8
- <%= simple_format(present(@proposal).body(links: true, strip_tags: true), nil, sanitize: false) %>
9
- </div>
10
- <br>
11
- <%= attachments_for(@proposal) %>
1
+ <%= card_for @proposal, from: @proposal, preview: true %>
@@ -1,5 +1,5 @@
1
1
  <div class="column">
2
- <article class="card card--proposal">
2
+ <div class="card card--proposal">
3
3
  <div class="card__content">
4
4
  <div class="card__header">
5
5
  <%= link_to proposal, target: "_blank" do %>
@@ -18,5 +18,5 @@
18
18
  <p><%= truncate(present(proposal).body(strip_tags: true), length: 100) %></p>
19
19
  <%= cell "decidim/tags", proposal, context: { extra_classes: ["tags--proposal"] } %>
20
20
  </div>
21
- </article>
21
+ </div>
22
22
  </div>
@@ -11,4 +11,18 @@
11
11
  <div class="row small-up-1 medium-up-2 card-grid">
12
12
  <%= render @proposals %>
13
13
  </div>
14
+
15
+ <div class="row">
16
+ <div class="columns mediumlarge-8 large-9">
17
+ <% if @proposals.empty? %>
18
+ <div class="callout secondary">
19
+ <% if params[:filter].present? %>
20
+ <p><%= t(".empty_filters") %></p>
21
+ <% else %>
22
+ <p><%= t(".empty") %></p>
23
+ <% end %>
24
+ </div>
25
+ <% end %>
26
+ </div>
27
+ </div>
14
28
  <%= decidim_paginate @proposals %>
@@ -4,12 +4,15 @@
4
4
  <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
5
5
  <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
6
6
  <% else %>
7
- <div id="proposal-<%= proposal.id %>-vote-button">
7
+ <div id="proposal-<%= proposal.id %>-vote-button" class="button--vote-button">
8
8
  <% if !current_user %>
9
9
  <% if current_settings.votes_blocked? %>
10
10
  <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
11
11
  <% else %>
12
- <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
12
+ <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } do %>
13
+ <%= t("decidim.proposals.proposals.vote_button.vote") %>
14
+ <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
15
+ <% end %>
13
16
  <% end %>
14
17
  <% else %>
15
18
  <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
@@ -25,22 +28,26 @@
25
28
  replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
26
29
  "redirect-url": proposal_path(proposal)
27
30
  },
28
- class: "button #{vote_button_classes(from_proposals_list)} success light",
31
+ class: "button #{vote_button_classes(from_proposals_list)} active light",
29
32
  id: "vote_button-#{proposal.id}"
30
33
  ) do %>
31
34
  <%= icon("check", class: "icon--small") %>
32
35
  <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
36
+ <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
33
37
  <% end %>
34
38
  <% else %>
35
39
  <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
36
- <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
40
+ <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
37
41
  <% else %>
38
42
  <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
39
- <%= content_tag :span, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
43
+ <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
40
44
  <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
41
- <%= content_tag :span, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
45
+ <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
42
46
  <% else %>
43
- <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" %>
47
+ <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" do %>
48
+ <%= t("decidim.proposals.proposals.vote_button.vote") %>
49
+ <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
50
+ <% end %>
44
51
  <% end %>
45
52
  <% end %>
46
53
  <% end %>
@@ -2,8 +2,8 @@
2
2
  <div class="m-bottom">
3
3
  <% unless @step == :step_2 %>
4
4
  <%= link_to proposal_wizard_aside_link_to_back(@step) do %>
5
- <%= icon "chevron-left", class: "icon--small" %>
6
- <%= wizard_aside_back_text %>
5
+ <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
6
+ <%= wizard_aside_back_text(@step) %>
7
7
  <% end %>
8
8
  <% end %>
9
9
  </div>
@@ -13,6 +13,8 @@
13
13
  </p>
14
14
  </div>
15
15
  <div class="show-for-large">
16
+ <div><%= proposal_wizard_steps_title %></div>
17
+ <div><%= proposal_wizard_current_step_of(@step) %></div>
16
18
  <%= proposal_wizard_stepper(@step) %>
17
19
  </div>
18
20
  </div>
@@ -23,9 +23,10 @@
23
23
  </h2>
24
24
 
25
25
  <div class="hide-for-large m-bottom">
26
- <%= proposal_wizard_current_step_of(@step) %>
26
+ <div><%= proposal_wizard_steps_title %></div>
27
+ <div><%= proposal_wizard_current_step_of(@step) %></div>
27
28
 
28
- <ol id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
29
+ <div id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
29
30
  <%= proposal_wizard_stepper(@step) %>
30
- </ol>
31
+ </div>
31
32
  </div>
@@ -1,3 +1,5 @@
1
+ <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
2
+
1
3
  <div class="row">
2
4
  <%= render partial: "wizard_aside" %>
3
5
 
@@ -1,3 +1,5 @@
1
+ <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
2
+
1
3
  <div class="row">
2
4
  <%= render partial: "wizard_aside" %>
3
5
 
@@ -1,6 +1,8 @@
1
+ <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
2
+
1
3
  <div class="row columns">
2
4
  <%= link_to :back, class: "muted-link" do %>
3
- <%= icon "chevron-left", class: "icon--small" %>
5
+ <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
4
6
  <%= t(".back") %>
5
7
  <% end %>
6
8
  <h2 class="section-heading"><%= t(".title") %></h2>
@@ -1,3 +1,5 @@
1
+ <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
2
+
1
3
  <div class="row">
2
4
  <%= render partial: "wizard_aside" %>
3
5
 
@@ -30,19 +30,14 @@
30
30
  <%= render partial: "voting_rules" %>
31
31
  <div class="row columns">
32
32
  <div class="title-action">
33
- <h2 id="proposals-count" class="title-action__title section-heading">
33
+ <h3 id="proposals-count" class="title-action__title section-heading">
34
34
  <%= render partial: "count" %>
35
- </h2>
35
+ </h3>
36
36
  <% if current_settings.creation_enabled && current_component.participatory_space.can_participate?(current_user) %>
37
- <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_proposal_path } do %>
37
+ <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small", data: { "redirect_url" => new_proposal_path } do %>
38
38
  <%= t(".new_proposal") %>
39
- <%= icon "plus" %>
39
+ <%= icon "plus", role: "img", "aria-hidden": true %>
40
40
  <% end %>
41
- <% else %>
42
- <span class="title-action__action button small hollow disabled">
43
- <%= t(".new_proposal") %>
44
- <%= icon "plus" %>
45
- </span>
46
41
  <% end %>
47
42
 
48
43
  <% if component_settings.collaborative_drafts_enabled? %>
@@ -57,14 +52,14 @@
57
52
  <%= render partial: "filters" %>
58
53
  </div>
59
54
  </div>
60
- <div id="proposals" class="columns mediumlarge-8 large-9">
55
+ <div id="proposals" class="columns mediumlarge-8 large-9" aria-live="polite">
61
56
  <%= render partial: "proposals" %>
62
57
  </div>
63
58
  </div>
64
59
  <div class="row">
65
60
  <div class="text-right">
66
- <%= link_to t(".see_all_withdrawn"), proposals_path("filter[state]" => "withdrawn") %>
61
+ <%= link_to t(".see_all_withdrawn"), proposals_path("filter[state][]" => "withdrawn") %>
67
62
  </div>
68
63
  </div>
69
64
  <%= javascript_include_tag("decidim/filters") %>
70
- <%= javascript_include_tag "decidim/orders" %>
65
+ <%= javascript_include_tag "decidim/results_listing" %>
@@ -1,3 +1,5 @@
1
+ <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
2
+
1
3
  <div class="row">
2
4
  <%= render partial: "decidim/proposals/proposals/wizard_aside" %>
3
5
 
@@ -7,12 +9,14 @@
7
9
  <div class="card">
8
10
  <div class="card__content">
9
11
  <%= decidim_form_for(@form) do |form| %>
12
+ <%= form_required_explanation %>
13
+
10
14
  <div class="field hashtags__container">
11
- <%= form.text_field :title, class: "js-hashtags", hashtaggable: true %>
15
+ <%= form.text_field :title, class: "js-hashtags" %>
12
16
  </div>
13
17
 
14
18
  <div class="field hashtags__container">
15
- <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true %>
19
+ <%= text_editor_for_proposal_body(form) %>
16
20
  </div>
17
21
 
18
22
  <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
@@ -8,7 +8,7 @@
8
8
  <% if proposal.participatory_text_level == "article" %>
9
9
  <u><%= decidim_html_escape(present(proposal).title).html_safe %></u>
10
10
  <% else %>
11
- <u class="text-uppercase"><%= decidim_html_escape(present(proposal).title).html_safe %></u>
11
+ <u><%= decidim_html_escape(present(proposal).title).html_safe %></u>
12
12
  <% end %>
13
13
  <br>
14
14
  <% end %>
@@ -6,7 +6,10 @@
6
6
  <% if current_settings.votes_blocked? %>
7
7
  <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "column button light button--sc disabled", disabled: true %>
8
8
  <% else %>
9
- <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "column button light button--sc", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
9
+ <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "column button light button--sc", data: { disable: true, "redirect-url": proposal_path(proposal) } do %>
10
+ <%= t("decidim.proposals.proposals.vote_button.vote") %>
11
+ <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
12
+ <% end %>
10
13
  <% end %>
11
14
  <% else %>
12
15
  <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
@@ -25,8 +28,9 @@
25
28
  class: "column button light button--sc success",
26
29
  id: "vote_button-#{proposal.id}"
27
30
  ) do %>
28
- <%= icon("check", class: "icon--small") %>
31
+ <%= icon("check", class: "icon--small", role: "img", "aria-hidden": true) %>
29
32
  <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
33
+ <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
30
34
  <% end %>
31
35
  <% else %>
32
36
  <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
@@ -37,7 +41,10 @@
37
41
  <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
38
42
  <%= content_tag :span, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "column button light button--sc disabled", disabled: true %>
39
43
  <% else %>
40
- <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "column button light button--sc" %>
44
+ <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "column button light button--sc" do %>
45
+ <%= t("decidim.proposals.proposals.vote_button.vote") %>
46
+ <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
47
+ <% end %>
41
48
  <% end %>
42
49
  <% end %>
43
50
  <% end %>
@@ -1,5 +1,5 @@
1
1
  <div class="card card__link p-xs flex--fsc reveal__trigger" data-open="participatory-text-index">
2
- <%= icon "list", class: "mr-s" %>
2
+ <%= icon "list", class: "mr-s", role: "img", "aria-hidden": true %>
3
3
  <strong><%= t(".see_index") %></strong>
4
4
  </div>
5
5
  <div id="participatory-text-index" class="reveal large" data-reveal>
@@ -1,16 +1,15 @@
1
+ <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
2
+
1
3
  <div class="row">
2
4
  <%= render partial: "wizard_aside" %>
3
5
 
4
6
  <div class="columns large-6">
5
7
  <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
6
- <div class="card">
7
- <div class="p-l">
8
- <%= render partial: "proposal_preview", locals: { proposal: @proposal } %>
9
- <div class="row column flex-center">
10
- <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %>
11
-
12
- <%= button_to t(".publish"), publish_proposal_path(@proposal), method: :post, class: "button button--nomargin small" %>
13
- </div>
8
+ <%= render partial: "proposal_preview", locals: { proposal: @proposal } %>
9
+ <div class="p-l">
10
+ <div class="row column flex-center">
11
+ <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %>
12
+ <%= button_to t(".publish"), publish_proposal_path(@proposal), method: :post, class: "button button--nomargin small" %>
14
13
  </div>
15
14
  </div>
16
15
  </div>
@@ -13,6 +13,16 @@ edit_link(
13
13
  )
14
14
  %>
15
15
 
16
+ <%
17
+ extra_admin_link(
18
+ resource_locator(@proposal).show(anchor: "proposal-answer"),
19
+ :create,
20
+ :proposal_answer,
21
+ { proposal: @proposal },
22
+ { name: t(".answer"), icon: "comment-square" }
23
+ )
24
+ %>
25
+
16
26
  <%= render partial: "voting_rules" %>
17
27
  <% if component_settings.participatory_texts_enabled? %>
18
28
  <div class="row column">
@@ -23,39 +33,52 @@ edit_link(
23
33
  <% end %>
24
34
  <%= emendation_announcement_for @proposal %>
25
35
  <div class="row column view-header">
36
+
37
+ <%= link_to :proposals, class: "small hollow" do %>
38
+ <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
39
+ <%= t(".back_to_list") %>
40
+ <% end %>
41
+
26
42
  <% if @proposal.emendation? %>
27
- <h2 class="heading2"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h2>
43
+ <h3 class="heading3"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h3>
28
44
  <% else %>
29
- <h2 class="heading2"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
45
+ <h3 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h3>
30
46
  <% end %>
31
47
  <% unless component_settings.participatory_texts_enabled? %>
32
48
  <%= cell("decidim/coauthorships", @proposal, has_actions: true, size: 3, context: { current_user: current_user }) %>
33
49
  <% end %>
34
50
  </div>
35
51
  <div class="row">
36
- <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
37
- <% if @proposal.amendable? %>
38
- <div class="card text-center">
39
- <div class="card__content">
40
- <div>
41
- <strong class="text-large text-uppercase">
42
- <%= t("version", scope:"decidim.proposals.collaborative_drafts.show", number: @proposal.versions_count) %>
43
- </strong>
44
- <small class="text-medium">
45
- <%= t("of_versions", scope:"decidim.proposals.collaborative_drafts.show", number: @proposal.versions_count) %>
46
- </small>
47
- </div>
52
+ <div class="columns mediumlarge-8 large-9">
53
+ <div class="section">
54
+ <% if @proposal.emendation? %>
55
+ <%= cell("decidim/diff", proposal_presenter.versions.last) %>
56
+ <% elsif not ["section","subsection"].include? @proposal.participatory_text_level %>
57
+ <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
58
+ <%= render_proposal_body(@proposal) %>
59
+ <% end %>
60
+ <% if component_settings.geocoding_enabled? %>
61
+ <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
62
+ <% end %>
63
+ <% if proposal_has_costs? && current_settings.answers_with_costs? %>
64
+ <%= cell("decidim/proposals/cost_report", @proposal) %>
65
+ <% end %>
66
+ <%= cell "decidim/proposals/proposal_tags", @proposal %>
67
+ </div>
48
68
 
49
- <div>
50
- <span class="text-medium">
51
- <%= link_to t("see_other_versions", scope:"decidim.proposals.collaborative_drafts.show"), proposal_versions_path(@proposal) %>
52
- </span>
53
- </div>
54
- </div>
55
- </div>
56
- <% end %>
69
+ <%= cell("decidim/announcement", proposal_reason_callout_args) if @proposal.answered? && @proposal.published_state? %>
70
+
71
+ <%= linked_resources_for @proposal, :results, "included_proposals" %>
72
+ <%= linked_resources_for @proposal, :projects, "included_proposals" %>
73
+ <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>
74
+ <%= linked_resources_for @proposal, :proposals, "copied_from_component" %>
75
+
76
+ <%= cell "decidim/endorsers_list", @proposal %>
77
+ <%= amendments_for @proposal %>
78
+ </div>
79
+ <div class="columns section view-side mediumlarge-4 large-3">
57
80
  <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
58
- <%= link_to t(".edit_proposal"), edit_proposal_path(@proposal), class: "button secondary hollow expanded button-sc button--icon follow-button" %>
81
+ <%= link_to t(".edit_proposal"), edit_proposal_path(@proposal), class: "button hollow expanded button--sc" %>
59
82
  <% else %>
60
83
  <%= amend_button_for @proposal %>
61
84
  <% end %>
@@ -78,7 +101,19 @@ edit_link(
78
101
  <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
79
102
  <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
80
103
  <% end %>
81
- <%= render partial: "endorsements_card_row", locals: { proposal: @proposal } %>
104
+ <div class="row collapse buttons__row">
105
+ <% if endorsements_enabled? %>
106
+ <div class="column small-9 collapse">
107
+ <%= endorsement_buttons_cell(@proposal) %>
108
+ </div>
109
+ <% end %>
110
+ <div class="column collapse <%= endorsements_enabled? ? "small-3" : "" %>">
111
+ <%= link_to "#comments", class: "button small compact hollow secondary button--nomargin expanded" do %>
112
+ <span class="show-for-sr"><%= present(@proposal).title(html_escape: true) %></span>
113
+ <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %> <%= @proposal.comments.count %>
114
+ <% end %>
115
+ </div>
116
+ </div>
82
117
  <br>
83
118
  <%= follow_button_for(@proposal) %>
84
119
  </div>
@@ -89,57 +124,13 @@ edit_link(
89
124
  <%= amenders_list_for(@proposal) %>
90
125
 
91
126
  <%= resource_reference(@proposal) %>
127
+ <%= resource_version(proposal_presenter, versions_path: proposal_versions_path(@proposal)) %>
92
128
  <%= cell("decidim/fingerprint", @proposal) %>
93
- <%= render partial: "decidim/shared/share_modal" %>
94
- <%= embed_modal_for proposal_proposal_widget_url(@proposal, format: :js) %>
129
+ <%= render partial: "decidim/shared/share_modal", locals: { resource: @proposal } %>
130
+ <%= embed_modal_for proposal_proposal_widget_url(@proposal, format: :js), locals: { resource: @proposal } %>
95
131
  <%= cell "decidim/proposals/proposal_link_to_collaborative_draft", @proposal %>
96
132
  <%= cell "decidim/proposals/proposal_link_to_rejected_emendation", @proposal %>
97
133
  </div>
98
- <div class="columns mediumlarge-8 mediumlarge-pull-4">
99
- <div class="section">
100
- <% if @proposal.emendation? %>
101
- <%= cell("decidim/diff", @proposal.versions.last) %>
102
- <% elsif not ["section","subsection"].include? @proposal.participatory_text_level %>
103
- <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
104
- <%= simple_format present(@proposal).body(links: true, strip_tags: true), nil, sanitize: false %>
105
- <% end %>
106
- <% if component_settings.geocoding_enabled? %>
107
- <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
108
- <% end %>
109
- <%= cell "decidim/proposals/proposal_tags", @proposal %>
110
- </div>
111
- <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
112
- <% if @proposal.accepted? %>
113
- <div class="section">
114
- <div class="callout success">
115
- <h5><%= t(".proposal_accepted_reason") %></h5>
116
- <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
117
- </div>
118
- </div>
119
- <% elsif @proposal.rejected? %>
120
- <div class="section">
121
- <div class="callout warning">
122
- <h5><%= t(".proposal_rejected_reason") %></h5>
123
- <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
124
- </div>
125
- </div>
126
- <% else %>
127
- <div class="section">
128
- <div class="callout secondary">
129
- <h5><%= t(".proposal_in_evaluation_reason") %></h5>
130
- <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
131
- </div>
132
- </div>
133
- <% end %>
134
- <% end %>
135
- <%= linked_resources_for @proposal, :results, "included_proposals" %>
136
- <%= linked_resources_for @proposal, :projects, "included_proposals" %>
137
- <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>
138
- <%= linked_resources_for @proposal, :proposals, "copied_from_component" %>
139
-
140
- <%= cell "decidim/proposals/endorsers_list", @proposal, context: { current_user: current_user } %>
141
- <%= amendments_for @proposal %>
142
- </div>
143
134
  </div>
144
135
  <%= attachments_for @proposal %>
145
136