decidim-conferences 0.27.6 → 0.28.0.rc4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (229) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/conferences/conference_cell.rb +9 -4
  3. data/app/cells/decidim/conferences/conference_dropdown_metadata_cell.rb +19 -0
  4. data/app/cells/decidim/conferences/conference_g_cell.rb +23 -0
  5. data/app/cells/decidim/conferences/conference_metadata_cell.rb +21 -0
  6. data/app/cells/decidim/conferences/conference_s_cell.rb +13 -0
  7. data/app/cells/decidim/conferences/conference_speaker/show.erb +44 -58
  8. data/app/cells/decidim/conferences/conference_speaker_cell.rb +4 -14
  9. data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb +15 -14
  10. data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_settings_form/show.erb +3 -0
  11. data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_settings_form_cell.rb +19 -0
  12. data/app/cells/decidim/conferences/linked_participatory_spaces/show.erb +6 -8
  13. data/app/cells/decidim/conferences/linked_participatory_spaces_cell.rb +1 -10
  14. data/app/cells/decidim/conferences/media_link/show.erb +6 -8
  15. data/app/cells/decidim/conferences/partner/image.erb +3 -0
  16. data/app/cells/decidim/conferences/partner/show.erb +8 -8
  17. data/app/cells/decidim/conferences/partner/text.erb +1 -0
  18. data/app/cells/decidim/conferences/partner_cell.rb +4 -2
  19. data/app/cells/decidim/conferences/registration_type/join_conference.erb +15 -12
  20. data/app/cells/decidim/conferences/registration_type/registration_confirm.erb +12 -12
  21. data/app/cells/decidim/conferences/registration_type/show.erb +11 -14
  22. data/app/cells/decidim/conferences/registration_type_cell.rb +3 -3
  23. data/app/commands/decidim/conferences/admin/copy_conference.rb +1 -1
  24. data/app/commands/decidim/conferences/admin/create_conference.rb +2 -11
  25. data/app/commands/decidim/conferences/admin/create_conference_speaker.rb +2 -2
  26. data/app/commands/decidim/conferences/admin/create_media_link.rb +2 -2
  27. data/app/commands/decidim/conferences/admin/create_partner.rb +2 -2
  28. data/app/commands/decidim/conferences/admin/create_registration_type.rb +2 -2
  29. data/app/commands/decidim/conferences/admin/destroy_conference_speaker.rb +2 -2
  30. data/app/commands/decidim/conferences/admin/destroy_media_link.rb +1 -1
  31. data/app/commands/decidim/conferences/admin/destroy_partner.rb +3 -3
  32. data/app/commands/decidim/conferences/admin/destroy_registration_type.rb +1 -1
  33. data/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb +5 -5
  34. data/app/commands/decidim/conferences/admin/publish_conference.rb +9 -26
  35. data/app/commands/decidim/conferences/admin/send_conference_diplomas.rb +1 -1
  36. data/app/commands/decidim/conferences/admin/update_conference.rb +2 -11
  37. data/app/commands/decidim/conferences/admin/update_conference_speaker.rb +1 -1
  38. data/app/commands/decidim/conferences/admin/update_media_link.rb +1 -1
  39. data/app/commands/decidim/conferences/admin/update_partner.rb +1 -1
  40. data/app/commands/decidim/conferences/admin/update_registration_type.rb +1 -1
  41. data/app/commands/decidim/conferences/decline_invitation.rb +1 -1
  42. data/app/commands/decidim/conferences/join_conference.rb +5 -5
  43. data/app/constraints/decidim/conferences/current_component.rb +2 -2
  44. data/app/constraints/decidim/conferences/current_conference.rb +2 -2
  45. data/app/controllers/concerns/decidim/conferences/admin/conference_context.rb +1 -1
  46. data/app/controllers/decidim/conferences/admin/concerns/conference_admin.rb +2 -2
  47. data/app/controllers/decidim/conferences/admin/conference_attachment_collections_controller.rb +6 -1
  48. data/app/controllers/decidim/conferences/admin/conference_attachments_controller.rb +5 -0
  49. data/app/controllers/decidim/conferences/admin/conference_invites_controller.rb +2 -1
  50. data/app/controllers/decidim/conferences/admin/conference_publications_controller.rb +10 -28
  51. data/app/controllers/decidim/conferences/admin/conference_registrations_controller.rb +1 -1
  52. data/app/controllers/decidim/conferences/admin/conference_user_roles_controller.rb +8 -90
  53. data/app/controllers/decidim/conferences/admin/conferences_controller.rb +2 -0
  54. data/app/controllers/decidim/conferences/admin/diplomas_controller.rb +1 -1
  55. data/app/controllers/decidim/conferences/admin/exports_controller.rb +1 -1
  56. data/app/controllers/decidim/conferences/admin/imports_controller.rb +1 -1
  57. data/app/controllers/decidim/conferences/admin/moderations/reports_controller.rb +1 -1
  58. data/app/controllers/decidim/conferences/admin/moderations_controller.rb +1 -1
  59. data/app/controllers/decidim/conferences/application_controller.rb +6 -0
  60. data/app/controllers/decidim/conferences/conference_registrations_controller.rb +3 -3
  61. data/app/controllers/decidim/conferences/conferences_controller.rb +9 -2
  62. data/app/events/decidim/conferences/conference_registration_notification_event.rb +3 -13
  63. data/app/events/decidim/conferences/conference_registrations_enabled_event.rb +1 -1
  64. data/app/events/decidim/conferences/conference_registrations_over_percentage_event.rb +1 -1
  65. data/app/events/decidim/conferences/conference_role_assigned_event.rb +6 -6
  66. data/app/forms/decidim/conferences/admin/conference_copy_form.rb +1 -1
  67. data/app/forms/decidim/conferences/admin/conference_form.rb +4 -15
  68. data/app/forms/decidim/conferences/admin/conference_user_role_form.rb +2 -17
  69. data/app/helpers/decidim/conferences/admin/conferences_helper.rb +0 -4
  70. data/app/helpers/decidim/conferences/conference_helper.rb +55 -0
  71. data/app/helpers/decidim/conferences/conference_program_helper.rb +1 -1
  72. data/app/helpers/decidim/conferences/media_attachments_helper.rb +0 -10
  73. data/app/helpers/decidim/conferences/partners_helper.rb +3 -1
  74. data/app/mailers/decidim/conferences/admin/invite_join_conference_mailer.rb +1 -1
  75. data/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb +1 -1
  76. data/app/mailers/decidim/conferences/conference_registration_mailer.rb +2 -2
  77. data/app/models/decidim/conference.rb +4 -4
  78. data/app/models/decidim/conference_user_role.rb +6 -34
  79. data/app/packs/entrypoints/decidim_conferences.js +5 -0
  80. data/app/packs/src/decidim/conferences/admin/conferences.js +6 -6
  81. data/app/packs/stylesheets/decidim/conferences/_conference.scss +102 -0
  82. data/app/packs/stylesheets/decidim/conferences/_media.scss +13 -0
  83. data/app/packs/stylesheets/decidim/conferences/_program.scss +43 -0
  84. data/app/packs/stylesheets/decidim/conferences/_registration.scss +39 -0
  85. data/app/packs/stylesheets/decidim/conferences/_speaker.scss +83 -0
  86. data/app/packs/stylesheets/decidim/conferences/conferences.scss +5 -3
  87. data/app/permissions/decidim/conferences/permissions.rb +2 -13
  88. data/app/presenters/decidim/conference_speaker_presenter.rb +1 -1
  89. data/app/presenters/decidim/conferences/admin_log/conference_invite_presenter.rb +2 -2
  90. data/app/presenters/decidim/conferences/admin_log/conference_presenter.rb +2 -2
  91. data/app/presenters/decidim/conferences/admin_log/conference_registration_presenter.rb +2 -2
  92. data/app/presenters/decidim/conferences/admin_log/conference_speaker_presenter.rb +2 -2
  93. data/app/presenters/decidim/conferences/admin_log/conference_user_role_presenter.rb +2 -2
  94. data/app/presenters/decidim/conferences/admin_log/media_link_presenter.rb +2 -2
  95. data/app/presenters/decidim/conferences/admin_log/partner_presenter.rb +2 -2
  96. data/app/presenters/decidim/conferences/admin_log/registration_type_presenter.rb +2 -2
  97. data/app/presenters/decidim/conferences/conference_stats_presenter.rb +3 -28
  98. data/app/queries/decidim/conferences/admin/admin_users.rb +4 -4
  99. data/app/queries/decidim/conferences/conferences_with_user_role.rb +2 -2
  100. data/app/queries/decidim/conferences/organization_conferences.rb +1 -1
  101. data/app/queries/decidim/conferences/organization_published_conferences.rb +1 -1
  102. data/app/views/decidim/conferences/admin/conference_copies/_form.html.erb +22 -28
  103. data/app/views/decidim/conferences/admin/conference_copies/new.html.erb +16 -5
  104. data/app/views/decidim/conferences/admin/conference_invites/_form.html.erb +17 -19
  105. data/app/views/decidim/conferences/admin/conference_invites/index.html.erb +69 -74
  106. data/app/views/decidim/conferences/admin/conference_invites/new.html.erb +21 -17
  107. data/app/views/decidim/conferences/admin/conference_registrations/index.html.erb +45 -45
  108. data/app/views/decidim/conferences/admin/conference_speakers/_form.html.erb +42 -46
  109. data/app/views/decidim/conferences/admin/conference_speakers/edit.html.erb +16 -6
  110. data/app/views/decidim/conferences/admin/conference_speakers/index.html.erb +52 -55
  111. data/app/views/decidim/conferences/admin/conference_speakers/new.html.erb +16 -6
  112. data/app/views/decidim/conferences/admin/conference_user_roles/_form.html.erb +14 -18
  113. data/app/views/decidim/conferences/admin/conference_user_roles/edit.html.erb +16 -6
  114. data/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb +53 -56
  115. data/app/views/decidim/conferences/admin/conference_user_roles/new.html.erb +16 -6
  116. data/app/views/decidim/conferences/admin/conferences/_form.html.erb +88 -88
  117. data/app/views/decidim/conferences/admin/conferences/edit.html.erb +26 -12
  118. data/app/views/decidim/conferences/admin/conferences/index.html.erb +55 -64
  119. data/app/views/decidim/conferences/admin/conferences/new.html.erb +16 -8
  120. data/app/views/decidim/conferences/admin/diplomas/_form.html.erb +18 -24
  121. data/app/views/decidim/conferences/admin/diplomas/edit.html.erb +19 -5
  122. data/app/views/decidim/conferences/admin/media_links/_form.html.erb +15 -19
  123. data/app/views/decidim/conferences/admin/media_links/edit.html.erb +16 -6
  124. data/app/views/decidim/conferences/admin/media_links/index.html.erb +37 -40
  125. data/app/views/decidim/conferences/admin/media_links/new.html.erb +16 -6
  126. data/app/views/decidim/conferences/admin/partners/_form.html.erb +18 -22
  127. data/app/views/decidim/conferences/admin/partners/edit.html.erb +16 -6
  128. data/app/views/decidim/conferences/admin/partners/index.html.erb +45 -48
  129. data/app/views/decidim/conferences/admin/partners/new.html.erb +16 -6
  130. data/app/views/decidim/conferences/admin/registration_types/_form.html.erb +23 -23
  131. data/app/views/decidim/conferences/admin/registration_types/edit.html.erb +16 -6
  132. data/app/views/decidim/conferences/admin/registration_types/index.html.erb +52 -56
  133. data/app/views/decidim/conferences/admin/registration_types/new.html.erb +16 -6
  134. data/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb +2 -2
  135. data/app/views/decidim/conferences/conference_program/_program_item.html.erb +21 -24
  136. data/app/views/decidim/conferences/conference_program/_program_meeting.html.erb +29 -63
  137. data/app/views/decidim/conferences/conference_program/show.html.erb +27 -39
  138. data/app/views/decidim/conferences/conference_speakers/index.html.erb +12 -6
  139. data/app/views/decidim/conferences/conferences/_conference_hero.html.erb +33 -0
  140. data/app/views/decidim/conferences/conferences/_partners.html.erb +10 -13
  141. data/app/views/decidim/conferences/conferences/index.html.erb +17 -7
  142. data/app/views/decidim/conferences/conferences/show.html.erb +84 -50
  143. data/app/views/decidim/conferences/media/index.html.erb +33 -19
  144. data/app/views/decidim/conferences/registration_types/index.html.erb +25 -17
  145. data/app/views/layouts/decidim/admin/conference.html.erb +12 -14
  146. data/app/views/layouts/decidim/admin/conferences.html.erb +13 -8
  147. data/app/views/layouts/decidim/conference.html.erb +7 -17
  148. data/app/views/layouts/decidim/conferences/_conference_nav_item.html.erb +6 -0
  149. data/app/views/layouts/decidim/conferences/application.html.erb +6 -0
  150. data/config/assets.rb +1 -1
  151. data/config/initializers/wicked_pdf.rb +1 -1
  152. data/config/locales/ar.yml +3 -64
  153. data/config/locales/bg.yml +0 -85
  154. data/config/locales/ca.yml +34 -54
  155. data/config/locales/cs.yml +35 -53
  156. data/config/locales/de.yml +33 -53
  157. data/config/locales/el.yml +11 -51
  158. data/config/locales/en.yml +34 -54
  159. data/config/locales/es-MX.yml +32 -52
  160. data/config/locales/es-PY.yml +32 -52
  161. data/config/locales/es.yml +32 -52
  162. data/config/locales/eu.yml +33 -58
  163. data/config/locales/fi-plain.yml +32 -52
  164. data/config/locales/fi.yml +32 -52
  165. data/config/locales/fr-CA.yml +31 -51
  166. data/config/locales/fr.yml +31 -51
  167. data/config/locales/ga-IE.yml +0 -17
  168. data/config/locales/gl.yml +3 -62
  169. data/config/locales/hu.yml +15 -53
  170. data/config/locales/id-ID.yml +3 -57
  171. data/config/locales/it.yml +4 -62
  172. data/config/locales/ja.yml +33 -54
  173. data/config/locales/lb.yml +1 -55
  174. data/config/locales/lt.yml +14 -52
  175. data/config/locales/lv.yml +1 -61
  176. data/config/locales/nl.yml +3 -62
  177. data/config/locales/no.yml +1 -62
  178. data/config/locales/pl.yml +1 -79
  179. data/config/locales/pt-BR.yml +1 -72
  180. data/config/locales/pt.yml +2 -63
  181. data/config/locales/ro-RO.yml +13 -50
  182. data/config/locales/sk.yml +1 -61
  183. data/config/locales/sl.yml +0 -2
  184. data/config/locales/sr-CS.yml +0 -9
  185. data/config/locales/sv.yml +7 -62
  186. data/config/locales/tr-TR.yml +13 -62
  187. data/config/locales/zh-CN.yml +3 -60
  188. data/config/locales/zh-TW.yml +6 -47
  189. data/db/migrate/20221116084952_add_weight_to_conferences.rb +7 -0
  190. data/lib/decidim/conferences/admin_engine.rb +14 -138
  191. data/lib/decidim/conferences/content_blocks/registry_manager.rb +21 -0
  192. data/lib/decidim/conferences/engine.rb +17 -15
  193. data/lib/decidim/conferences/menu.rb +182 -0
  194. data/lib/decidim/conferences/participatory_space.rb +6 -200
  195. data/lib/decidim/conferences/query_extensions.rb +2 -2
  196. data/lib/decidim/conferences/seeds.rb +153 -0
  197. data/lib/decidim/conferences/test/factories.rb +37 -73
  198. data/lib/decidim/conferences/version.rb +1 -1
  199. metadata +48 -52
  200. data/app/cells/decidim/conferences/conference_address/show.erb +0 -11
  201. data/app/cells/decidim/conferences/conference_address_cell.rb +0 -11
  202. data/app/cells/decidim/conferences/conference_m/footer.erb +0 -9
  203. data/app/cells/decidim/conferences/conference_m/tags.erb +0 -1
  204. data/app/cells/decidim/conferences/conference_m_cell.rb +0 -38
  205. data/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb +0 -30
  206. data/app/cells/decidim/conferences/photo/show.erb +0 -26
  207. data/app/cells/decidim/conferences/photo_cell.rb +0 -41
  208. data/app/cells/decidim/conferences/photos_list/show.erb +0 -8
  209. data/app/cells/decidim/conferences/photos_list_cell.rb +0 -18
  210. data/app/commands/decidim/conferences/admin/create_conference_admin.rb +0 -114
  211. data/app/commands/decidim/conferences/admin/destroy_conference_admin.rb +0 -58
  212. data/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb +0 -22
  213. data/app/commands/decidim/conferences/admin/unpublish_conference.rb +0 -39
  214. data/app/commands/decidim/conferences/admin/update_conference_admin.rb +0 -53
  215. data/app/controllers/decidim/conferences/conference_widgets_controller.rb +0 -33
  216. data/app/queries/decidim/conferences/admin/conference_invites.rb +0 -60
  217. data/app/views/decidim/conferences/_order_by_conferences.html.erb +0 -3
  218. data/app/views/decidim/conferences/conferences/_promoted_conference.html.erb +0 -27
  219. data/app/views/decidim/conferences/media/_attachments.html.erb +0 -6
  220. data/app/views/decidim/conferences/shared/_conference_user_login.html.erb +0 -14
  221. data/app/views/layouts/decidim/_conference_hero.html.erb +0 -42
  222. data/app/views/layouts/decidim/_conferences_nav.html.erb +0 -46
  223. data/config/locales/he-IL.yml +0 -1
  224. data/db/seeds/Exampledocument.pdf +0 -0
  225. data/db/seeds/city.jpeg +0 -0
  226. data/db/seeds/city2.jpeg +0 -0
  227. data/db/seeds/homepage_image.jpg +0 -0
  228. data/db/seeds/logo.png +0 -0
  229. data/decidim-conferences.gemspec +0 -33
