decidim-conferences 0.27.4 → 0.28.0.rc5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (231) 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 +3 -13
  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 +10 -3
  62. data/app/events/decidim/conferences/conference_registration_notification_event.rb +3 -3
  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 -2
  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/environment.rb +3 -0
  152. data/config/initializers/wicked_pdf.rb +1 -1
  153. data/config/locales/ar.yml +1 -68
  154. data/config/locales/bg.yml +0 -1
  155. data/config/locales/ca.yml +35 -55
  156. data/config/locales/cs.yml +40 -58
  157. data/config/locales/de.yml +37 -57
  158. data/config/locales/el.yml +11 -57
  159. data/config/locales/en.yml +36 -56
  160. data/config/locales/es-MX.yml +34 -54
  161. data/config/locales/es-PY.yml +34 -54
  162. data/config/locales/es.yml +33 -53
  163. data/config/locales/eu.yml +179 -198
  164. data/config/locales/fi-plain.yml +33 -53
  165. data/config/locales/fi.yml +39 -59
  166. data/config/locales/fr-CA.yml +33 -53
  167. data/config/locales/fr.yml +34 -54
  168. data/config/locales/ga-IE.yml +0 -17
  169. data/config/locales/gl.yml +1 -68
  170. data/config/locales/hu.yml +15 -57
  171. data/config/locales/id-ID.yml +1 -62
  172. data/config/locales/it.yml +2 -68
  173. data/config/locales/ja.yml +34 -55
  174. data/config/locales/lb.yml +1 -59
  175. data/config/locales/lt.yml +21 -54
  176. data/config/locales/lv.yml +1 -65
  177. data/config/locales/nl.yml +1 -68
  178. data/config/locales/no.yml +1 -68
  179. data/config/locales/pl.yml +1 -66
  180. data/config/locales/pt-BR.yml +1 -68
  181. data/config/locales/pt.yml +1 -68
  182. data/config/locales/ro-RO.yml +11 -56
  183. data/config/locales/sk.yml +1 -65
  184. data/config/locales/sl.yml +0 -3
  185. data/config/locales/sq-AL.yml +1 -0
  186. data/config/locales/sr-CS.yml +0 -5
  187. data/config/locales/sv.yml +7 -67
  188. data/config/locales/th-TH.yml +1 -0
  189. data/config/locales/tr-TR.yml +12 -66
  190. data/config/locales/zh-CN.yml +1 -65
  191. data/config/locales/zh-TW.yml +6 -53
  192. data/db/migrate/20221116084952_add_weight_to_conferences.rb +7 -0
  193. data/lib/decidim/api/conference_speaker_type.rb +1 -1
  194. data/lib/decidim/conferences/admin_engine.rb +14 -138
  195. data/lib/decidim/conferences/content_blocks/registry_manager.rb +21 -0
  196. data/lib/decidim/conferences/engine.rb +17 -15
  197. data/lib/decidim/conferences/menu.rb +182 -0
  198. data/lib/decidim/conferences/participatory_space.rb +6 -200
  199. data/lib/decidim/conferences/query_extensions.rb +2 -2
  200. data/lib/decidim/conferences/seeds.rb +153 -0
  201. data/lib/decidim/conferences/test/factories.rb +10 -9
  202. data/lib/decidim/conferences/version.rb +1 -1
  203. metadata +46 -46
  204. data/app/cells/decidim/conferences/conference_address/show.erb +0 -11
  205. data/app/cells/decidim/conferences/conference_address_cell.rb +0 -11
  206. data/app/cells/decidim/conferences/conference_m/footer.erb +0 -9
  207. data/app/cells/decidim/conferences/conference_m/tags.erb +0 -1
  208. data/app/cells/decidim/conferences/conference_m_cell.rb +0 -42
  209. data/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb +0 -30
  210. data/app/cells/decidim/conferences/photo/show.erb +0 -26
  211. data/app/cells/decidim/conferences/photo_cell.rb +0 -41
  212. data/app/cells/decidim/conferences/photos_list/show.erb +0 -8
  213. data/app/cells/decidim/conferences/photos_list_cell.rb +0 -18
  214. data/app/commands/decidim/conferences/admin/create_conference_admin.rb +0 -114
  215. data/app/commands/decidim/conferences/admin/destroy_conference_admin.rb +0 -58
  216. data/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb +0 -22
  217. data/app/commands/decidim/conferences/admin/unpublish_conference.rb +0 -39
  218. data/app/commands/decidim/conferences/admin/update_conference_admin.rb +0 -53
  219. data/app/controllers/decidim/conferences/conference_widgets_controller.rb +0 -23
  220. data/app/queries/decidim/conferences/admin/conference_invites.rb +0 -60
  221. data/app/views/decidim/conferences/_order_by_conferences.html.erb +0 -3
  222. data/app/views/decidim/conferences/conferences/_promoted_conference.html.erb +0 -27
  223. data/app/views/decidim/conferences/media/_attachments.html.erb +0 -6
  224. data/app/views/decidim/conferences/shared/_conference_user_login.html.erb +0 -14
  225. data/app/views/layouts/decidim/_conference_hero.html.erb +0 -42
  226. data/app/views/layouts/decidim/_conferences_nav.html.erb +0 -46
  227. data/db/seeds/Exampledocument.pdf +0 -0
  228. data/db/seeds/city.jpeg +0 -0
  229. data/db/seeds/city2.jpeg +0 -0
  230. data/db/seeds/homepage_image.jpg +0 -0
  231. data/db/seeds/logo.png +0 -0
