decidim-assemblies 0.27.10 → 0.28.0.rc4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (198) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/assemblies/assemblies/show.erb +16 -0
  3. data/app/cells/decidim/assemblies/assemblies_cell.rb +24 -0
  4. data/app/cells/decidim/assemblies/assembly_cell.rb +7 -2
  5. data/app/cells/decidim/assemblies/assembly_dropdown_metadata_cell.rb +19 -0
  6. data/app/cells/decidim/assemblies/assembly_g_cell.rb +23 -0
  7. data/app/cells/decidim/assemblies/assembly_member/data.erb +19 -0
  8. data/app/cells/decidim/assemblies/assembly_member/name_and_position.erb +11 -0
  9. data/app/cells/decidim/assemblies/assembly_member/show.erb +8 -52
  10. data/app/cells/decidim/assemblies/assembly_metadata_g_cell.rb +46 -0
  11. data/app/cells/decidim/assemblies/assembly_s_cell.rb +15 -0
  12. data/app/cells/decidim/assemblies/content_block_cell.rb +21 -0
  13. data/app/cells/decidim/assemblies/content_blocks/children_assemblies_cell.rb +27 -0
  14. data/app/cells/decidim/assemblies/content_blocks/dates_metadata_cell.rb +23 -0
  15. data/app/cells/decidim/assemblies/content_blocks/extra_data_cell.rb +39 -0
  16. data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb +15 -23
  17. data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form/show.erb +1 -1
  18. data/app/cells/decidim/assemblies/content_blocks/main_data_cell.rb +52 -0
  19. data/app/cells/decidim/assemblies/content_blocks/metadata_cell.rb +23 -0
  20. data/app/cells/decidim/assemblies/content_blocks/related_assemblies/content.erb +1 -0
  21. data/app/cells/decidim/assemblies/content_blocks/related_assemblies_cell.rb +34 -0
  22. data/app/cells/decidim/assemblies/content_blocks/stats_cell.rb +15 -0
  23. data/app/commands/decidim/assemblies/admin/copy_assembly.rb +2 -2
  24. data/app/commands/decidim/assemblies/admin/create_assemblies_type.rb +1 -1
  25. data/app/commands/decidim/assemblies/admin/create_assembly.rb +2 -1
  26. data/app/commands/decidim/assemblies/admin/create_assembly_member.rb +3 -3
  27. data/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb +1 -1
  28. data/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb +1 -1
  29. data/app/commands/decidim/assemblies/admin/import_assembly.rb +1 -1
  30. data/app/commands/decidim/assemblies/admin/update_assemblies_type.rb +1 -1
  31. data/app/commands/decidim/assemblies/admin/update_assembly.rb +1 -1
  32. data/app/commands/decidim/assemblies/admin/update_assembly_member.rb +1 -1
  33. data/app/constraints/decidim/assemblies/current_assembly.rb +1 -1
  34. data/app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb +1 -1
  35. data/app/controllers/concerns/decidim/assemblies/admin/assembly_members/filterable.rb +39 -0
  36. data/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb +36 -0
  37. data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +1 -0
  38. data/app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb +1 -1
  39. data/app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb +5 -0
  40. data/app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb +5 -0
  41. data/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb +2 -0
  42. data/app/controllers/decidim/assemblies/admin/assembly_landing_page_content_blocks_controller.rb +35 -0
  43. data/app/controllers/decidim/assemblies/admin/assembly_landing_page_controller.rb +37 -0
  44. data/app/controllers/decidim/assemblies/admin/assembly_members_controller.rb +2 -6
  45. data/app/controllers/decidim/assemblies/admin/assembly_publications_controller.rb +9 -29
  46. data/app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb +8 -91
  47. data/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb +1 -1
  48. data/app/controllers/decidim/assemblies/assemblies_controller.rb +12 -7
  49. data/app/controllers/decidim/assemblies/assembly_members_controller.rb +2 -0
  50. data/app/events/decidim/assemblies/create_assembly_member_event.rb +1 -1
  51. data/app/events/decidim/role_assigned_to_assembly_event.rb +11 -6
  52. data/app/forms/decidim/assemblies/admin/assembly_copy_form.rb +1 -1
  53. data/app/forms/decidim/assemblies/admin/assembly_form.rb +1 -1
  54. data/app/forms/decidim/assemblies/admin/assembly_import_form.rb +1 -1
  55. data/app/forms/decidim/assemblies/admin/assembly_user_role_form.rb +2 -18
  56. data/app/helpers/decidim/assemblies/admin/assembly_members_helper.rb +11 -0
  57. data/app/helpers/decidim/assemblies/application_helper.rb +12 -0
  58. data/app/helpers/decidim/assemblies/assemblies_helper.rb +21 -19
  59. data/app/helpers/decidim/assemblies/filter_assemblies_helper.rb +15 -30
  60. data/app/models/decidim/assembly.rb +6 -5
  61. data/app/models/decidim/assembly_user_role.rb +5 -33
  62. data/app/packs/entrypoints/decidim_assemblies.js +0 -1
  63. data/app/packs/src/decidim/assemblies/admin/assemblies.js +2 -2
  64. data/app/packs/src/decidim/assemblies/orgchart.js +0 -701
  65. data/app/permissions/decidim/assemblies/permissions.rb +14 -27
  66. data/app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb +2 -2
  67. data/app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb +2 -2
  68. data/app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb +2 -2
  69. data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb +2 -2
  70. data/app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb +2 -2
  71. data/app/presenters/decidim/assemblies/assembly_presenter.rb +38 -0
  72. data/app/presenters/decidim/assemblies/assembly_stats_presenter.rb +2 -41
  73. data/app/presenters/decidim/assembly_member_presenter.rb +18 -4
  74. data/app/queries/decidim/assemblies/admin/admin_users.rb +1 -1
  75. data/app/queries/decidim/assemblies/assemblies_with_user_role.rb +2 -2
  76. data/app/serializers/decidim/assemblies/assembly_importer.rb +3 -3
  77. data/app/serializers/decidim/assemblies/assembly_serializer.rb +1 -1
  78. data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb +218 -176
  79. data/app/views/decidim/assemblies/admin/assemblies/edit.html.erb +25 -11
  80. data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +105 -115
  81. data/app/views/decidim/assemblies/admin/assemblies/new.html.erb +16 -9
  82. data/app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb +6 -8
  83. data/app/views/decidim/assemblies/admin/assemblies_types/edit.html.erb +11 -5
  84. data/app/views/decidim/assemblies/admin/assemblies_types/index.html.erb +34 -35
  85. data/app/views/decidim/assemblies/admin/assemblies_types/new.html.erb +16 -6
  86. data/app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb +12 -20
  87. data/app/views/decidim/assemblies/admin/assembly_copies/new.html.erb +17 -5
  88. data/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb +28 -37
  89. data/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb +17 -5
  90. data/app/views/decidim/assemblies/admin/assembly_members/_form.html.erb +45 -49
  91. data/app/views/decidim/assemblies/admin/assembly_members/edit.html.erb +17 -6
  92. data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb +51 -88
  93. data/app/views/decidim/assemblies/admin/assembly_members/new.html.erb +17 -6
  94. data/app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb +14 -18
  95. data/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb +17 -6
  96. data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb +54 -55
  97. data/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb +17 -6
  98. data/app/views/decidim/assemblies/assemblies/_collection.html.erb +7 -0
  99. data/app/views/decidim/assemblies/assemblies/index.html.erb +20 -19
  100. data/app/views/decidim/assemblies/assemblies/index.js.erb +1 -8
  101. data/app/views/decidim/assemblies/assemblies/show.html.erb +17 -207
  102. data/app/views/decidim/assemblies/assembly_members/index.html.erb +7 -5
  103. data/app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb +6 -9
  104. data/app/views/layouts/decidim/admin/_manage_assemblies.html.erb +36 -0
  105. data/app/views/layouts/decidim/admin/assemblies.html.erb +13 -11
  106. data/app/views/layouts/decidim/admin/assemblies_imports.html.erb +9 -0
  107. data/app/views/layouts/decidim/admin/assemblies_types.html.erb +17 -0
  108. data/app/views/layouts/decidim/admin/assembly.html.erb +12 -13
  109. data/app/views/layouts/decidim/assembly.html.erb +7 -14
  110. data/config/locales/ar.yml +7 -68
  111. data/config/locales/bg.yml +0 -466
  112. data/config/locales/ca.yml +62 -71
  113. data/config/locales/cs.yml +59 -66
  114. data/config/locales/de.yml +60 -69
  115. data/config/locales/el.yml +11 -61
  116. data/config/locales/en.yml +57 -66
  117. data/config/locales/es-MX.yml +57 -66
  118. data/config/locales/es-PY.yml +57 -66
  119. data/config/locales/es.yml +63 -72
  120. data/config/locales/eu.yml +57 -70
  121. data/config/locales/fi-plain.yml +58 -67
  122. data/config/locales/fi.yml +57 -66
  123. data/config/locales/fr-CA.yml +57 -66
  124. data/config/locales/fr.yml +57 -66
  125. data/config/locales/ga-IE.yml +4 -15
  126. data/config/locales/gl.yml +4 -62
  127. data/config/locales/hu.yml +33 -65
  128. data/config/locales/id-ID.yml +6 -47
  129. data/config/locales/is-IS.yml +5 -40
  130. data/config/locales/it.yml +5 -62
  131. data/config/locales/ja.yml +51 -66
  132. data/config/locales/kaa.yml +0 -8
  133. data/config/locales/ko.yml +0 -92
  134. data/config/locales/lb.yml +5 -61
  135. data/config/locales/lt.yml +40 -63
  136. data/config/locales/lv.yml +5 -57
  137. data/config/locales/nl.yml +4 -62
  138. data/config/locales/no.yml +5 -62
  139. data/config/locales/pl.yml +3 -93
  140. data/config/locales/pt-BR.yml +77 -132
  141. data/config/locales/pt.yml +5 -62
  142. data/config/locales/ro-RO.yml +20 -63
  143. data/config/locales/ru.yml +4 -44
  144. data/config/locales/sk.yml +0 -26
  145. data/config/locales/sl.yml +5 -48
  146. data/config/locales/sq-AL.yml +0 -364
  147. data/config/locales/sr-CS.yml +0 -5
  148. data/config/locales/sv.yml +132 -193
  149. data/config/locales/tr-TR.yml +8 -69
  150. data/config/locales/uk.yml +4 -44
  151. data/config/locales/zh-CN.yml +5 -60
  152. data/config/locales/zh-TW.yml +7 -63
  153. data/db/migrate/20200108123050_migrate_decidim_assembly_types.rb +1 -1
  154. data/lib/decidim/api/assemblies_type_type.rb +1 -1
  155. data/lib/decidim/api/assembly_member_type.rb +1 -1
  156. data/lib/decidim/api/assembly_type.rb +1 -1
  157. data/lib/decidim/assemblies/admin_engine.rb +21 -126
  158. data/lib/decidim/assemblies/content_blocks/registry_manager.rb +184 -0
  159. data/lib/decidim/assemblies/engine.rb +15 -21
  160. data/lib/decidim/assemblies/menu.rb +161 -0
  161. data/lib/decidim/assemblies/participatory_space.rb +7 -229
  162. data/lib/decidim/assemblies/query_extensions.rb +6 -6
  163. data/lib/decidim/assemblies/seeds.rb +161 -0
  164. data/lib/decidim/assemblies/test/factories.rb +47 -55
  165. data/lib/decidim/assemblies/version.rb +1 -1
  166. metadata +54 -51
  167. data/app/cells/decidim/assemblies/assembly_m/footer.erb +0 -15
  168. data/app/cells/decidim/assemblies/assembly_m/tags.erb +0 -1
  169. data/app/cells/decidim/assemblies/assembly_m_cell.rb +0 -77
  170. data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb +0 -30
  171. data/app/commands/decidim/assemblies/admin/create_assembly_admin.rb +0 -54
  172. data/app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb +0 -58
  173. data/app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb +0 -22
  174. data/app/commands/decidim/assemblies/admin/publish_assembly.rb +0 -39
  175. data/app/commands/decidim/assemblies/admin/unpublish_assembly.rb +0 -39
  176. data/app/commands/decidim/assemblies/admin/update_assemblies_setting.rb +0 -46
  177. data/app/commands/decidim/assemblies/admin/update_assembly_admin.rb +0 -53
  178. data/app/controllers/decidim/assemblies/admin/assemblies_settings_controller.rb +0 -49
  179. data/app/controllers/decidim/assemblies/widgets_controller.rb +0 -33
  180. data/app/forms/decidim/assemblies/admin/assemblies_setting_form.rb +0 -14
  181. data/app/models/decidim/assemblies_setting.rb +0 -17
  182. data/app/queries/decidim/assemblies/admin/assembly_members.rb +0 -56
  183. data/app/views/decidim/assemblies/_filter_by_type.html.erb +0 -19
  184. data/app/views/decidim/assemblies/admin/assemblies_settings/_form.html.erb +0 -10
  185. data/app/views/decidim/assemblies/admin/assemblies_settings/edit.html.erb +0 -7
  186. data/app/views/decidim/assemblies/assemblies/_count.html.erb +0 -1
  187. data/app/views/decidim/assemblies/assemblies/_nav_breadcumb.html.erb +0 -11
  188. data/app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb +0 -15
  189. data/app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb +0 -27
  190. data/app/views/layouts/decidim/_assembly_header.html.erb +0 -27
  191. data/app/views/layouts/decidim/_assembly_navigation.html.erb +0 -24
  192. data/app/views/layouts/decidim/admin/assembly_members.html.erb +0 -18
  193. data/config/locales/he-IL.yml +0 -110
  194. data/db/seeds/Exampledocument.pdf +0 -0
  195. data/db/seeds/city.jpeg +0 -0
  196. data/db/seeds/city2.jpeg +0 -0
  197. data/db/seeds/homepage_image.jpg +0 -0
  198. data/decidim-assemblies.gemspec +0 -32