@@ -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: conference_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: conference_url(current_participatory_space),
5
+ twitter_handler: current_organization.twitter_handler
6
+ }) %>
7
7
 
8
8
  <%
9
9
  edit_link(
@@ -14,71 +14,105 @@ edit_link(
14
14
  )
15
15
  %>
16
16
 
17
- <%= participatory_space_floating_help %>
17
+ <%# NOTE: This page is wrapped within a main tag, in order to
18
+ include the hero inside the two-column layout.
19
+ Therefore is mandatory to pass the "main_enabled: false" flag
20
+ to the layout_two_col for disabling the original main. %>
21
+ <main>
18
22
 
19
- <div class="row">
20
- <div class="columns mediumlarge-12">
21
- <section class="section">
22
- <h3 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h3>
23
- <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.short_description) %>
23
+ <%= content_for :aside do %>
24
+ <div class="conference__nav-container">
25
+ <button id="dropdown-trigger-conference" data-component="dropdown" data-target="dropdown-menu-conference" data-auto-close="true" data-disabled-md="true" data-scroll-to-menu="true">
26
+ <span><%= t("decidim.searches.filters.jump_to") %></span>
27
+ <%= icon "arrow-down-s-line" %>
28
+ <%= icon "arrow-up-s-line" %>
29
+ </button>
30
+ <ul id="dropdown-menu-conference" class="conference__nav">
31
+ <%= render partial: "layouts/decidim/conferences/conference_nav_item", collection: conference_nav_items(current_participatory_space), as: :item %>
32
+ </ul>
33
+ </div>
34
+ <% end %>
35
+
36
+ <%= render partial: "conference_hero" %>
37
+
38
+ <%= render layout: "layouts/decidim/shared/layout_two_col", locals: { reverse: true, main_enabled: false } do %>
39
+
40
+ <%= participatory_space_floating_help %>
41
+
42
+ <section class="content-block">
43
+ <h2 class="h2 decorator"><%= t("conferences.show.introduction", scope: "decidim") %></h2>
44
+ <div class="content-block__description editor-content">
45
+ <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.short_description) %>
46
+ </div>
24
47
  </section>
