decidim-consultations 0.18.1 → 0.19.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (84) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/config/decidim_consultations_manifest.css +0 -1
  3. data/app/assets/config/decidim_consultations_manifest.js +1 -1
  4. data/app/assets/javascripts/decidim/consultations/utils_multiple.js +21 -0
  5. data/app/assets/javascripts/decidim/consultations/vote_dialog.js +13 -0
  6. data/app/cells/decidim/consultations/consultation_m/data.erb +2 -2
  7. data/app/cells/decidim/consultations/content_blocks/highlighted_consultations_cell.rb +1 -0
  8. data/app/commands/decidim/consultations/admin/create_consultation.rb +2 -0
  9. data/app/commands/decidim/consultations/admin/create_question.rb +2 -0
  10. data/app/commands/decidim/consultations/admin/create_response.rb +1 -0
  11. data/app/commands/decidim/consultations/admin/update_consultation.rb +1 -0
  12. data/app/commands/decidim/consultations/admin/update_question.rb +1 -0
  13. data/app/commands/decidim/consultations/admin/update_question_configuration.rb +55 -0
  14. data/app/commands/decidim/consultations/admin/update_response.rb +1 -0
  15. data/app/commands/decidim/consultations/multiple_vote_question.rb +47 -0
  16. data/app/controllers/concerns/decidim/consultations/admin/question_admin.rb +1 -0
  17. data/app/controllers/concerns/decidim/consultations/needs_question.rb +24 -2
  18. data/app/controllers/concerns/decidim/consultations/orderable.rb +1 -21
  19. data/app/controllers/decidim/consultations/admin/consultations_controller.rb +7 -1
  20. data/app/controllers/decidim/consultations/admin/question_configuration_controller.rb +54 -0
  21. data/app/controllers/decidim/consultations/admin/question_permissions_controller.rb +36 -0
  22. data/app/controllers/decidim/consultations/admin/questions_controller.rb +1 -0
  23. data/app/controllers/decidim/consultations/authorization_vote_modals_controller.rb +26 -0
  24. data/app/controllers/decidim/consultations/consultations_controller.rb +1 -1
  25. data/app/controllers/decidim/consultations/question_multiple_votes_controller.rb +39 -0
  26. data/app/controllers/decidim/consultations/question_votes_controller.rb +1 -1
  27. data/app/forms/decidim/consultations/admin/question_configuration_form.rb +27 -0
  28. data/app/forms/decidim/consultations/multi_vote_form.rb +41 -0
  29. data/app/forms/decidim/consultations/vote_form.rb +1 -0
  30. data/app/helpers/decidim/consultations/questions_helper.rb +25 -4
  31. data/app/models/decidim/consultation.rb +9 -7
  32. data/app/models/decidim/consultations/question.rb +26 -7
  33. data/app/models/decidim/consultations/vote.rb +11 -1
  34. data/app/permissions/decidim/consultations/admin/permissions.rb +1 -1
  35. data/app/permissions/decidim/consultations/permissions.rb +10 -0
  36. data/app/views/decidim/consultations/admin/consultations/edit.html.erb +4 -1
  37. data/app/views/decidim/consultations/admin/consultations/index.html.erb +2 -2
  38. data/app/views/decidim/consultations/admin/consultations/results.html.erb +42 -0
  39. data/app/views/decidim/consultations/admin/question_configuration/_form.html.erb +19 -0
  40. data/app/views/decidim/consultations/admin/question_configuration/edit.html.erb +12 -0
  41. data/app/views/decidim/consultations/admin/questions/edit.html.erb +1 -0
  42. data/app/views/decidim/consultations/admin/questions/index.html.erb +6 -2
  43. data/app/views/decidim/consultations/consultations/_consultations.html.erb +1 -1
  44. data/app/views/decidim/consultations/consultations/_highlighted_questions.html.erb +7 -5
  45. data/app/views/decidim/consultations/question_multiple_votes/_form.html.erb +14 -0
  46. data/app/views/decidim/consultations/question_multiple_votes/_results_rules.html.erb +14 -0
  47. data/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb +29 -0
  48. data/app/views/decidim/consultations/question_multiple_votes/show.html.erb +36 -0
  49. data/app/views/decidim/consultations/question_votes/update_vote_button.js.erb +9 -0
  50. data/app/views/decidim/consultations/questions/_results.html.erb +4 -0
  51. data/app/views/decidim/consultations/questions/_vote_button.html.erb +29 -4
  52. data/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb +1 -0
  53. data/app/views/decidim/consultations/questions/show.html.erb +1 -1
  54. data/app/views/layouts/decidim/_question_header.html.erb +2 -14
  55. data/app/views/layouts/decidim/_question_header_buttons.html.erb +11 -0
  56. data/app/views/layouts/decidim/admin/consultation.html.erb +4 -0
  57. data/app/views/layouts/decidim/admin/question.html.erb +66 -44
  58. data/app/views/layouts/decidim/question.html.erb +3 -3
  59. data/app/views/layouts/decidim/question_multivote.html.erb +9 -0
  60. data/config/locales/ar.yml +8 -0
  61. data/config/locales/ca.yml +51 -0
  62. data/config/locales/cs.yml +51 -0
  63. data/config/locales/en.yml +51 -0
  64. data/config/locales/es-MX.yml +13 -0
  65. data/config/locales/es-PY.yml +13 -0
  66. data/config/locales/es.yml +51 -0
  67. data/config/locales/fi-plain.yml +51 -0
  68. data/config/locales/fi.yml +51 -0
  69. data/config/locales/fr.yml +50 -0
  70. data/config/locales/hu.yml +51 -0
  71. data/config/locales/it.yml +15 -0
  72. data/config/locales/nl.yml +52 -1
  73. data/config/locales/sv.yml +9 -0
  74. data/config/locales/tr-TR.yml +5 -0
  75. data/db/migrate/20190702162755_add_options_to_decidim_consultations_questions.rb +8 -0
  76. data/db/migrate/20190710121122_add_free_instructions_field_to_consultations_questions.rb +7 -0
  77. data/lib/decidim/consultations/admin_engine.rb +3 -0
  78. data/lib/decidim/consultations/engine.rb +4 -0
  79. data/lib/decidim/consultations/participatory_space.rb +5 -0
  80. data/lib/decidim/consultations/test/factories.rb +5 -0
  81. data/lib/decidim/consultations/version.rb +1 -1
  82. metadata +29 -11
  83. data/app/assets/javascripts/decidim/consultations/social_share.js +0 -2
  84. data/app/assets/stylesheets/decidim/consultations/social_share.css.scss +0 -18
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  module Consultations
5
5
  def self.version