@@ -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")
@@ -0,0 +1,3 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Empty line for playing nice with tpope/vim-rails
@@ -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: مُعرّف حساب تويتر
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:
@@ -333,9 +321,6 @@ ar:
333
321
  title: مكبرات الصوت
334
322
  conferences:
335
323
  admin:
336
- conference_copies:
337
- form:
338
- slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذا المؤتمر. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'
339
324
  conference_invites:
340
325
  create:
341
326
  error: حدثت مشكلة أثناء دعوة المشارك للانضمام إلى المؤتمر.
@@ -352,12 +337,10 @@ ar:
352
337
  all: الكل
353
338
  rejected: مرفوض
354
339
  sent: أرسلت
355
- filter_by: مصنف بواسطة
356
340
  invite_attendee: دعوة مشارك
357
341
  invites: تدعو
358
342
  search: بحث
359
343
  new:
360
- explanation: سيدعى المشارك للانضمام إلى مؤتمر. إذا لم يتم تسجيل بريدها الإلكتروني ، فستتم دعوتها إلى المنظمة أيضًا.
361
344
  invite: دعا
362
345
  new_invite: دعوة مشارك
363
346
  conference_registrations:
@@ -381,7 +364,6 @@ ar:
381
364
  few: كان هناك %{count} التسجيلات.
382
365
  many: كان هناك %{count} التسجيلات.
383
366
  other: كان هناك %{count} التسجيلات.
384
- slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذا المؤتمر. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'
385
367
  diplomas:
386
368
  edit:
387
369
  save: حفظ
@@ -414,18 +396,11 @@ ar:
414
396
  cancel: إلغاء
415
397
  confirm: تؤكد
416
398
  show:
417
- free: حر
418
399
  going: حضور
419
400
  no_slots_available: لا فتحات المتاحة
420
401
  registration: التسجيل
421
402
  conference_program:
422
- program_meeting:
423
- content: المحتوى
424
- location: الموقع
425
- speakers: مكبرات الصوت
426
- streaming: تدفق
427
403
  show:
428
- day: يوم
429
404
  program: برنامج
430
405
  conference_registration_mailer:
431
406
  confirmation:
@@ -447,7 +422,6 @@ ar:
447
422
  invalid: حدثت مشكلة أثناء مغادرة هذا المؤتمر.
448
423
  success: لقد تركت المؤتمر بنجاح.
449
424
  conference_speaker:
450
- go_to_twitter: انتقل إلى تويتر
451
425
  more_info: مزيد من المعلومات
452
426
  personal_website: موقع الويب الشخصي
453
427
  show:
@@ -456,18 +430,12 @@ ar:
456
430
  conference_speaker_cell:
457
431
  personal_url:
458
432
  personal_website: موقع الويب الشخصي
459
- twitter_handle:
460
- go_to_twitter: انتقل إلى تويتر
461
- conference_speakers:
462
- index:
463
- speakers: مكبرات الصوت
464
433
  conferences:
465
434
  partners:
466
435
  collaborators: شركاء
467
436
  main_promotors: المنظمون
468
437
  show:
469
438
  login_as: تم تسجيل دخولك كـ %{name} <%{email}>
470
- make_conference_registration: 'اجعل تسجيلك في المؤتمر:'
471
439
  register: تسجيل
472
440
  content_blocks:
473
441
  highlighted_conferences:
@@ -475,11 +443,6 @@ ar:
475
443
  index:
476
444
  title: المؤتمرات
477
445
  mailer:
478
- conference_registration_mailer:
479
- confirmation:
480
- subject: تم تأكيد تسجيل مؤتمرك
481
- pending_validation:
482
- subject: تسجيل مؤتمرك في انتظار التأكيد
483
446
  invite_join_conference_mailer:
484
447
  invite:
485
448
  subject: دعوة للانضمام إلى مؤتمر
@@ -510,37 +473,18 @@ ar:
510
473
  pages:
511
474
  home:
512
475
  highlighted_conferences:
513
- active_conferences: المؤتمرات النشطة
514
- conferences_button_title: رابط إلى صفحة المؤتمرات لعرض جميع المؤتمرات
515
- photo:
516
- image:
517
- attributes:
518
- alt: صورة الوسائط
519
- show:
520
- close_modal: إغلاق مشروط
521
- photo: صورة
522
- photos_list:
523
- show:
524
- related_photos: صور
476
+ active_spaces: المؤتمرات النشطة
525
477
  registration_types:
526
478
  index:
527
479
  choose_an_option: 'اختر خيار التسجيل الخاص بك:'
528
- login_as: تم تسجيل دخولك كـ %{name} <%{email}>
529
480
  no_registrations: لا توجد تسجيلات
530
481
  register: تسجيل
531
482
  title: أنواع التسجيل
532
- shared:
533
- conference_user_login:
534
- already_account: هل تمتلك حسابًا مِن قبلُ على ديسيديم؟
535
- new_user: مستخدم جديد؟
536
- sign_in: تسجيل الدخول للتسجيل في المؤتمر
537
- sign_up: إنشاء حساب في decidim للتسجيل في المؤتمر
538
483
  show:
539
484
  details: تفاصيل
540
485
  introduction: المقدمة
541
486
  objectives: الأهداف
542
487
  related_assemblies: الجمعيات ذات الصلة
543
- related_consultations: المشاورات ذات الصلة
544
488
  related_participatory_processes: العمليات التشاركية ذات الصلة
545
489
  events:
546
490
  conferences:
@@ -579,10 +523,6 @@ ar:
579
523
  contextual: "<p>ال<strong>مؤتمر</strong> هو مجموعة من الاجتماعات المرتبة في برنامج ما، مع عدد من الأشخاص المدعوين كمتحدثين، وحقول أدخال نموذجيه للمعلومات الأخرى للمؤتمرات الكبيرة أو المناسبات الاجتماعية (التسجيل، قائمة بالمنظمات التي تدعم الحدث أو ترعاه، إلخ)..</p> <p>أمثلة: يمكن أن يكون المؤتمر حدثا ذا صلة بالنسبة لمنظمة ما وأعضائها، أو يتم في إطار عملية تشاركية أو في أعقاب مشاورات.</p>\n"
580
524
  page: "<p>ال<strong>مؤتمر</strong> هو مجموعة من الاجتماعات المرتبة في برنامج ما، مع عدد من الأشخاص المدعوين كمتحدثين، وحقول أدخال نموذجيه للمعلومات الأخرى للمؤتمرات الكبيرة أو المناسبات الاجتماعية (التسجيل، قائمة بالمنظمات التي تدعم الحدث أو ترعاه، إلخ)..</p> <p>أمثلة: يمكن أن يكون المؤتمر حدثا ذا صلة بالنسبة لمنظمة ما وأعضائها، أو يتم في إطار عملية تشاركية أو في أعقاب مشاورات.</p>\n"
581
525
  title: ما هي المؤتمرات؟
582
- log:
583
- value_types:
584
- conference_presenter:
585
- not_found: 'لم يتم العثور على المؤتمر في قاعدة البيانات (المعرف: %{id})'
586
526
  media:
587
527
  index:
588
528
  description: روابط حول هذا المؤتمر
@@ -599,9 +539,6 @@ ar:
599
539
  decidim:
600
540
  conference_hero:
601
541
  register: تسجيل
602
- conference_widgets:
603
- show:
604
- take_part: خذ جزء
605
542
  conferences:
606
543
  conference:
607
544
  more_info: مزيد من المعلومات
@@ -616,11 +553,7 @@ ar:
616
553
  few: "%{count} مؤتمرات"
617
554
  many: "%{count} مؤتمرات"
618
555
  other: "%{count} مؤتمرات"
619
- promoted_conference:
620
- more_info: مزيد من المعلومات
621
- take_part: خذ جزء
622
556
  conferences_nav:
623
- conference_menu_item: معلومات
624
557
  conference_partners_menu_item: شركاء
625
558
  conference_speaker_menu_item: مكبرات الصوت
626
559
  media: وسائل الإعلام
@@ -5,4 +5,3 @@ bg:
5
5
  conference:
6
6
  assemblies_ids: Свързани събрания
7
7
  banner_image: Банер изображение
8
- consultations_ids: Свързани консултации