@@ -1,9 +1,9 @@
1
1
  <% add_decidim_meta_tags({
2
- image_url: current_participatory_space.attached_uploader(:hero_image).path,
3
- description: translated_attribute(current_participatory_space.short_description),
4
- url: assembly_url(current_participatory_space),
5
- twitter_handler: current_organization.twitter_handler
6
- }) %>
2
+ image_url: current_participatory_space.attached_uploader(:hero_image).path,
3
+ description: translated_attribute(current_participatory_space.short_description),
4
+ url: assembly_url(current_participatory_space),
5
+ twitter_handler: current_organization.twitter_handler
6
+ }) %>
7
7
 
8
8
  <%
9
9
  edit_link(
@@ -14,213 +14,23 @@ edit_link(
14
14
  )
15
15
  %>
16
16
 
17
- <%= participatory_space_floating_help %>
18
-
19
17
  <% if current_participatory_space.private_space? %>
20
- <%= render partial: "decidim/shared/private_participatory_space",
21
- locals: { text: t("private_space", scope: "decidim.assemblies.show") } %>
18
+ <section class="participatory-space__block-reference alert">
19
+ <%= t("private_space", scope: "decidim.assemblies.show") %>
20
+ </section>
22
21
  <% end %>
23
22
 
24
- <%= cell("decidim/announcement", current_participatory_space.announcement) %>
25
-
26
- <div class="row column">
27
- <% if current_participatory_space.parent.present? %>
28
- <div class="row">
29
- <div class="small-12 columns">
30
- <%= render partial: "decidim/assemblies/assemblies/nav_breadcumb",
31
- locals: { assemblies: current_participatory_space.ancestors.to_a } %>
32
- </div>
33
- </div>
34
- <% end %>
35
- <div class="row">
36
- <div class="columns medium-7 mediumlarge-8">
37
- <div class="section">
38
- <h2 class="show-for-sr"><%= t(".title") %></h2>
39
- <div class="lead">
40
- <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.short_description) %>
41
- </div>
42
- <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.description) %>
43
-
44
- <% if current_participatory_space.private_space? %>
45
- <%= assembly_features(current_participatory_space) %>
46
- <% end %>
47
- </div>
48
-
49
- <% if translated_attribute(current_participatory_space.purpose_of_action).present? ||
50
- translated_attribute(current_participatory_space.internal_organisation).present? ||
51
- translated_attribute(current_participatory_space.composition).present? %>
52
- <div class="show-more">
53
- <button class="button hollow small"><%= t("read_more", scope: "decidim.assemblies.show") %></button>
54
- </div>
55
-
56
- <div class="hide show-more-panel">
57
- <% if translated_attribute(current_participatory_space.purpose_of_action).present? %>
58
- <div class="section">
59
- <h3 class="section-heading"><%= t("purpose_of_action", scope: "decidim.assemblies.show") %></h3>
60
- <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.purpose_of_action) %>
61
- </div>
62
- <% end %>
63
-
64
- <% if translated_attribute(current_participatory_space.internal_organisation).present? %>
65
- <div class="section">
66
- <h3 class="section-heading"><%= t("internal_organisation", scope: "decidim.assemblies.show") %></h3>
67
- <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.internal_organisation) %>
68
- </div>
69
- <% end %>
70
-
71
- <% if translated_attribute(current_participatory_space.composition).present? %>
72
- <div class="section">
73
- <h3 class="section-heading"><%= t("composition", scope: "decidim.assemblies.show") %></h3>
74
- <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.composition) %>
75
- </div>
76
- <% end %>
77
- <div class="section text-center">
78
- <div class="hide-more">
79
- <button class="button hollow small"><%= t("read_less", scope: "decidim.assemblies.show") %></button>
80
- </div>
81
- </div>
82
- </div>
83
- <% end %>
84
-
85
- <%= attachments_for current_participatory_space %>
86
-
87
- <%= render_hook(:participatory_space_highlighted_elements) %>
88
-
89
- <% if current_participatory_space.children.visible_for(current_user).published.count.positive? %>
90
- <section id="assemblies-grid" class="section row collapse">
91
- <h3 class="section-heading"><%= t("children", scope: "decidim.assemblies.show") %></h3>
92
- <div class="row small-up-1 medium-up-2 large-up-2 card-grid">
93
- <%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children.visible_for(current_user).published.order(weight: :asc) %>
94
- </div>
95
- </section>
96
- <% end %>
97
-
98
- <%= participatory_processes_for_assembly(assembly_participatory_processes) if assembly_participatory_processes.present? %>
99
- </div>
100
-
101
- <div class="section columns medium-5 mediumlarge-4 large-3">
102
- <div class="card extra">
103
- <div class="card__content">
104
- <%= render partial: "decidim/shared/follow_button", locals: { followable: current_participatory_space, large: false } %>
105
- </div>
106
- </div>
107
- <div class="card extra definition-data">
108
- <% if translated_attribute(current_participatory_space.meta_scope).present? %>
109
- <div class="definition-data__item scope">
110
- <span class="definition-data__title"><%= t("scope", scope: "decidim.assemblies.show") %></span>
111
- <%= translated_attribute(current_participatory_space.meta_scope) %>
112
- </div>
113
- <% end %>
114
-
115
- <% if translated_attribute(current_participatory_space.developer_group).present? %>
116
- <div class="definition-data__item developer-group">
117
- <span class="definition-data__title"><%= t("developer_group", scope: "decidim.assemblies.show") %></span>
118
- <%= translated_attribute(current_participatory_space.developer_group) %>
119
- </div>
120
- <% end %>
23
+ <div class="participatory-space__container">
121
24
 
