decidim-proposals 0.13.1 → 0.14.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (156) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/config/decidim_proposals_manifest.js +1 -0
  3. data/app/assets/images/decidim/gamification/badges/accepted_proposals.svg +144 -0
  4. data/app/assets/images/decidim/gamification/badges/proposal_votes.svg +95 -0
  5. data/app/assets/images/decidim/gamification/badges/proposals.svg +145 -0
  6. data/app/assets/javascripts/decidim/proposals/add_proposal.js.es6 +1 -2
  7. data/app/cells/decidim/proposals/collaborative_draft_cell.rb +55 -0
  8. data/app/cells/decidim/proposals/collaborative_draft_link_to_proposal/show.erb +13 -0
  9. data/app/cells/decidim/proposals/collaborative_draft_link_to_proposal_cell.rb +57 -0
  10. data/app/cells/decidim/proposals/collaborative_draft_m/footer.erb +6 -0
  11. data/app/cells/decidim/proposals/collaborative_draft_m/tags.erb +1 -0
  12. data/app/cells/decidim/proposals/collaborative_draft_m_cell.rb +39 -0
  13. data/app/cells/decidim/proposals/endorsers_list/show.erb +1 -2
  14. data/app/cells/decidim/proposals/irreversible_action_modal/show.erb +27 -0
  15. data/app/cells/decidim/proposals/irreversible_action_modal_cell.rb +79 -0
  16. data/app/cells/decidim/proposals/proposal_cell.rb +1 -1
  17. data/app/cells/decidim/proposals/proposal_link_to_collaborative_draft/show.erb +9 -0
  18. data/app/cells/decidim/proposals/proposal_link_to_collaborative_draft_cell.rb +30 -0
  19. data/app/cells/decidim/proposals/proposal_m/footer.erb +1 -1
  20. data/app/cells/decidim/proposals/proposal_m_cell.rb +9 -1
  21. data/app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb +70 -0
  22. data/app/commands/decidim/proposals/admin/answer_proposal.rb +9 -0
  23. data/app/commands/decidim/proposals/admin/create_proposal.rb +5 -2
  24. data/app/commands/decidim/proposals/attachment_methods.rb +43 -0
  25. data/app/commands/decidim/proposals/create_collaborative_draft.rb +73 -0
  26. data/app/commands/decidim/proposals/create_proposal.rb +13 -48
  27. data/app/commands/decidim/proposals/publish_collaborative_draft.rb +87 -0
  28. data/app/commands/decidim/proposals/publish_proposal.rb +7 -0
  29. data/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb +63 -0
  30. data/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb +50 -0
  31. data/app/commands/decidim/proposals/unvote_proposal.rb +6 -7
  32. data/app/commands/decidim/proposals/update_collaborative_draft.rb +60 -0
  33. data/app/commands/decidim/proposals/update_proposal.rb +16 -3
  34. data/app/commands/decidim/proposals/vote_proposal.rb +3 -0
  35. data/app/commands/decidim/proposals/withdraw_collaborative_draft.rb +65 -0
  36. data/app/controllers/concerns/decidim/proposals/collaborative_orderable.rb +56 -0
  37. data/app/controllers/decidim/proposals/admin/application_controller.rb +1 -0
  38. data/app/controllers/decidim/proposals/collaborative_draft_collaborator_requests_controller.rb +53 -0
  39. data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb +171 -0
  40. data/app/controllers/decidim/proposals/proposals_controller.rb +38 -33
  41. data/app/controllers/decidim/proposals/versions_controller.rb +23 -0
  42. data/app/events/decidim/proposals/collaborative_draft_access_accepted_event.rb +8 -0
  43. data/app/events/decidim/proposals/collaborative_draft_access_rejected_event.rb +8 -0
  44. data/app/events/decidim/proposals/collaborative_draft_access_request_event.rb +27 -0
  45. data/app/events/decidim/proposals/collaborative_draft_access_requested_event.rb +8 -0
  46. data/app/events/decidim/proposals/collaborative_draft_access_requester_accepted_event.rb +8 -0
  47. data/app/events/decidim/proposals/collaborative_draft_access_requester_rejected_event.rb +8 -0
  48. data/app/events/decidim/proposals/collaborative_draft_withdrawn_event.rb +29 -0
  49. data/app/events/decidim/proposals/proposal_mentioned_event.rb +3 -1
  50. data/app/forms/decidim/proposals/accept_access_to_collaborative_draft_form.rb +10 -0
  51. data/app/forms/decidim/proposals/access_to_collaborative_draft_form.rb +35 -0
  52. data/app/forms/decidim/proposals/collaborative_draft_form.rb +18 -0
  53. data/app/forms/decidim/proposals/proposal_form.rb +2 -21
  54. data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb +36 -0
  55. data/app/forms/decidim/proposals/reject_access_to_collaborative_draft_form.rb +9 -0
  56. data/app/forms/decidim/proposals/request_access_to_collaborative_draft_form.rb +20 -0
  57. data/app/helpers/decidim/proposals/application_helper.rb +23 -8
  58. data/app/helpers/decidim/proposals/collaborative_draft_cells_helper.rb +48 -0
  59. data/app/helpers/decidim/proposals/collaborative_draft_helper.rb +29 -0
  60. data/app/helpers/decidim/proposals/map_helper.rb +3 -2
  61. data/app/helpers/decidim/proposals/proposal_cells_helper.rb +1 -1
  62. data/app/helpers/decidim/proposals/proposal_endorsements_helper.rb +15 -0
  63. data/app/helpers/decidim/proposals/proposal_wizard_helper.rb +52 -4
  64. data/app/models/decidim/proposals/collaborative_draft.rb +54 -0
  65. data/app/models/decidim/proposals/collaborative_draft_collaborator_request.rb +13 -0
  66. data/app/models/decidim/proposals/proposal.rb +9 -3
  67. data/app/permissions/decidim/proposals/permissions.rb +53 -9
  68. data/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb +2 -2
  69. data/app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb +17 -0
  70. data/app/presenters/decidim/proposals/collaborative_draft_presenter.rb +27 -0
  71. data/app/presenters/decidim/proposals/proposal_presenter.rb +24 -1
  72. data/app/queries/decidim/proposals/similar_collaborative_drafts.rb +52 -0
  73. data/app/queries/decidim/proposals/similar_proposals.rb +2 -4
  74. data/app/services/decidim/proposals/collaborative_draft_search.rb +61 -0
  75. data/app/services/decidim/proposals/diff_renderer.rb +58 -0
  76. data/app/services/decidim/proposals/proposal_search.rb +1 -1
  77. data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_proposals.html.erb +8 -3
  78. data/app/views/decidim/participatory_spaces/_highlighted_proposals.html.erb +8 -3
  79. data/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb +1 -1
  80. data/app/views/decidim/proposals/admin/proposals/_form.html.erb +4 -4
  81. data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb +5 -2
  82. data/app/views/decidim/proposals/admin/proposals/index.html.erb +1 -1
  83. data/app/views/decidim/proposals/admin/proposals/update_category.js.erb +4 -4
  84. data/app/views/decidim/proposals/admin/shared/_info_proposal.html.erb +2 -2
  85. data/app/views/decidim/proposals/collaborative_drafts/_accept_request_access_form.html.erb +8 -0
  86. data/app/views/decidim/proposals/collaborative_drafts/_collaborative_drafts.html.erb +16 -0
  87. data/app/views/decidim/proposals/collaborative_drafts/_collaborator_requests.html.erb +20 -0
  88. data/app/views/decidim/proposals/collaborative_drafts/_count.html.erb +1 -0
  89. data/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb +30 -0
  90. data/app/views/decidim/proposals/collaborative_drafts/_filters_small_view.html.erb +18 -0
  91. data/app/views/decidim/proposals/collaborative_drafts/_new_collaborative_draft_button.html.erb +11 -0
  92. data/app/views/decidim/proposals/collaborative_drafts/_reject_request_access_form.html.erb +10 -0
  93. data/app/views/decidim/proposals/collaborative_drafts/_request_access_form.html.erb +7 -0
  94. data/app/views/decidim/proposals/collaborative_drafts/compare.html.erb +19 -0
  95. data/app/views/decidim/proposals/collaborative_drafts/complete.html.erb +70 -0
  96. data/app/views/decidim/proposals/collaborative_drafts/edit.html.erb +57 -0
  97. data/app/views/decidim/proposals/collaborative_drafts/index.html.erb +23 -0
  98. data/app/views/decidim/proposals/collaborative_drafts/index.js.erb +10 -0
  99. data/app/views/decidim/proposals/collaborative_drafts/new.html.erb +28 -0
  100. data/app/views/decidim/proposals/collaborative_drafts/show.html.erb +136 -0
  101. data/app/views/decidim/proposals/proposal_endorsements/_identity.html.erb +1 -1
  102. data/app/views/decidim/proposals/proposal_endorsements/update_buttons_and_counters.js.erb +1 -1
  103. data/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb +5 -5
  104. data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +57 -0
  105. data/app/views/decidim/proposals/proposals/_endorsement_button.html.erb +3 -3
  106. data/app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb +1 -7
  107. data/app/views/decidim/proposals/proposals/_linked_proposals.html.erb +1 -1
  108. data/app/views/decidim/proposals/proposals/_proposal.html.erb +1 -1
  109. data/app/views/decidim/proposals/proposals/_proposal_preview.html.erb +1 -1
  110. data/app/views/decidim/proposals/proposals/_proposal_similar.html.erb +3 -3
  111. data/app/views/decidim/proposals/proposals/_vote_button.html.erb +4 -3
  112. data/app/views/decidim/proposals/proposals/_wizard_aside.html.erb +2 -2
  113. data/app/views/decidim/proposals/proposals/compare.html.erb +5 -3
  114. data/app/views/decidim/proposals/proposals/complete.html.erb +2 -57
  115. data/app/views/decidim/proposals/proposals/edit.html.erb +1 -34
  116. data/app/views/decidim/proposals/proposals/edit_draft.html.erb +1 -34
  117. data/app/views/decidim/proposals/proposals/index.html.erb +5 -1
  118. data/app/views/decidim/proposals/proposals/new.html.erb +13 -7
  119. data/app/views/decidim/proposals/proposals/preview.html.erb +2 -2
  120. data/app/views/decidim/proposals/proposals/show.html.erb +6 -5
  121. data/app/views/decidim/proposals/versions/_version.html.erb +20 -0
  122. data/app/views/decidim/proposals/versions/index.html.erb +34 -0
  123. data/app/views/decidim/proposals/versions/show.html.erb +39 -0
  124. data/config/locales/ca.yml +222 -17
  125. data/config/locales/en.yml +208 -3
  126. data/config/locales/es-PY.yml +208 -3
  127. data/config/locales/es.yml +281 -76
  128. data/config/locales/eu.yml +208 -3
  129. data/config/locales/fi.yml +335 -131
  130. data/config/locales/fr.yml +208 -3
  131. data/config/locales/gl.yml +208 -3
  132. data/config/locales/hu.yml +622 -0
  133. data/config/locales/it.yml +208 -3
  134. data/config/locales/nl.yml +208 -3
  135. data/config/locales/pl.yml +214 -3
  136. data/config/locales/pt-BR.yml +212 -7
  137. data/config/locales/pt.yml +208 -3
  138. data/config/locales/ru.yml +20 -19
  139. data/config/locales/sv.yml +313 -108
  140. data/config/locales/uk.yml +25 -24
  141. data/db/migrate/20180326091532_create_decidim_proposals_collaborative_drafts.rb +29 -0
  142. data/db/migrate/20180613151121_create_collaborative_draft_collaborator_requests.rb +12 -0
  143. data/db/migrate/20180711074134_add_counter_cache_coauthorships_to_collaborative_drafts.rb +7 -0
  144. data/db/migrate/20180711075004_remove_index_counter_cache_coauthorships_to_proposals.rb +7 -0
  145. data/lib/decidim/proposals/admin_engine.rb +1 -0
  146. data/lib/decidim/proposals/commentable_collaborative_draft.rb +38 -0
  147. data/lib/decidim/proposals/component.rb +69 -4
  148. data/lib/decidim/proposals/engine.rb +48 -2
  149. data/lib/decidim/proposals/proposal_serializer.rb +4 -3
  150. data/lib/decidim/proposals/test/factories.rb +74 -13
  151. data/lib/decidim/proposals/version.rb +1 -1
  152. data/lib/decidim/proposals.rb +1 -0
  153. metadata +94 -24
  154. data/app/cells/decidim/proposals/coauthorships_cell.rb +0 -40
  155. data/app/views/decidim/participatory_processes/participatory_process_groups/_proposal.html.erb +0 -1
  156. data/app/views/decidim/participatory_spaces/_proposal.html.erb +0 -1