6
- "0.18.1"
6
+ "0.19.0"
7
7
  end
8
8
  end
9
9
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-consultations
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.1
4
+ version: 0.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juan Salvador Perez Garcia
@@ -16,56 +16,56 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.18.1
19
+ version: 0.19.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.18.1
26
+ version: 0.19.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: decidim-comments
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.18.1
33
+ version: 0.19.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.18.1
40
+ version: 0.19.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: decidim-core
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 0.18.1
47
+ version: 0.19.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 0.18.1
54
+ version: 0.19.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: decidim-dev
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 0.18.1
61
+ version: 0.19.0
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 0.18.1
68
+ version: 0.19.0
69
69
  description: Extends Decidim adding a first level public consultation component
70
70
  email:
71
71
  - jsperezg@gmail.com
@@ -80,8 +80,8 @@ files:
80
80
  - app/assets/images/decidim/consultations/icon.svg
81
81
  - app/assets/images/decidim/consultations/icon2.svg
82
82
  - app/assets/javascripts/decidim/consultations/show_more.js.es6
83
- - app/assets/javascripts/decidim/consultations/social_share.js
84
83
  - app/assets/javascripts/decidim/consultations/utils.js.es6
84
+ - app/assets/javascripts/decidim/consultations/utils_multiple.js
85
85
  - app/assets/javascripts/decidim/consultations/vote_dialog.js
86
86
  - app/assets/stylesheets/decidim/consultations/_question.scss
87
87
  - app/assets/stylesheets/decidim/consultations/_stats.scss
@@ -98,7 +98,6 @@ files:
98
98
  - app/assets/stylesheets/decidim/consultations/consultations/_consultations_nav.scss
99
99
  - app/assets/stylesheets/decidim/consultations/consultations/introductory_image.scss
100
100
  - app/assets/stylesheets/decidim/consultations/highlighted-content-banner.css.scss
101
- - app/assets/stylesheets/decidim/consultations/social_share.css.scss
102
101
  - app/cells/decidim/consultation_activity_cell.rb
103
102
  - app/cells/decidim/consultations/consultation_cell.rb
104
103
  - app/cells/decidim/consultations/consultation_m/data.erb
@@ -120,7 +119,9 @@ files:
120
119
  - app/commands/decidim/consultations/admin/unpublish_question.rb
121
120
  - app/commands/decidim/consultations/admin/update_consultation.rb
122
121
  - app/commands/decidim/consultations/admin/update_question.rb
122
+ - app/commands/decidim/consultations/admin/update_question_configuration.rb
123
123
  - app/commands/decidim/consultations/admin/update_response.rb
124
+ - app/commands/decidim/consultations/multiple_vote_question.rb
124
125
  - app/commands/decidim/consultations/unvote_question.rb
125
126
  - app/commands/decidim/consultations/vote_question.rb
126
127
  - app/constraints/decidim/consultations/current_component.rb
@@ -138,18 +139,24 @@ files:
138
139
  - app/controllers/decidim/consultations/admin/consultation_results_publications_controller.rb
139
140
  - app/controllers/decidim/consultations/admin/consultations_controller.rb
140
141
  - app/controllers/decidim/consultations/admin/question_attachments_controller.rb
142
+ - app/controllers/decidim/consultations/admin/question_configuration_controller.rb
143
+ - app/controllers/decidim/consultations/admin/question_permissions_controller.rb
141
144
  - app/controllers/decidim/consultations/admin/question_publications_controller.rb
142
145
  - app/controllers/decidim/consultations/admin/questions_controller.rb