122
- <% if translated_attribute(current_participatory_space.local_area).present? %>
123
- <div class="definition-data__item local_area">
124
- <span class="definition-data__title"><%= t("local_area", scope: "decidim.assemblies.show") %></span>
125
- <%= translated_attribute(current_participatory_space.local_area) %>
126
- </div>
127
- <% end %>
25
+ <%= participatory_space_floating_help %>
128
26
 
129
- <% if translated_attribute(current_participatory_space.target).present? %>
130
- <div class="definition-data__item target">
131
- <span class="definition-data__title"><%= t("target", scope: "decidim.assemblies.show") %></span>
132
- <%= translated_attribute(current_participatory_space.target) %>
133
- </div>
134
- <% end %>
135
-
136
- <% if translated_attribute(current_participatory_space.participatory_scope).present? %>
137
- <div class="definition-data__item participatory_scope">
138
- <span class="definition-data__title"><%= t("participatory_scope", scope: "decidim.assemblies.show") %></span>
139
- <%= translated_attribute(current_participatory_space.participatory_scope) %>
140
- </div>
141
- <% end %>
142
-
143
- <% if translated_attribute(current_participatory_space.participatory_structure).present? %>
144
- <div class="definition-data__item participatory_structure">
145
- <span class="definition-data__title"><%= t("participatory_structure", scope: "decidim.assemblies.show") %></span>
146
- <%= translated_attribute(current_participatory_space.participatory_structure) %>
147
- </div>
148
- <% end %>
149
-
150
- <% area = current_participatory_space.area %>
151
- <% if translated_attribute(area&.name).present? %>
152
- <div class="definition-data__item area">
153
- <span class="definition-data__title"><%= t("area", scope: "decidim.assemblies.show") %></span>
154
- <% if translated_attribute(area.area_type&.name).present? %>
155
- <%= translated_attribute(area.area_type.name) %><span>&#45;</span>
156
- <% end %>
157
- <%= translated_attribute(area.name) %>
158
- </div>
159
- <% end %>
160
-
161
- <% if current_participatory_space.assembly_type.present? %>
162
- <div class="definition-data__item assembly_type">
163
- <span class="definition-data__title"><%= t("assembly_type", scope: "decidim.assemblies.show") %></span>
164
- <%= translated_attribute(current_participatory_space.assembly_type.title) %>
165
- </div>
166
- <% end %>
167
-
168
- <% if current_participatory_space.creation_date.present? %>
169
- <div class="definition-data__item creation_date">
170
- <span class="definition-data__title"><%= t("creation_date", scope: "decidim.assemblies.show") %></span>
171
- <%= l current_participatory_space.creation_date, format: :decidim_short %>
172
- </div>
173
- <% end %>
174
-
175
- <% if current_participatory_space.created_by.present? %>
176
- <div class="definition-data__item created_by">
177
- <span class="definition-data__title"><%= t("created_by", scope: "decidim.assemblies.show") %></span>
178
- <% if current_participatory_space.created_by == "others" %>
179
- <%= translated_attribute(current_participatory_space.created_by_other) %>
180
- <% else %>
181
- <%= t("created_by.#{current_participatory_space.created_by }", scope: "decidim.assemblies") %>
182
- <% end %>
183
- </div>
184
- <% end %>
185
-
186
- <% if current_participatory_space.included_at.present? %>
187
- <div class="definition-data__item included_at">
188
- <span class="definition-data__title"><%= t("included_at", scope: "decidim.assemblies.show") %></span>
189
- <%= l current_participatory_space.included_at, format: :decidim_short %>
190
- </div>
191
- <% end %>
192
-
193
- <div class="definition-data__item duration">
194
- <span class="definition-data__title"><%= t("duration", scope: "decidim.assemblies.show") %></span>
195
- <% if current_participatory_space.duration.present? %>
196
- <%= l current_participatory_space.duration, format: :decidim_short %>
197
- <% else %>
198
- <%= t("indefinite_duration", scope: "decidim.assemblies.show") %>
199
- <% end %>
200
- </div>
201
-
202
- <% if current_participatory_space.closing_date.present? %>
203
- <div class="definition-data__item closing_date">
204
- <span class="definition-data__title"><%= t("closing_date", scope: "decidim.assemblies.show") %></span>
205
- <%= l(current_participatory_space.closing_date, format: :decidim_short) %>
206
- <br>
207
- <%= decidim_sanitize_editor translated_attribute(current_participatory_space.closing_date_reason) %>
208
- </div>
209
- <% end %>
210
-
211
- <%= social_handler_links(current_participatory_space) %>
212
- </div>
213
- <%= resource_reference(current_participatory_space) %>
214
- <%= render partial: "decidim/shared/share_modal" %>
215
- <%= embed_modal_for assembly_widget_url(current_participatory_space, format: :js) %>
216
- </div>
217
- </div>
218
-
219
- <% if current_participatory_space.show_statistics? %>
220
- <%= cell "decidim/statistics", stats.collection %>
27
+ <% active_content_blocks.each do |content_block| %>
28
+ <% next unless content_block.manifest %>
29
+ <%= cell content_block.manifest.cell, content_block %>
221
30
  <% end %>