@@ -4,12 +4,12 @@
4
4
  </div>
5
5
 
6
6
  <div class="card-section">
7
- <div class="row column">
8
- <%= form.text_field :title %>
7
+ <div class="row column hashtags__container">
8
+ <%= form.text_field :title, class: "js-hashtags", hashtaggable: true %>
9
9
  </div>
10
10
 
11
- <div class="row column">
12
- <%= form.text_area :body, rows: 10 %>
11
+ <div class="row column hashtags__container">
12
+ <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true %>
13
13
  </div>
14
14
 
15
15
  <% if component_settings.geocoding_enabled? %>
@@ -6,7 +6,7 @@
6
6
  <%= proposal.id %><br />
7
7
  </td>
8
8
  <td>
9
- <%= proposal.title %><br />
9
+ <%= present(proposal).title %><br />
10
10
  </td>
11
11
  <td>
12
12
  <% if proposal.category %>
@@ -57,7 +57,10 @@
57
57
 
58
58
  <% if allowed_to? :create, :proposal_answer %>
59
59
  <%= icon_link_to "comment-square", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>
60
- <% end %>
60
+ <% end %>
61
+
62
+ <%= resource_permissions_link(proposal) %>
63
+
61
64
  <%= icon_link_to "eye", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
62
65
  </td>