25
- <hr class="reset mt-none mb-m">
26
- <section class="section">
27
- <h3 class="section-heading"><%= t("conferences.show.details", scope: "decidim") %></h3>
28
- <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.description) %>
29
- <div class="row mt-l mb-l">
30
- <div class="column medium-9 medium-centered">
31
- <% if current_participatory_space.registrations_enabled? %>
32
- <div class="column medium-6">
33
- <%= link_to t(".register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class:"button button--sc light expanded" %>
34
- </div>
48
+
49
+ <section class="content-block conference__content-block">
50
+ <h2 class="h2 decorator"><%= t("conferences.show.details", scope: "decidim") %></h2>
51
+ <div class="content-block__description editor-content">
52
+ <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.description) %>
53
+ </div>
54
+
55
+ <div>
56
+ <% if current_participatory_space.registrations_enabled? %>
57
+ <% if current_participatory_space.has_registration_for?(current_user) %>
58
+ <%= link_to t("decidim.conferences.conferences.show.manage_registration"), decidim_conferences.conference_registration_types_path(current_participatory_space), class: "button button__lg button__primary" %>
59
+ <% else %>
60
+ <%= link_to t("decidim.conferences.conferences.show.register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class: "button button__lg button__secondary" %>
35
61
  <% end %>
36
- <% current_participatory_space.components.where(manifest_name: "meetings").each do |component_meeting| %>
37
- <% if component_meeting.published? || component_meeting == self.try(:current_component) %>
38
- <div class="column medium-6 end">
39
- <%= link_to translated_attribute(component_meeting.name), decidim_conferences.conference_conference_program_path(current_participatory_space, id: component_meeting.id), class:"button button--sc secondary light expanded" %>
40
- </div>
41
- <% end %>
62
+ <% end %>
63
+ <% current_participatory_space.components.where(manifest_name: "meetings").each do |component_meeting| %>
64
+ <% if component_meeting.published? || component_meeting == self.try(:current_component) %>
65
+ <%= link_to translated_attribute(component_meeting.name), decidim_conferences.conference_conference_program_path(current_participatory_space, id: component_meeting.id), class: "button button__lg button__transparent-secondary" %>
42
66
  <% end %>
43
- </div>
67
+ <% end %>
44
68
  </div>
45
69
  </section>
46
70
 
47
- <%= partners_for current_participatory_space %>
71
+ <%= render partial: "partners", locals: { conference: current_participatory_space } %>
72
+
73
+ <% unless translated_attribute(current_participatory_space.objectives).blank? %>
74
+ <section class="content-block">
75
+ <h2 class="h2 decorator"><%= t("decidim.conferences.show.objectives") %></h2>
76
+ <div class="editor-content">
77
+ <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.objectives) %>
78
+ </div>
79
+ </section>
80
+ <% end %>
48
81
 