31
+
222
32
  </div>
223
33
 
224
- <% content_for :js_content do %>
225
- <%= javascript_pack_tag "decidim_assemblies" %>
226
- <% end %>
34
+ <section class="participatory-space__block-reference">
35
+ <%= resource_reference(current_participatory_space) %>
36
+ </section>
@@ -9,11 +9,13 @@ edit_link(
9
9
  )
10
10
  %>
11
11
 
12
- <div class="section row column">
13
- <div class="flex--sbe">
14
- <h3 class="section-heading"><%= t(".members") %> <span class="text-muted">(<%= collection.size %>)</span></h3>
15
- </div>
16
- <div id="assembly_members-grid" class="row small-up-1 medium-up-2 large-up-3 card-grid">
12
+ <%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
13
+ <div class="container py-8">
14
+ <h3 class="h3 decorator mb-8">
15
+ <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
16
+ <span class="label text-md"><%= collection.size %></span>
17
+ </h3>
18
+ <div id="assembly_members-grid" class="grid grid-cols-1 md:grid-cols-3 gap-4 md:gap-12">
17
19
  <%= render(collection) %>
18
20
  </div>
19
21
  </div>
@@ -1,12 +1,9 @@
1
1
  <% if assemblies.any? %>
2
- <div class="card__footer card__footer--transparent">
3
- <div class="card__support">
4
- <div><strong><%= t(".member_of") %></strong></div>
5
- <div class="card__text--separated-mid-dot js-read-more">
6
- <% assemblies.each do |assembly| %>
7
- <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %>
8
- <% end %>
9
- </div>
10
- </div>
2
+ <div class="profile__description">
3
+ <div class="font-semibold"><%= t(".member_of") %></div>
4
+ <% assemblies.each_with_index do |assembly, i| %>
5
+ <%= "&nbsp;&#183;&nbsp;".html_safe if i.positive? %>
6
+ <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly), class: "hover:underline" %>
7
+ <% end %>
11
8
  </div>