63
66
  </tr>
@@ -63,7 +63,7 @@
63
63
  </thead>
64
64
  <tbody>
65
65
  <% proposals.each do |proposal| %>
66
- <%= render partial: "proposal-tr", locals: {proposal: proposal} %>
66
+ <%= render partial: "proposal-tr", locals: { proposal: proposal } %>
67
67
  <% end %>
68
68
  </tbody>
69
69
  </table>
@@ -1,19 +1,19 @@
1
1
  <% if flash.now[:error].present? %>
2
2
  $("#js-form-recategorize-proposals #category_id").addClass("is-invalid-input")
3
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: {css: %q{alert}, text: flash.now[:error]}) %>").appendTo(".callout-wrapper");
3
+ $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
4
4
  <% end %>
5
5
 
6
6
  <% if flash.now[:alert].present? %>
7
7
  $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
8
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: {css: %q{warning}, text: flash.now[:alert]}) %>").appendTo(".callout-wrapper");
8
+ $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
9
9
  <% end %>
10
10
 
11
11
  <% if flash.now[:notice].present? %>
12
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: {css: %q{success}, text: flash.now[:notice]}) %>").appendTo(".callout-wrapper");
12
+ $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
13
13
 
14
14
  <% @proposal_ids.each do |id| %>
15
15
  $(".table-list [data-id='<%= id %>']")