49
82
  <%= render_hook(:conference_venues) %>
50
83
 
51
84
  <% if current_participatory_space.registrations_enabled? %>
52
- <hr class="reset mt-none mb-m">
53
- <section class="section">
54
- <h3 class="section-heading"><%= t(".register") %></h3>
85
+ <section class="content-block">
86
+ <h2 class="h2 decorator"><%= t("decidim.conferences.conferences.show.register") %></h2>
55
87
  <% if current_user.present? %>
56
- <div class="card p-m text-center">
57
- <p><%= t(".login_as", name: current_user.name, email: current_user.email ) %></p>
58
- <p><%= t(".make_conference_registration") %></p>
59
- <div class="medium-3" style="margin: 0 auto;">
60
- <%= link_to t(".register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class:"button button--sc light expanded" %>
88
+ <div class="conference__box">
89
+ <div>
90
+ <%= icon "user-follow-line", class: "conference__box-icon" %>
91
+ <p class="conference__box-title"><%= t("decidim.conferences.conferences.show.make_conference_registration") %></p>
92
+ <p class="conference__box-description"><%= t("decidim.conferences.conferences.show.login_as", name: current_user.name, email: current_user.email ) %></p>
93
+ </div>
94
+ <div>
95
+ <% if current_participatory_space.has_registration_for?(current_user) %>
96
+ <%= link_to t("decidim.conferences.conferences.show.manage_registration"), decidim_conferences.conference_registration_types_path(current_participatory_space), class: "button button__lg button__primary" %>
97
+ <% else %>
98
+ <%= link_to t("decidim.conferences.conferences.show.register"), decidim_conferences.conference_registration_types_path(current_participatory_space), class: "button button__lg button__secondary" %>
99
+ <% end %>
61
100
  </div>
62
101
  </div>
63
102
  <% else %>
64
- <%= render partial: "decidim/conferences/shared/conference_user_login" %>
103
+ <%= render partial: "decidim/devise/shared/login_boxes", locals: { scope: "decidim.conferences.conferences.show" } %>
65
104
  <% end %>
66
105
  </section>
67
106
  <% end %>
68
107
 
69
- <hr class="reset mt-none mb-m">
70
-
71
- <% unless translated_attribute(current_participatory_space.objectives).blank? %>
72
- <section class="section">
73
- <h3 class="section-heading"><%= t("conferences.show.objectives", scope: "decidim") %></h3>
74
- <%= decidim_sanitize_editor translated_attribute(current_participatory_space.objectives) %>
75
- </section>
76
- <% end %>
77
-
78
108
  <%= cell("decidim/conferences/linked_participatory_spaces", current_participatory_space) %>
79
109
 
80
110
  <% if current_participatory_space.show_statistics? %>
81
- <%= cell("decidim/statistics", stats.highlighted) %>
111
+ <section class="content-block" data-statistics>
112
+ <h2 class="h2 decorator"><%= t("decidim.statistics.headline") %></h2>
113
+ <%= cell("decidim/statistics", stats.collection) %>
114
+ </section>
82
115
  <% end %>
83
- </div>
84
- </div>
116
+
117
+ <% end %>
118
+ </main>
@@ -9,23 +9,37 @@ edit_link(
9
9
  )
10
10
  %>
11
11
 
12
- <div class="row">
13
- <div class="columns mediumlarge-12 conference-media">
14
- <% if @media_links.any? %>
15
- <section>
16
- <h3 class="section-heading"><%= t("media.index.title", scope: "decidim") %></h3>
17
- <p><%= t("media.index.description", scope: "decidim") %></p>
18
- </section>
19
- <hr class="reset mt-none mb-s">
20
- <div class="media-links">
21
- <ul class="list-reset">
22
- <% @media_links.each do |media_link| %>
23
- <%= cell "decidim/conferences/media_link", media_link %>
24
- <% end %>
25
- </ul>
12
+ <%# NOTE: this page does not use a regular layout %>
13
+ <main class="container">
14
+ <h1 class="title-decorator my-12">
15
+ <span class="not-sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %></span>
16
+ <span class="sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %> (<%= translated_attribute current_participatory_space.title %>)</span>
17
+ </h1>
18
+
19
+ <% if @media_links.any? %>
20
+ <section id="conference-media-links" class="conference__media-section">
21
+ <h2 class="h4 md:h3 decorator"><%= t("media.index.title", scope: "decidim") %></h2>
22
+ <p><%= t("media.index.description", scope: "decidim") %></p>
23
+
24
+ <div class="conference__media-links" data-conference-media-links>
25
+ <% @media_links.each do |media_link| %>
26
+ <%= cell "decidim/conferences/media_link", media_link %>
27
+ <% end %>
26
28
  </div>
27
- <hr class="reset mt-none mb-s">
28
- <% end %>
29
- <%= attachments_for_conference current_participatory_space %>
30
- </div>
31
- </div>
29
+ </section>
30
+ <% end %>
31
+
32
+ <% if current_participatory_space.attachments.any? %>
33
+ <section id="conference-media-photos" class="conference__media-section">
34
+ <h2 class="h4 md:h3 decorator"><%= t("decidim.application.photos.related_photos") %></h2>
35
+
36
+ <%= cell("decidim/photos_list", current_participatory_space.photos) %>
37
+ </section>
38
+
39
+ <section id="conference-media-documents" class="conference__media-section">
40
+ <h2 class="h4 md:h3 decorator"><%= t("decidim.application.documents.related_documents") %></h2>
41
+
42
+ <%= render partial: "decidim/application/documents", locals: { documents: current_participatory_space.documents } %>
43
+ </section>
44
+ <% end %>
45
+ </main>
@@ -8,23 +8,31 @@ edit_link(
8
8
  conference: current_participatory_space
9
9
  )
10
10
  %>
11
- <div class="row">
12
- <div class="columns mediumlarge-12">
13
- <section class="section">
14
- <h4 class="section-heading"><%= t("registration_types.index.register", scope: "decidim.conferences") %></h4>
15
- <% if current_user.present? %>
16
- <p><%= t(".login_as", name: current_user.name, email: current_user.email ) %></p>
17
- <% else %>
18
- <%= render partial: "decidim/conferences/shared/conference_user_login" %>
19
- <% end %>
20
- <% if collection.any? %>
21
- <p><%= t(".choose_an_option") %></p>
11
+
12
+ <%= append_javascript_pack_tag "decidim_conferences" %>
13
+ <%= append_stylesheet_pack_tag "decidim_conferences" %>
14
+
15
+ <%# NOTE: this page does not use a regular layout %>
16
+ <main class="container">
17
+
18
+ <section class="section">
19
+ <h1 class="title-decorator my-12">
20
+ <span class="not-sr-only"><%= t("registration_types.index.register", scope: "decidim.conferences") %></span>
21
+ <span class="sr-only"><%= t("registration_types.index.register", scope: "decidim.conferences") %> (<%= translated_attribute current_participatory_space.title %>)</span>
22
+ </h1>
23
+
24
+ <%= render partial: "decidim/devise/shared/login_boxes", locals: { scope: "decidim.conferences.conferences.show" } unless current_user %>
25
+
26
+ <% if collection.any? %>
27
+ <p class="conference__registration-container-title"><%= t(".choose_an_option") %></p>
28
+ <div class="conference__registration-container">
22
29
  <% collection.each do |registration_type| %>
23
30
  <%= cell "decidim/conferences/registration_type", registration_type, allowed: allowed_to?(:join, :conference, conference: current_participatory_space) %>
24
31
  <% end %>
25
- <% else %>
26
- <%= t("registration_types.index.no_registrations", scope: "decidim.conferences") %>
27
- <% end %>
28
- </section>
29
- </div>
30
- </div>
32
+ </div>
33
+ <% else %>
34
+ <%= cell("decidim/announcement", t("registration_types.index.no_registrations", scope: "decidim.conferences")) %>
35
+ <% end %>
36
+ </section>
37
+
38
+ </main>
@@ -1,17 +1,15 @@
1
- <% content_for :sidebar_menu_nav do %>
2
- <%= sidebar_menu(:conferences_admin_menu).render do
3
- public_page_link decidim_conferences.conference_path(current_participatory_space)
4
- end %>
5
- <% end %>
6
-
7
- <%= render "layouts/decidim/admin/application" do %>
8
- <div class="process-title">
9
- <div class="process-title-content">
10
- <%= link_to translated_attribute(current_participatory_space.title), decidim_conferences.conference_path(current_participatory_space), target: "_blank" %>
11
- </div>
12
- </div>
1
+ <% add_secondary_root_menu(:conferences_admin_menu) %>
13
2
 
14
- <div class="process-content">
15
- <%= yield %>
3
+ <% content_for :breadcrumb_context_menu do %>
4
+ <div class="process-title-content-breadcrumb-container-right">
5
+ <%= link_to decidim_conferences.conference_path(current_participatory_space), class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link", target: "_blank", data: { "external-link": false } do %>
6
+ <%= icon "eye-line" %>
7
+ <span>
8
+ <%= t("see_conference", scope: "decidim.admin.menu.conferences_submenu") %>
9
+ </span>
10
+ <% end %>
16
11
  </div>
17
12
  <% end %>
13
+ <%= render "layouts/decidim/admin/application" do %>
14
+ <%= yield %>
15
+ <% end %>
@@ -1,11 +1,16 @@
1
- <%= render "layouts/decidim/admin/application" do %>
2
- <div class="process-title">
3
- <div class="process-title-content">
4
- <%= link_to t("decidim.admin.titles.conferences"), decidim_conferences.conferences_path, target: "_blank" %>
5
- </div>
1
+ <% content_for :breadcrumb_context_menu do %>
2
+ <div class="process-title-content-breadcrumb-container-right">
3
+ <% if allowed_to? :create, :conference %>
4
+ <%= link_to new_conference_path, 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_conference", scope: "decidim.admin") %>
8
+ </span>
9
+ <% end %>
10
+ <% end %>
6
11
  </div>
12
+ <% end %>
7
13
 
8
- <div class="process-content">
9
- <%= yield %>
10
- </div>
14
+ <%= render "layouts/decidim/admin/application" do %>
15
+ <%= yield %>
11
16
  <% end %>
@@ -2,26 +2,16 @@
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
- <%= render "layouts/decidim/application" do %>
9
- <%= render partial: "layouts/decidim/conference_hero" %>
10
- <%= render partial: "layouts/decidim/conferences_nav" %>
11
- <%= cell "decidim/translation_bar", current_organization %>
12
- <div class="wrapper">
13
- <%= yield %>
14
- </div>
8
+ <%= append_javascript_pack_tag "decidim_conferences" %>
9
+ <%= append_stylesheet_pack_tag "decidim_conferences" %>
10
+
11
+ <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
15
12
 
16
- <% if content_for? :expanded %>
17
- <div class="expanded">
18
- <div class="wrapper wrapper--inner">
19
- <div class="row">
20
- <%= yield :expanded %>
21
- </div>
22
- </div>
23
- </div>
24
- <% end %>
13
+ <%= render "layouts/decidim/application" do %>
14
+ <%= yield %>
25
15
  <% end %>
26
16
 
27
17
  <% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
@@ -0,0 +1,6 @@
1
+ <li>
2
+ <%= link_to item[:url], class: "conference__nav-item" do %>
3
+ <%= item[:name] %>
4
+ <%= icon "arrow-right-line" %>
5
+ <% end %>
6
+ </li>
@@ -0,0 +1,6 @@
1
+ <%= append_javascript_pack_tag "decidim_conferences" %>
2
+ <%= append_stylesheet_pack_tag "decidim_conferences" %>
3
+
4
+ <%= render "layouts/decidim/application" do %>
5
+ <%= yield %>
6
+ <% end %>
data/config/assets.rb CHANGED
@@ -4,6 +4,6 @@ base_path = File.expand_path("..", __dir__)
4
4
 
5
5
  Decidim::Webpacker.register_path("#{base_path}/app/packs")
6
6
  Decidim::Webpacker.register_entrypoints(
7
+ decidim_conferences: "#{base_path}/app/packs/entrypoints/decidim_conferences.js",
7
8
  decidim_conferences_admin: "#{base_path}/app/packs/entrypoints/decidim_conferences_admin.js"
8
9
  )
9
- Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/conferences/conferences")
@@ -11,7 +11,7 @@
11
11
  # https://github.com/mileszs/wicked_pdf/blob/master/README.md
12
12
 
13
13
  WickedPdf.config = {
14
- # Path to the wkhtmltopdf executable: This usually isn't needed if using
14
+ # Path to the wkhtmltopdf executable: This usually is not needed if using
15
15
  # one of the wkhtmltopdf-binary family of gems.
16
16
  # exe_path: '/usr/local/bin/wkhtmltopdf',
17
17
  # or
@@ -6,7 +6,6 @@ ar:
6
6
  assemblies_ids: الجمعيات ذات الصلة
7
7
  available_slots: المواعيد المتاحة
8
8
  banner_image: صورة بانر
9
- consultations_ids: المشاورات ذات الصلة
10
9
  copy_categories: نسخ الفئات
11
10
  copy_components: نسخ المكونات
12
11
  copy_features: نسخ الميزات
@@ -58,18 +57,11 @@ ar:
58
57
  conference_meeting_ids: الاجتماعات ذات الصلة
59
58
  full_name: الاسم الكامل
60
59
  position: المنصب
61
- twitter_handle: معرّف X
62
60
  user_id: المستخدم
63
61
  conference_user_role:
64
62
  email: البريد الإلكتروني
65
63
  name: اسم
66
64
  role: وظيفة
67
- errors:
68
- models:
69
- conference_registration_invite:
70
- attributes:
71
- email:
72
- already_invited: تمت دعوة هذا البريد الإلكتروني بالفعل
73
65
  activerecord:
74
66
  models:
75
67
  decidim/conference:
@@ -97,7 +89,6 @@ ar:
97
89
  admin:
98
90
  actions:
99
91
  confirm: تؤكد
100
- new_conference: مؤتمر جديد
101
92
  send_diplomas: إرسال شهادات الحضور
102
93
  conference_copies:
103
94
  new:
@@ -158,7 +149,6 @@ ar:
158
149
  form:
159
150
  title: معلومات عامة
160
151
  index:
161
- not_published: غير منشور
162
152
  published: نشرت
163
153
  new:
164
154
  create: إنشاء
@@ -199,7 +189,6 @@ ar:
199
189
  conference_invites: تدعو
200
190
  conference_speakers: مكبرات الصوت
201
191
  diploma: شهادة حضور
202
- info: معلومات
203
192
  media_links: روابط الوسائط
204
193
  moderations: الإعتدال
205
194
  partners: شركاء
@@ -210,7 +199,6 @@ ar:
210
199
  conference:
211
200
  fields:
212
201
  created_at: أنشئت في
213
- promoted: سلط الضوء
214
202
  published: نشرت
215
203
  title: عنوان
216
204
  conference_speaker:
@@ -345,14 +333,14 @@ ar:
345
333
  select_user: اختر المشارك
346
334
  index:
347
335
  filter:
336
+ accepted: وافقت
348
337
  all: الكل
338
+ rejected: مرفوض
349
339
  sent: أرسلت
350
- filter_by: مصنف بواسطة
351
340
  invite_attendee: دعوة مشارك
352
341
  invites: تدعو
353
342
  search: بحث
354
343
  new:
355
- explanation: سيدعى المشارك للانضمام إلى مؤتمر. إذا لم يتم تسجيل بريدها الإلكتروني ، فستتم دعوتها إلى المنظمة أيضًا.
356
344
  invite: دعا
357
345
  new_invite: دعوة مشارك
358
346
  conference_registrations:
@@ -408,18 +396,11 @@ ar:
408
396
  cancel: إلغاء
409
397
  confirm: تؤكد
410
398
  show:
411
- free: حر
412
399
  going: حضور
413
400
  no_slots_available: لا فتحات المتاحة
414
401
  registration: التسجيل
415
402
  conference_program:
416
- program_meeting:
417
- content: المحتوى
418
- location: الموقع
419
- speakers: مكبرات الصوت
420
- streaming: تدفق
421
403
  show:
422
- day: يوم
423
404
  program: برنامج
424
405
  conference_registration_mailer:
425
406
  confirmation:
@@ -441,7 +422,6 @@ ar:
441
422
  invalid: حدثت مشكلة أثناء مغادرة هذا المؤتمر.
442
423
  success: لقد تركت المؤتمر بنجاح.
443
424
  conference_speaker:
444
- go_to_twitter: الذهاب إلى X
445
425
  more_info: مزيد من المعلومات
446
426
  personal_website: موقع الويب الشخصي
447
427
  show:
@@ -450,18 +430,12 @@ ar:
450
430
  conference_speaker_cell:
451
431
  personal_url:
452
432
  personal_website: موقع الويب الشخصي
453
- twitter_handle:
454
- go_to_twitter: انتقل إلى تويتر
455
- conference_speakers:
456
- index:
457
- speakers: مكبرات الصوت
458
433
  conferences:
459
434
  partners:
460
435
  collaborators: شركاء
461
436
  main_promotors: المنظمون
462
437
  show:
463
438
  login_as: تم تسجيل دخولك كـ %{name} <%{email}>
464
- make_conference_registration: 'اجعل تسجيلك في المؤتمر:'
465
439
  register: تسجيل
466
440
  content_blocks:
467
441
  highlighted_conferences:
@@ -469,11 +443,6 @@ ar:
469
443
  index:
470
444
  title: المؤتمرات
471
445
  mailer:
472
- conference_registration_mailer:
473
- confirmation:
474
- subject: تم تأكيد تسجيل مؤتمرك
475
- pending_validation:
476
- subject: تسجيل مؤتمرك في انتظار التأكيد
477
446
  invite_join_conference_mailer:
478
447
  invite:
479
448
  subject: دعوة للانضمام إلى مؤتمر
@@ -504,37 +473,18 @@ ar:
504
473
  pages:
505
474
  home:
506
475
  highlighted_conferences:
507
- active_conferences: المؤتمرات النشطة
508
- conferences_button_title: رابط إلى صفحة المؤتمرات لعرض جميع المؤتمرات
509
- photo:
510
- image:
511
- attributes:
512
- alt: صورة الوسائط
513
- show:
514
- close_modal: إغلاق مشروط
515
- photo: صورة
516
- photos_list:
517
- show:
518
- related_photos: صور
476
+ active_spaces: المؤتمرات النشطة
519
477
  registration_types:
520
478
  index:
521
479
  choose_an_option: 'اختر خيار التسجيل الخاص بك:'
522
- login_as: تم تسجيل دخولك كـ %{name} <%{email}>
523
480
  no_registrations: لا توجد تسجيلات
524
481
  register: تسجيل
525
482
  title: أنواع التسجيل
526
- shared:
527
- conference_user_login:
528
- already_account: هل تمتلك حسابًا مِن قبلُ على ديسيديم؟
529
- new_user: مستخدم جديد؟
530
- sign_in: تسجيل الدخول للتسجيل في المؤتمر
531
- sign_up: إنشاء حساب في decidim للتسجيل في المؤتمر
532
483
  show:
533
484
  details: تفاصيل
534
485
  introduction: المقدمة
535
486
  objectives: الأهداف
536
487
  related_assemblies: الجمعيات ذات الصلة
537
- related_consultations: المشاورات ذات الصلة
538
488
  related_participatory_processes: العمليات التشاركية ذات الصلة
539
489
  events:
540
490
  conferences:
@@ -573,10 +523,6 @@ ar:
573
523
  contextual: "<p>ال<strong>مؤتمر</strong> هو مجموعة من الاجتماعات المرتبة في برنامج ما، مع عدد من الأشخاص المدعوين كمتحدثين، وحقول أدخال نموذجيه للمعلومات الأخرى للمؤتمرات الكبيرة أو المناسبات الاجتماعية (التسجيل، قائمة بالمنظمات التي تدعم الحدث أو ترعاه، إلخ)..</p> <p>أمثلة: يمكن أن يكون المؤتمر حدثا ذا صلة بالنسبة لمنظمة ما وأعضائها، أو يتم في إطار عملية تشاركية أو في أعقاب مشاورات.</p>\n"
574
524
  page: "<p>ال<strong>مؤتمر</strong> هو مجموعة من الاجتماعات المرتبة في برنامج ما، مع عدد من الأشخاص المدعوين كمتحدثين، وحقول أدخال نموذجيه للمعلومات الأخرى للمؤتمرات الكبيرة أو المناسبات الاجتماعية (التسجيل، قائمة بالمنظمات التي تدعم الحدث أو ترعاه، إلخ)..</p> <p>أمثلة: يمكن أن يكون المؤتمر حدثا ذا صلة بالنسبة لمنظمة ما وأعضائها، أو يتم في إطار عملية تشاركية أو في أعقاب مشاورات.</p>\n"
575
525
  title: ما هي المؤتمرات؟
576
- log:
577
- value_types:
578
- conference_presenter:
579
- not_found: 'لم يتم العثور على المؤتمر في قاعدة البيانات (المعرف: %{id})'
580
526
  media:
581
527
  index:
582
528
  description: روابط حول هذا المؤتمر
@@ -593,9 +539,6 @@ ar:
593
539
  decidim:
594
540
  conference_hero:
595
541
  register: تسجيل
596
- conference_widgets:
597
- show:
598
- take_part: خذ جزء
599
542
  conferences:
600
543
  conference:
601
544
  more_info: مزيد من المعلومات
@@ -610,11 +553,7 @@ ar:
610
553
  few: "%{count} مؤتمرات"
611
554
  many: "%{count} مؤتمرات"
612
555
  other: "%{count} مؤتمرات"
613
- promoted_conference:
614
- more_info: مزيد من المعلومات
615
- take_part: خذ جزء
616
556
  conferences_nav:
617
- conference_menu_item: معلومات
618
557
  conference_partners_menu_item: شركاء
619
558
  conference_speaker_menu_item: مكبرات الصوت
620
559
  media: وسائل الإعلام