12
9
  <% end %>
@@ -0,0 +1,36 @@
1
+ <div class="inline-block relative">
2
+ <%= button_tag data: { component: "dropdown", target: "assemblies-dropdown-menu-settings" }, class: "dropdown__trigger button button__transparent" do %>
3
+ <span>
4
+ <%= t("menu.manage", scope: "decidim.admin") %>
5
+ </span>
6
+ <%= icon "arrow-down-s-line" %>
7
+ <% end %>
8
+ <div id="assemblies-dropdown-menu-settings" aria-hidden="true">
9
+ <ul class="dropdown dropdown__bottom">
10
+ <% if allowed_to? :import, :assembly %>
11
+ <li class="dropdown__item">
12
+ <%= icon "price-tag-3-line", class: "fill-gray-2" %>
13
+ <%= link_to t("actions.import_assembly", scope: "decidim.admin"),
14
+ new_import_path,
15
+ class: "text-secondary" %>
16
+ </li>
17
+ <% end %>
18
+ <% if allowed_to?(:read, :assembly_list) %>
19
+ <li class="dropdown__item">
20
+ <%= icon "government-line" %>
21
+ <%= link_to t("menu.assemblies", scope: "decidim.admin"),
22
+ decidim_admin_assemblies.assemblies_path,
23
+ class: "text-secondary" %>
24
+ </li>
25
+ <% end %>
26
+ <% if allowed_to?(:manage, :assemblies_type) %>
27
+ <li class="dropdown__item">
28
+ <%= icon "government-line" %>
29
+ <%= link_to t("menu.assemblies_types", scope: "decidim.admin"),
30
+ decidim_admin_assemblies.assemblies_types_path,
31
+ class: "text-secondary" %>
32
+ </li>
33
+ <% end %>
34
+ </ul>
35
+ </div>
36
+ </div>
@@ -1,15 +1,17 @@
1
- <% content_for :sidebar_menu_nav do %>
2
- <%= sidebar_menu(:admin_assemblies_menu).render %>
1
+ <% content_for :breadcrumb_context_menu do %>
2
+ <div class="process-title-content-breadcrumb-container-right">
3
+ <% if allowed_to? :create, :assembly %>
4
+ <%= link_to new_assembly_path(parent_id: parent_assembly&.id), class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link" do %>
5
+ <%= icon "add-line", class: "w-4 h-4" %>
6
+ <span>
7
+ <%= t("actions.new_assembly", scope: "decidim.admin") %>
8
+ </span>
9
+ <% end %>
10
+ <% end %>
11
+ <%= render partial: "layouts/decidim/admin/manage_assemblies" %>
12
+ </div>
3
13
  <% end %>