16
- .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: {proposal: proposal_find(id)}) %>");
16
+ .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
17
17
  <% end %>
18
18
 
19
19
  $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
@@ -2,13 +2,13 @@
2
2
  <div class="card-divider">
3
3
  <h2 class="card-title">
4
4
  <%= link_to "#{t ".proposals"} > ", proposals_path %>
5
- <%= proposal.title %>
5
+ <%= present(proposal).title %>
6
6
  </h2>
7
7
  </div>
8
8
 
9
9
  <div class="card-section">
10
10
  <div class="row column">
11
- <strong><%= t ".body" %>: </strong><%= proposal.body %>
11
+ <strong><%= t ".body" %>: </strong> <%= present(proposal).body %>
12
12
  </div>
13
13
  <div class="row column">
14
14
  <strong><%= t ".created_at" %>: </strong> <%= l proposal.created_at, format: :decidim_short %>
@@ -0,0 +1,8 @@
1
+ <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
2
+ <%= decidim_form_for(@accept_request_form, url: request_accept_collaborative_draft_path(@collaborative_draft)) do |form| %>
3
+ <%= form.hidden_field :id, value: @collaborative_draft.id %>
4
+ <%= form.hidden_field :state, value: @collaborative_draft.state %>
5
+ <%= form.hidden_field :requester_user_id, value: requester.id %>
6
+ <%= form.submit accept_request_button_label, class: "button hollow secondary small", data: { disable: true } %>
7
+ <% end %>
8
+ <% end %>
@@ -0,0 +1,16 @@
1
+ <div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
2
+ <div class="column">
3
+ <%= order_selector available_orders, i18n_scope: "decidim.proposals.collaborative_drafts.orders" %>
4
+ </div>
5
+
6
+ <div class="column">
7
+ <%= render partial: "decidim/shared/results_per_page" %>
8
+ </div>
9
+ </div>
10
+
11
+ <div class="row small-up-1 medium-up-2 card-grid">
12
+ <% @collaborative_drafts.each do |draft| %>
13
+ <%= card_for draft, context: { label: true } %>
14
+ <% end %>
15
+ </div>
16
+ <%= decidim_paginate @collaborative_drafts, random_seed: random_seed %>
@@ -0,0 +1,20 @@
1
+ <% if @collaborative_draft.requesters.presence && allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
2
+ <div class="card extra">
3
+ <div class="definition-data__item">
4
+ <span class="definition-data__title">
5
+ <%= t("title", scope: "decidim.proposals.collaborative_drafts.requests.collaboration_requests") %>
6
+ </span>
7
+ </div>
8
+ <% @collaborative_draft.requesters.each do |requester| %>
9
+ <div class="definition-data__item expanded" id="request_<%= requester.id %>">
10
+ <%= cell "decidim/author", present(requester), options: { extra_classes: ["author-data--small"] }, has_actions: false %>
11
+
12
+ <div>
13
+ <%= render partial: "accept_request_access_form", locals: { requester: requester } %>
14
+
15
+ <%= render partial: "reject_request_access_form", locals: { requester: requester } %>
16
+ </div>
17
+ </div>
18
+ <% end %>
19
+ </div>
20
+ <% end %>
@@ -0,0 +1 @@
1
+ <%= t(".drafts_count", count: @collaborative_drafts.total_count) %>
@@ -0,0 +1,30 @@
1
+ <%= filter_form_for filter do |form| %>
2
+ <div class="filters__section">
3
+ <div class="filters__search">
4
+ <div class="input-group">
5
+ <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
6
+ <div class="input-group-button">
7
+ <button type="submit" class="button button--muted">
8
+ <%= icon "magnifying-glass", aria_label: t(".search") %>
9
+ </button>
10
+ </div>
11
+ </div>
12
+ </div>
13
+ </div>
14
+
15
+ <%= form.collection_radio_buttons :state, collaborative_drafts_states_collection, :first, :last, legend_title: t(".state") %>
16
+
17
+ <% if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any? %>
18
+ <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, legend_title: t(".related_to") %>
19
+ <% end %>
20
+
21
+ <% if current_participatory_space.has_subscopes? %>
22
+ <%= scopes_picker_filter form, :scope_id %>
23
+ <% end %>
24
+
25
+ <% if current_component.categories.any? %>
26
+ <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
27
+ <% end %>
28
+
29
+ <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
30
+ <% end %>
@@ -0,0 +1,18 @@
1
+ <div class="filters-controls hide-for-mediumlarge">
2
+ <button data-open="filter-box" class="filters-controls__trigger">
3
+ <%= t ".filter" %>
4
+ <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
5
+ </button>
6
+ </div>
7
+
8
+ <div class="reveal" id="filter-box" data-reveal>
9
+ <div class="reveal__header">
10
+ <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
11
+ <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
12
+ <span aria-hidden="true">&times;</span>
13
+ </button>
14
+ </div>
15
+ <div class="filters">
16
+ <%= render partial: "filters" %>
17
+ </div>
18
+ </div>
@@ -0,0 +1,11 @@
1
+ <% if current_settings.creation_enabled %>
2
+ <%= action_authorized_link_to :create, new_collaborative_draft_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_collaborative_draft_path } do %>
3
+ <%= t(".new_collaborative_draft") %>
4
+ <%= icon "plus" %>
5
+ <% end %>
6
+ <% else %>
7
+ <span class="title-action__action button small hollow disabled">
8
+ <%= t(".new_collaborative_draft") %>
9
+ <%= icon "plus" %>
10
+ </span>
11
+ <% end %>
@@ -0,0 +1,10 @@
1
+ <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
2
+ <%= decidim_form_for(@reject_request_form, url: request_reject_collaborative_draft_path(@collaborative_draft)) do |form| %>
3
+ <%= form.hidden_field :id, value: @collaborative_draft.id %>
4
+ <%= form.hidden_field :state, value: @collaborative_draft.state %>
5
+ <%= form.hidden_field :requester_user_id, value: requester.id %>
6
+ <%= button_tag type: "submit", data: { disable: true }, title: reject_request_button_label do %>
7
+ <%= icon "x", class: "icon--small muted ml-xs" %>
8
+ <% end %>
9
+ <% end %>
10
+ <% end %>
@@ -0,0 +1,7 @@
1
+ <% if allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
2
+ <%= decidim_form_for(@request_access_form, url: request_access_collaborative_draft_path(@collaborative_draft)) do |form| %>
3
+ <%= form.hidden_field :id, value: @collaborative_draft.id %>
4
+ <%= form.hidden_field :state, value: @collaborative_draft.state %>
5
+ <%= form.submit t(:request_access, scope: "decidim.proposals.collaborative_drafts.show"), class: "button expanded button--sc mt-s", data: { disable: true } %>
6
+ <% end %>
7
+ <% end %>
@@ -0,0 +1,19 @@
1
+ <div class="row">
2
+ <%= render partial: "decidim/proposals/proposals/wizard_aside" %>
3
+
4
+ <div class="columns large-6">
5
+ <%= render partial: "decidim/proposals/proposals/wizard_header", locals: {callout_step_help_text_class: "warning"} %>
6
+
7
+ <% if @similar_collaborative_drafts.presence %>
8
+ <div class="row small-up-1 card-grid">
9
+ <% @similar_collaborative_drafts.each do |collaborative_draft| %>
10
+ <%= card_for collaborative_draft %>
11
+ <% end %>
12
+ </div>
13
+ <% end %>
14
+ <div class="row column text-center">
15
+ <%= link_to t(".mine_is_different"), complete_collaborative_drafts_path(collaborative_draft: {title: @form.title, body: @form.body}), class: "button small" %>
16
+ </div>
17
+ </div>
18
+ <div class="columns large-3"></div>
19
+ </div>
@@ -0,0 +1,70 @@
1
+ <div class="row">
2
+ <%= render partial: "decidim/proposals/proposals/wizard_aside" %>
3
+
4
+ <div class="columns large-6">
5
+ <%= render partial: "decidim/proposals/proposals/wizard_header" %>
6
+
7
+ <div class="card">
8
+ <div class="card__content">
9
+ <%= decidim_form_for(@form) do |form| %>
10
+ <div class="field">
11
+ <%= form.text_field :title %>
12
+ </div>
13
+
14
+ <div class="field">
15
+ <%= form.text_area :body, rows: 10 %>
16
+ </div>
17
+
18
+ <% if component_settings.geocoding_enabled? %>
19
+ <div class="field">
20
+ <%= form.check_box :has_address, class: "has_address" %>
21
+ </div>
22
+ <div class="field" id="address_input">
23
+ <%= form.text_field :address %>
24
+ </div>
25
+ <% end %>
26
+
27
+ <% if @form.categories&.any? %>
28
+ <div class="field">
29
+ <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
30
+ </div>
31
+ <% end %>
32
+
33
+ <% if current_participatory_space.has_subscopes? %>
34
+ <div class="field">
35
+ <%= scopes_picker_field form, :scope_id %>
36
+ </div>
37
+ <% end %>
38
+
39
+ <% if current_user.user_groups.verified.any? %>
40
+ <div class="field">
41
+ <%= user_group_select_field form, :user_group_id %>
42
+ </div>
43
+ <% end %>
44
+
45
+ <% if component_settings.attachments_allowed? %>
46
+ <fieldset>
47
+ <legend><%= t(".attachment_legend") %></legend>
48
+ <%= form.fields_for :attachment, @form.attachment do |form| %>
49
+ <div class="field">
50
+ <%= form.text_field :title %>
51
+ </div>
52
+
53
+ <div class="field">
54
+ <%= form.upload :file, optional: false %>
55
+ </div>
56
+ <% end %>
57
+ </fieldset>
58
+ <% end %>
59
+
60
+ <div class="actions">
61
+ <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
62
+ </div>
63
+ <% end %>
64
+ </div>
65
+ </div>
66
+ </div>
67
+ <div class="columns large-3"></div>
68
+ </div>
69
+
70
+ <%= javascript_include_tag "decidim/proposals/add_proposal" %>
@@ -0,0 +1,57 @@
1
+ <div class="row columns">
2
+ <%= link_to :back, class: "muted-link" do %>
3
+ <%= icon "chevron-left", class: "icon--small" %>
4
+ <%= t(".back") %>
5
+ <% end %>
6
+ <h2 class="section-heading"><%= t(".title") %></h2>
7
+ </div>
8
+
9
+ <div class="row">
10
+ <div class="columns large-6 medium-centered">
11
+ <div class="card">
12
+ <% if translated_attribute(component_settings.new_proposal_help_text).present? %>
13
+ <%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.new_proposal_help_text } %>
14
+ <% end %>
15
+
16
+ <div class="card__content">
17
+ <%= decidim_form_for(@form) do |form| %>
18
+ <div class="field">
19
+ <%= form.text_field :title %>
20
+ </div>
21
+
22
+ <div class="field">
23
+ <%= form.text_area :body, rows: 10 %>
24
+ </div>
25
+
26
+ <% if component_settings.geocoding_enabled? %>
27
+ <div class="field">
28
+ <%= form.check_box :has_address, class: "has_address" %>
29
+ </div>
30
+
31
+ <div class="field" id="address_input">
32
+ <%= form.text_field :address %>
33
+ </div>
34
+ <% end %>
35
+
36
+ <% if @form.categories&.any? %>
37
+ <div class="field">
38
+ <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
39
+ </div>
40
+ <% end %>
41
+
42
+ <% if current_participatory_space.has_subscopes? %>
43
+ <div class="field">
44
+ <%= scopes_picker_field form, :scope_id %>
45
+ </div>
46
+ <% end %>
47
+
48
+ <div class="actions">
49
+ <%= form.submit t(".send"), class: "button expanded", data: { disable: true } %>
50
+ </div>
51
+ <% end %>
52
+ </div>
53
+ </div>
54
+ </div>
55
+ </div>
56
+
57
+ <%= javascript_include_tag "decidim/proposals/add_proposal" %>
@@ -0,0 +1,23 @@
1
+ <%= render partial: "decidim/shared/component_announcement" %>
2
+
3
+ <div class="row columns">
4
+ <div class="title-action">
5
+ <h2 id="drafts-count" class="title-action__title section-heading">
6
+ <%= render partial: "count" %>
7
+ </h2>
8
+ <%= render "new_collaborative_draft_button" %>
9
+ </div>
10
+ </div>
11
+ <div class="row">
12
+ <div class="columns mediumlarge-4 large-3">
13
+ <%= render partial: "filters_small_view" %>
14
+ <div class="card card--secondary show-for-mediumlarge">
15
+ <%= render partial: "filters" %>
16
+ </div>
17
+ </div>
18
+ <div id="collaborative_drafts" class="columns mediumlarge-8 large-9">
19
+ <%= render partial: "collaborative_drafts" %>
20
+ </div>
21
+ </div>
22
+ <%= javascript_include_tag "decidim/filters" %>
23
+ <%= javascript_include_tag "decidim/orders" %>
@@ -0,0 +1,10 @@
1
+ var $collaborative_drafts = $('#collaborative_drafts');
2
+ var $collaborativeDraftsCount = $('#drafts-count');
3
+ var $orderFilterInput = $('.order_filter');
4
+
5
+ $collaborative_drafts.html('<%= j(render partial: "collaborative_drafts").strip.html_safe %>');
6
+ $collaborativeDraftsCount.html('<%= j(render partial: "count").strip.html_safe %>');
7
+ $orderFilterInput.val('<%= order %>');
8
+
9
+ var $dropdownMenu = $('.dropdown.menu', $collaborative_drafts);
10
+ $dropdownMenu.foundation();
@@ -0,0 +1,28 @@
1
+ <div class="row">
2
+ <%= render partial: "decidim/proposals/proposals/wizard_aside" %>
3
+
4
+ <div class="columns large-6">
5
+ <%= render partial: "decidim/proposals/proposals/wizard_header" %>
6
+
7
+ <div class="card">
8
+ <div class="card__content">
9
+ <%= decidim_form_for(@form, url: compare_collaborative_drafts_path, method: :get) do |form| %>
10
+ <div class="field">
11
+ <%= form.text_field :title %>
12
+ </div>
13
+
14
+ <div class="field">
15
+ <%= form.text_area :body, rows: 10 %>
16
+ </div>
17
+
18
+ <div class="actions">
19
+ <%= form.submit t("decidim.proposals.collaborative_drafts.new.send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
20
+ </div>
21
+ <% end %>
22
+ </div>
23
+ </div>
24
+ </div>
25
+ <div class="columns large-3"></div>
26
+ </div>
27
+
28
+ <%= javascript_include_tag "decidim/proposals/add_proposal" %>
@@ -0,0 +1,136 @@
1
+ <% add_decidim_meta_tags({
2
+ description: @collaborative_draft.body,
3
+ title: @collaborative_draft.title,
4
+ url: collaborative_draft_url(@collaborative_draft.id)
5
+ }) %>
6
+
7
+ <% if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
8
+ <div class="row">
9
+ <div class="columns">
10
+ <div class="callout secondary"><%= t(".info-message").html_safe %></div>
11
+ </div>
12
+ </div>
13
+ <% end %>
14
+
15
+ <div class="row column view-header">
16
+ <%= link_to collaborative_drafts_path do %>
17
+ <%= icon "chevron-left", class: "icon--small" %>
18
+ <%= t(".back") %>
19
+ <% end %>
20
+
21
+ <h2 class="heading2">
22
+ <%= @collaborative_draft.title %>
23
+ </h2>
24
+
25
+ <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3) %>
26
+ </div>
27
+
28
+ <div class="row">
29
+ <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
30
+ <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
31
+ <div class="card text-center" id="collaborative_draft_publish">
32
+ <div class="card__content">
33
+ <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
34
+ <small>
35
+ <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
36
+ <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
37
+ </small>
38
+ </div>
39
+ </div>
40
+ <% end %>
41
+
42
+ <div class="card text-center">
43
+ <div class="card__content">
44
+ <% if @collaborative_draft.published? %>
45
+ <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
46
+ <% else %>
47
+ <div>
48
+ <strong class="text-large text-uppercase">
49
+ <%= t("version", scope:"decidim.proposals.collaborative_drafts.show", number: "#{@collaborative_draft.versions_count}") %>
50
+ </strong>
51
+ <small class="text-medium">
52
+ <%= t("of_versions", scope:"decidim.proposals.collaborative_drafts.show", number: "#{@collaborative_draft.versions_count}") %>
53
+ </small>
54
+ </div>
55
+
56
+ <div>
57
+ <span class="text-medium">
58
+ <%= link_to t("see_other_versions", scope:"decidim.proposals.collaborative_drafts.show"), collaborative_draft_versions_path(@collaborative_draft) %>
59
+ </span>
60
+ </div>
61
+ <% end %>
62
+
63
+ <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
64
+ <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button secondary hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
65
+ <% end %>
66
+
67
+ <%= render "request_access_form" %>
68
+
69
+ <% if @collaborative_draft.requesters.include? current_user %>
70
+ <button type="button" class="button secondary light expanded button--sc mt-s">
71
+ <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
72
+ </button>
73
+ <% end %>
74
+ </div>
75
+
76
+ <div class="card__status">
77
+ <ul class="card-data">
78
+ <li class="card-data__item authors_status">
79
+ <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
80
+ <%= icon("people", class: "icon--small") + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
81
+ <% end %>
82
+ </li>
83
+
84
+ <li class="card-data__item versions_status">
85
+ <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
86
+ <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
87
+ <%= icon("pencil", class: "icon--small") + " " + "#{@collaborative_draft.versions.count}" %>
88
+ <% end %>
89
+ <% end %>
90
+ </li>
91
+ <li class="card-data__item">
92
+ <%= link_to "#comments" do %>
93
+ <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
94
+ <%= icon("comment-square", class: "icon--small") + " " + "#{@collaborative_draft.comments.count}" %>
95
+ <% end %>
96
+ <% end %>
97
+ </li>
98
+ </ul>
99
+ </div>
100
+ </div>
101
+
102
+ <%= render partial: "collaborator_requests" %>
103
+
104
+ <%= resource_reference(@collaborative_draft) %>
105
+
106
+ <%= render partial: "decidim/shared/share_modal" %>
107
+ </div>
108
+
109
+ <div class="columns mediumlarge-8 mediumlarge-pull-4">
110
+ <div class="section">
111
+ <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
112
+
113
+ <%= simple_format @collaborative_draft.body %>
114
+
115
+ <% if component_settings.geocoding_enabled? %>
116
+ <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
117
+ <% end %>
118
+
119
+ <%= cell "decidim/tags", @collaborative_draft, context: {extra_classes: ["tags--collaborative-draft"]} %>
120
+ </div>
121
+ </div>
122
+ </div>
123
+
124
+ <%= attachments_for @collaborative_draft %>
125
+ <%= comments_for @collaborative_draft %>
126
+
127
+ <%= javascript_include_tag "decidim/proposals/social_share" %>
128
+ <%= stylesheet_link_tag "decidim/proposals/social_share" %>
129
+
130
+ <%=
131
+ render partial: "decidim/shared/flag_modal", locals: {
132
+ reportable: @collaborative_draft,
133
+ form: @report_form,
134
+ url: decidim.report_path(sgid: @collaborative_draft.to_sgid.to_s)
135
+ }
136
+ %>
@@ -1,5 +1,5 @@
1
1
  <li class="<%= selected ? "selected" : "" %>" data-method="<%= http_method.to_s.upcase %>" data-url="<%= current_endorsement_url %>">