143
146
  - app/controllers/decidim/consultations/admin/responses_controller.rb
144
147
  - app/controllers/decidim/consultations/application_controller.rb
148
+ - app/controllers/decidim/consultations/authorization_vote_modals_controller.rb
145
149
  - app/controllers/decidim/consultations/consultation_widgets_controller.rb
146
150
  - app/controllers/decidim/consultations/consultations_controller.rb
151
+ - app/controllers/decidim/consultations/question_multiple_votes_controller.rb
147
152
  - app/controllers/decidim/consultations/question_votes_controller.rb
148
153
  - app/controllers/decidim/consultations/question_widgets_controller.rb
149
154
  - app/controllers/decidim/consultations/questions_controller.rb
150
155
  - app/forms/decidim/consultations/admin/consultation_form.rb
156
+ - app/forms/decidim/consultations/admin/question_configuration_form.rb
151
157
  - app/forms/decidim/consultations/admin/question_form.rb
152
158
  - app/forms/decidim/consultations/admin/response_form.rb
159
+ - app/forms/decidim/consultations/multi_vote_form.rb
153
160
  - app/forms/decidim/consultations/vote_form.rb
154
161
  - app/helpers/decidim/consultations/admin/consultations_helper.rb
155
162
  - app/helpers/decidim/consultations/admin/questions_helper.rb
@@ -175,6 +182,9 @@ files:
175
182
  - app/views/decidim/consultations/admin/consultations/edit.html.erb
176
183
  - app/views/decidim/consultations/admin/consultations/index.html.erb
177
184
  - app/views/decidim/consultations/admin/consultations/new.html.erb
185
+ - app/views/decidim/consultations/admin/consultations/results.html.erb
186
+ - app/views/decidim/consultations/admin/question_configuration/_form.html.erb
187
+ - app/views/decidim/consultations/admin/question_configuration/edit.html.erb
178
188
  - app/views/decidim/consultations/admin/questions/_form.html.erb
179
189
  - app/views/decidim/consultations/admin/questions/edit.html.erb
180
190
  - app/views/decidim/consultations/admin/questions/index.html.erb
@@ -196,6 +206,10 @@ files:
196
206
  - app/views/decidim/consultations/consultations/index.html.erb
197
207
  - app/views/decidim/consultations/consultations/index.js.erb
198
208
  - app/views/decidim/consultations/consultations/show.html.erb
209
+ - app/views/decidim/consultations/question_multiple_votes/_form.html.erb
210
+ - app/views/decidim/consultations/question_multiple_votes/_results_rules.html.erb
211
+ - app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb
212
+ - app/views/decidim/consultations/question_multiple_votes/show.html.erb
199
213
  - app/views/decidim/consultations/question_votes/update_vote_button.js.erb
200
214
  - app/views/decidim/consultations/question_widgets/show.html.erb
201
215
  - app/views/decidim/consultations/questions/_results.html.erb
@@ -210,12 +224,14 @@ files:
210
224
  - app/views/layouts/decidim/_consultation_voting_data.html.erb
211
225
  - app/views/layouts/decidim/_question_components.html.erb
212
226
  - app/views/layouts/decidim/_question_header.html.erb
227
+ - app/views/layouts/decidim/_question_header_buttons.html.erb
213
228
  - app/views/layouts/decidim/admin/consultation.html.erb
214
229
  - app/views/layouts/decidim/admin/consultations.html.erb
215
230
  - app/views/layouts/decidim/admin/question.html.erb
216
231
  - app/views/layouts/decidim/consultation.html.erb
217
232
  - app/views/layouts/decidim/consultation_choose.html.erb
218
233
  - app/views/layouts/decidim/question.html.erb
234
+ - app/views/layouts/decidim/question_multivote.html.erb
219
235
  - config/locales/ar-SA.yml
220
236
  - config/locales/ar.yml
221
237
  - config/locales/ca.yml
@@ -273,6 +289,8 @@ files:
273
289
  - db/migrate/20180320100658_add_introductory_image_to_decidim_consultations.rb
274
290
  - db/migrate/20180712111146_remove_unused_search_indexs.rb
275
291
  - db/migrate/20181003082318_fix_user_groups_ids_on_consultations.rb
292
+ - db/migrate/20190702162755_add_options_to_decidim_consultations_questions.rb
293
+ - db/migrate/20190710121122_add_free_instructions_field_to_consultations_questions.rb
276
294
  - db/seeds/Exampledocument.pdf
277
295
  - db/seeds/city.jpeg
278
296
  - db/seeds/city2.jpeg
@@ -1,2 +0,0 @@
1
- // = require social-share-button
2
- // = require_self
@@ -1,18 +0,0 @@
1
- $size: 45px;
2
-
3
- .share-link:hover{
4
- text-decoration: underline;
5
- cursor: pointer;
6
- }
7
-
8
- .social-share-button{
9
- display: inline-block;
10
- vertical-align: top;
11
-
12
- .ssb-icon{
13
- margin-right: 5px;
14
- background-size: $size $size;
15
- height: $size;
16
- width: $size;
17
- }
18
- }