4
14
 
5
15
  <%= render "layouts/decidim/admin/application" do %>
6
- <div class="process-title">
7
- <div class="process-title-content">
8
- <%= link_to t("decidim.admin.titles.assemblies"), decidim_assemblies.assemblies_path, target: "_blank" %>
9
- </div>
10
- </div>
11
-
12
- <div class="process-content">
13
- <%= yield %>
14
- </div>
16
+ <%= yield %>
15
17
  <% end %>
@@ -0,0 +1,9 @@
1
+ <% content_for :breadcrumb_context_menu do %>
2
+ <div class="process-title-content-breadcrumb-container-right">
3
+ <%= render partial: "layouts/decidim/admin/manage_assemblies" %>
4
+ </div>
5
+ <% end %>
6
+
7
+ <%= render "layouts/decidim/admin/application" do %>
8
+ <%= yield %>
9
+ <% end %>
@@ -0,0 +1,17 @@
1
+ <% content_for :breadcrumb_context_menu do %>
2
+ <div class="process-title-content-breadcrumb-container-right">
3
+ <% if allowed_to? :create, :assembly_type %>
4
+ <%= link_to [:new, :assemblies_type], class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link" do %>
5
+ <%= icon "add-line", class: "w-4 h-4" %>
6
+ <span>
7
+ <%= t("actions.new_assembly_type", scope: "decidim.admin") %>
8
+ </span>
9
+ <% end %>
10
+ <% end %>
11
+ <%= render partial: "layouts/decidim/admin/manage_assemblies" %>
12
+ </div>
13
+ <% end %>
14
+
15
+ <%= render "layouts/decidim/admin/application" do %>
16
+ <%= yield %>
17
+ <% end %>
@@ -1,18 +1,17 @@
1
+ <% add_secondary_root_menu(:admin_assembly_menu) %>
2
+
1
3
  <% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