2
- <%= card_for identity, context: {extra_classes: ["author-data--small"]} %>
2
+ <%= card_for identity, context: { extra_classes: ["author-data--small"] } %>
3
3
 
4
4
  <%= icon("circle-check", class: "icon--big #{selected ? '' : 'invisible'}") %>
5
5
  </li>
@@ -17,4 +17,4 @@ function update_identities_rows() {
17
17
  <% else %>
18
18
  $proposalEndorsementsRowButton.removeClass('success')
19
19
  <% end %>
20
- }
20
+ }
@@ -1,20 +1,20 @@
1
1
  var $proposalVotesCount = $('#proposal-<%= proposal.id %>-votes-count');
2
2
  var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');
3
3
 
4
- morphdom($proposalVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/votes_count', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
5
- morphdom($proposalVoteButton[0], '<%= j(render partial: 'decidim/proposals/proposals/vote_button', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
4
+ morphdom($proposalVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/votes_count", locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
5
+ morphdom($proposalVoteButton[0], '<%= j(render partial: "decidim/proposals/proposals/vote_button", locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
6
6
 
7
7
  <% if vote_limit_enabled? %>
8
8
  var $remainingVotesCount = $('#remaining-votes-count');
9
9
  var $notVotedButtons = $('.card__button.button').not('.success');
10
10
 
11
- morphdom($remainingVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/remaining_votes_count').strip.html_safe %>');
11
+ morphdom($remainingVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_count").strip.html_safe %>');
12
12
 
13
13
  <% if remaining_votes_count_for(current_user) == 0 %>
14
14
  $notVotedButtons.attr('disabled', true);
15
- $notVotedButtons.val('<%= t('decidim.proposals.proposals.vote_button.no_votes_remaining') %>');
15
+ $notVotedButtons.val('<%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %>');
16
16
  <% else %>
17
17
  $notVotedButtons.attr('disabled', false);
18
- $notVotedButtons.val('<%= t('decidim.proposals.proposals.vote_button.vote') %>');
18
+ $notVotedButtons.val('<%= t("decidim.proposals.proposals.vote_button.vote") %>');
19
19
  <% end %>
20
20
  <% end %>