2
- <% content_for :sidebar_menu_nav do %>
3
- <%= sidebar_menu(:admin_assembly_menu).render do
4
- public_page_link decidim_assemblies.assembly_path(current_participatory_space)
5
- end %>
4
+ <% content_for :breadcrumb_context_menu do %>
5
+ <div class="process-title-content-breadcrumb-container-right">
6
+ <%= link_to decidim_assemblies.assembly_path(current_participatory_space), class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link", target: "_blank", data: { "external-link": false } do %>
7
+ <%= icon "eye-line" %>
8
+ <span>
9
+ <%= t("see_assembly", scope: "decidim.admin.menu.assemblies_submenu") %>
10
+ </span>
11
+ <% end %>
12
+ </div>
6
13
  <% end %>
7
14
 
8
15
  <%= render "layouts/decidim/admin/application" do %>
9
- <div class="process-title">
10
- <div class="process-title-content">
11
- <%= link_to translated_attribute(current_participatory_space.title), decidim_assemblies.assembly_path(current_participatory_space), target: "_blank" %>
12
- </div>
13
- </div>
14
-
15
- <div class="process-content">
16
- <%= yield %>
17
- </div>
16
+ <%= yield %>
18
17
  <% end %>
@@ -2,24 +2,17 @@
2
2
  <% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
3
3
  <% add_decidim_meta_tags(
4
4
  image_url: current_participatory_space.attached_uploader(:banner_image).path,
5
- description: translated_attribute(current_participatory_space.short_description),
5
+ description: translated_attribute(current_participatory_space.short_description)
6
6
  ) %>
7
7
 
8
+ <%= append_javascript_pack_tag "decidim_assemblies" %>
9
+
10
+ <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
11
+
8
12
  <%= render "layouts/decidim/application" do %>
9
- <%= render partial: "layouts/decidim/assembly_header" %>
10
- <%= cell "decidim/translation_bar", current_organization %>
11
- <div class="wrapper">
13
+ <main>
12
14
  <%= yield %>
13
- </div>
14
- <% if content_for? :expanded %>
15
- <div class="expanded">
16
- <div class="wrapper wrapper--inner">
17
- <div class="row">
18
- <%= yield :expanded %>
19
- </div>
20
- </div>
21
- </div>
22
- <% end %>
15
+ </main>
23
16
  <% end %>
24
17
 
25
18
  <% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
@@ -2,8 +2,6 @@
2
2
  ar:
3
3
  activemodel:
4
4
  attributes:
5
- assemblies_setting:
6
- enable_organization_chart: تمكين الخريطة التنظيمية
7
5
  assemblies_type:
8
6
  title: العنوان
9
7
  assembly:
@@ -59,7 +57,6 @@ ar:
59
57
  subtitle: العنوان الفرعي
60
58
  target: من يشارك
61
59
  title: العنوان
62
- twitter: X
63
60
  weight: موضع الطلب
64
61
  youtube: يوتيوب
65
62
  assembly_member:
@@ -77,12 +74,6 @@ ar:
77
74
  email: البريد الإلكتروني
78
75
  name: الاسم
79
76
  role: الوظيفة
80
- errors:
81
- models:
82
- assembly:
83
- attributes:
84
- document:
85
- allowed_file_content_types: 'نوع الوثيقة غير صالح. يسمح فقط بالملفات ذات الإضافات التالية: %{types}'
86
77
  activerecord:
87
78
  models:
88
79
  decidim/assembly:
@@ -119,7 +110,6 @@ ar:
119
110
  edit:
120
111
  update: تحديث
121
112
  index:
122
- not_published: غير منشور
123
113
  private: خاص
124
114
  public: عامة
125
115
  published: نشرت
@@ -133,10 +123,6 @@ ar:
133
123
  create:
134
124
  error: حدثت مشكلة في تكرار هذا التجميع.
135
125
  success: الجمعية مكررة بنجاح.
136
- assemblies_settings:
137
- update:
138
- error: طرأت مشكلة أثناء تحديث الإعدادات.
139
- success: تم تحديث الإعدادات بنجاح.
140
126
  assemblies_types:
141
127
  create:
142
128
  error: حدثت مشكلة أثناء إنشاء جمعية جديدة.
@@ -169,13 +155,11 @@ ar:
169
155
  destroy:
170
156
  success: تم حذف العضو بنجاح لهذا التجميع.
171
157
  edit:
172
- title: تحديث عضو التجميع.
173
158
  update: تحديث
174
159
  index:
175
160
  assembly_members_title: أعضاء الجمعية
176
161
  new:
177
162
  create: إنشاء
178
- title: عضو الجمعية الجديد.
179
163
  update:
180
164
  error: حدثت مشكلة أثناء تحديث العضو لهذا التجميع.
181
165
  success: تم تحديث العضو بنجاح لهذا التجميع.
@@ -193,13 +177,11 @@ ar:
193
177
  destroy:
194
178
  success: تمت إزالة المشرف بنجاح من هذا التجميع.
195
179
  edit:
196
- title: تحديث مسؤول التجميع.
197
180
  update: تحديث
198
181
  index:
199
182
  assembly_admins_title: مدراء الجمعية
200
183
  new:
201
184
  create: إنشاء
202
- title: مشرف جديد على الجمعية.
203
185
  update:
204
186
  error: حدثت مشكلة أثناء تحديث مشرفٍ على هذه الجمعية.
205
187
  success: تم تحديث المشرف على هذه الجمعية بنجاح.
@@ -208,7 +190,6 @@ ar:
208
190
  label: نوع الجمعية
209
191
  menu:
210
192
  assemblies: الجمعيات
211
- assemblies_settings: الإعدادات
212
193
  assemblies_submenu:
213
194
  assembly_admins: مدراء الجمعية
214
195
  assembly_members: الأعضاء
@@ -217,7 +198,6 @@ ar:
217
198
  attachments: المرفقات
218
199
  categories: الفئات
219
200
  components: المكونات
220
- info: معلومات
221
201
  moderations: الإعتدال
222
202
  private_users: المستخدمون الخاصون
223
203
  assemblies_types: نوع التجمّعات
@@ -303,17 +283,10 @@ ar:
303
283
  select_parent_assembly: حدد الجمعية الأصلية
304
284
  social_handlers: التواصل الاجتماعي
305
285
  title: معلومات عامة
306
- assemblies_settings:
307
- edit:
308
- update: تحديث
309
- form:
310
- title: إعدادات الجمعية
286
+ visbility: الرؤية
311
287
  assemblies_types:
312
288
  form:
313
289
  title: العنوان
314
- assembly_imports:
315
- form:
316
- document_legend: إضافة وثيقة
317
290
  assembly_members:
318
291
  form:
319
292
  existing_user: المشارك الحالي
@@ -324,11 +297,6 @@ ar:
324
297
  select_a_position: اختر المنصب
325
298
  select_user: اختيار مشارك
326
299
  user_type: نوع المشارك
327
- index:
328
- filter:
329
- all: الكل
330
- filter_by: مصنف بواسطة
331
- search: البحث
332
300
  content_blocks:
333
301
  highlighted_assemblies:
334
302
  max_results: أقصى قدر من العناصر لإظهارها
@@ -336,6 +304,9 @@ ar:
336
304
  accepted_types:
337
305
  json: ملفات بصيغة (JSON)
338
306
  assemblies:
307
+ filters:
308
+ names:
309
+ all: الكل
339
310
  show:
340
311
  title: حول الجمعية
341
312
  assembly_members:
@@ -350,6 +321,8 @@ ar:
350
321
  participatory: تشاركية
351
322
  working_group: فريق العمل
352
323
  content_blocks:
324
+ children_assemblies:
325
+ name: جمعيات
353
326
  highlighted_assemblies:
354
327
  name: المجالس البارزة
355
328
  created_by:
@@ -369,41 +342,20 @@ ar:
369
342
  index:
370
343
  title: الجمعيات
371
344
  last_activity:
372
- new_assembly: جمعية جديدة
345
+ new_assembly: 'جمعية جديدة:'
373
346
  pages:
374
- home:
375
- highlighted_assemblies:
376
- assemblies_button_title: رابط إلى صفحة الجمعيات لاستعراض جميع الجمعيات
377
347
  user_profile:
378
348
  member_of:
379
349
  member_of: عضو في
380
350
  show:
381
- area: المنطقة
382
351
  assembly_type: نوع الجمعية
383
- children: الجمعيات
384
- closing_date: الموعد النهائي
385
- composition: المكونات
386
- created_by: أنشئ من طرف
387
- creation_date: تاريخ الإنشاء
388
- developer_group: مجموعة المروجين
389
352
  duration: المدة الزمنية
390
- included_at: المدرجة في
391
- internal_organisation: التنظيم الداخلي
392
353
  is_transparent:
393
354
  'false': مبهمة
394
355
  'true': شفافة
395
- local_area: منطقة التنظيم
396
- participatory_scope: ما الذي تقرر
397
- participatory_structure: كيف تقرر ذلك
398
356
  private_space: هذه جمعية خاصة
399
- purpose_of_action: الغرض من العمل
400
- read_less: أقرأ أقل
401
- read_more: اقرأ المزيد
402
357
  related_participatory_processes: العمليات التشاركية ذات الصلة
403
- scope: النطاق
404
- social_networks: شبكات التواصل الاجتماعي
405
358
  social_networks_title: زيارة التجمع على
406
- target: من يشارك
407
359
  assembly_members:
408
360
  assembly_member:
409
361
  designated_on: المعينة على
@@ -446,9 +398,6 @@ ar:
446
398
  related_assemblies: التجمعات ذات الصلة
447
399
  statistics:
448
400
  assemblies_count: التجمعات
449
- errors:
450
- messages:
451
- cannot_be_blank: لا يمكن أن يكون فارغا
452
401
  layouts:
453
402
  decidim:
454
403
  assemblies:
@@ -456,10 +405,7 @@ ar:
456
405
  more_info: مزيد من المعلومات
457
406
  take_part: خذ جزء
458
407
  index:
459
- children: 'المجالس: '
460
- organizational_chart: الهيكل التنظيمي
461
408
  promoted_assemblies: المجالس البارزة
462
- reset_chart: إعادة تعيين
463
409
  order_by_assemblies:
464
410
  assemblies:
465
411
  zero: "%{count} اجتماعات"
@@ -468,12 +414,5 @@ ar:
468
414
  few: "%{count} اجتماعات"
469
415
  many: "%{count} اجتماع"
470
416
  other: "%{count} اجتماعات"
471
- promoted_assembly:
472
- more_info: مزيد من المعلومات
473
- take_part: خذ جزء
474
417
  assembly_navigation:
475
418
  assembly_member_menu_item: الأعضاء
476
- assembly_menu_item: الجمعية
477
- assembly_widgets:
478
- show:
479
- take_part: خذ جزء