decidim-conferences 0.27.5 → 0.28.0.rc4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (228) 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 +9 -2
  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/initializers/wicked_pdf.rb +1 -1
  152. data/config/locales/ar.yml +3 -62
  153. data/config/locales/bg.yml +0 -1
  154. data/config/locales/ca.yml +33 -53
  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 +31 -51
  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 -51
  170. data/config/locales/id-ID.yml +3 -57
  171. data/config/locales/it.yml +4 -62
  172. data/config/locales/ja.yml +34 -53
  173. data/config/locales/lb.yml +1 -55
  174. data/config/locales/lt.yml +14 -52
  175. data/config/locales/lv.yml +1 -60
  176. data/config/locales/nl.yml +3 -62
  177. data/config/locales/no.yml +1 -62
  178. data/config/locales/pl.yml +1 -78
  179. data/config/locales/pt-BR.yml +1 -63
  180. data/config/locales/pt.yml +2 -63
  181. data/config/locales/ro-RO.yml +13 -50
  182. data/config/locales/sk.yml +1 -60
  183. data/config/locales/sl.yml +0 -2
  184. data/config/locales/sr-CS.yml +0 -5
  185. data/config/locales/sv.yml +7 -62
  186. data/config/locales/tr-TR.yml +13 -61
  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 +10 -9
  198. data/lib/decidim/conferences/version.rb +1 -1
  199. metadata +44 -47
  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 -42
  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 -23
  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/environment.rb +0 -3
  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
@@ -1,32 +1,31 @@
1
- <div class="attendee-fields">
2
- <div class="row column">
3
- <fieldset class="check-radio-collection">
4
- <legend><%= t(".attendee_type") %></legend>
5
- <%= form.collection_radio_buttons(:existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], :last, :first) %>
6
- </fieldset>
7
- </div>
1
+ <div class="form__wrapper">
2
+ <div class="card attendee-fields pt-4">
3
+ <div class="row column">
4
+ <fieldset class="check-radio-collection">
5
+ <legend><%= t(".attendee_type") %></legend>
6
+ <%= form.collection_radio_buttons(:existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], :last, :first) %>
7
+ </fieldset>
8
+ </div>
8
9
 
9
- <div class="text-warning attendee-fields--new-user">
10
- <p><%= t(".invite_explanation") %></p>
11
- </div>
10
+ <div class="row column text-warning attendee-fields--new-user">
11
+ <p><%= t(".invite_explanation") %></p>
12
+ </div>
12
13
 
13
- <div class="grid-x grid-margin-x">
14
- <div class="auto cell attendee-fields--new-user">
14
+ <div class="row column auto cell attendee-fields--new-user">
15
15
  <%= form.text_field :name %>
16
16
  </div>
17
- <div class="auto cell attendee-fields--new-user">
17
+ <div class="row column auto cell attendee-fields--new-user">
18
18
  <%= form.text_field :email %>
19
19
  </div>
20
20
 
21
- <div class="auto cell attendee-fields--user-picker">
21
+ <div class="row column auto cell attendee-fields--user-picker">
22
22
  <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
23
23
  <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false, class: "autocomplete-field--results-inline" }, prompt_options) do |user|
24
24
  { value: user.id, label: "#{user.name} (@#{user.nickname})" }
25
25
  end %>
26
26
  </div>
27
- </div>
28
- <div class="grid-x grid-margin-x">
29
- <div class="auto cell">
27
+
28
+ <div class="row column auto cell">
30
29
  <%= form.select :registration_type_id,
31
30
  options_for_select(@form.registration_types_for_select),
32
31
  { include_blank: false },
@@ -34,5 +33,4 @@
34
33
  </div>
35
34
  </div>
36
35
  </div>
37
-
38
- <%= javascript_pack_tag "decidim_conferences_admin" %>
36
+ <%= append_javascript_pack_tag "decidim_conferences_admin" %>
@@ -1,88 +1,83 @@
1
1
  <% add_decidim_page_title(t(".invites")) %>
2
- <div class="filters row">
3
- <div class="column medium-3">
4
- <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
5
- <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-click-open="true" data-close-on-click-inside="false">
6
- <li class="is-dropdown-submenu-parent">
7
- <a href="#">
8
- <% if @status.present? %>
9
- <%= t(".filter.#{@status}") %>
10
- <% else %>
11
- <%= t(".filter.all") %>
12
- <% end %>
13
- </a>
14
- <ul class="menu is-dropdown-submenu">
15
- <li><%= link_to t(".filter.sent"), url_for(status: "sent", q: @query) %></li>
16
- <li><%= link_to t(".filter.accepted"), url_for(status: "accepted", q: @query) %></li>
17
- <li><%= link_to t(".filter.rejected"), url_for(status: "rejected", q: @query) %></li>
18
- <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
19
- </ul>
20
- </li>
21
- </ul>
2
+
3
+ <div class="card" id="conference-invites">
4
+ <div class="item_show__header">
5
+ <h2 class="item_show__header-title">
6
+ <%= t(".invites") %>
7
+ <%= link_to t(".invite_attendee"), conference.registrations_enabled ? new_conference_conference_invite_path(conference) : "#", class: "button button__sm button__secondary #{"disabled" unless conference.registrations_enabled && allowed_to?(:invite_attendee, :conference, conference:)}" %>
8
+ </h2>
22
9
  </div>
23
- <div class="column medium-4">
24
- <%= form_tag "", method: :get do %>
25
- <div class="filters__search">
10
+
11
+ <%# NOTE: this old filters section should be refactorized in order to use the shared admin_filter_selector method
12
+ it would require the definition of concerns similar to decidim-conferences/app/controllers/concerns/decidim/conferences/admin/filterable.rb %>
13
+ <div class="filters__section">
14
+ <div class="fcell">
15
+ <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
16
+ <li class="is-dropdown-submenu-parent">
17
+ <a href="#" class="dropdown button">
18
+ <%= t("filter_label", scope: "decidim.admin.filters") %>
19
+ <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
20
+ </a>
21
+ <ul class="menu is-dropdown-submenu">
22
+ <li><%= link_to t(".filter.sent"), url_for(status: "sent", q: @query) %></li>
23
+ <li><%= link_to t(".filter.accepted"), url_for(status: "accepted", q: @query) %></li>
24
+ <li><%= link_to t(".filter.rejected"), url_for(status: "rejected", q: @query) %></li>
25
+ <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
26
+ </ul>
27
+ </li>
28
+ </ul>
29
+ </div>
30
+ <div class="fcell search">
31
+ <%= form_tag "", method: :get do %>
26
32
  <div class="input-group">
27
33
  <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
28
34
  <%= hidden_field_tag :state, @state %>
29
35
  <div class="input-group-button">
30
- <button type="submit" class="button">
31
- <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
36
+ <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
37
+ <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
32
38
  </button>
33
39
  </div>
34
40
  </div>
35
- </div>
36
- <% end %>
37
- </div>
38
- </div>
39
-
40
- <div class="card" id="conference-invites">
41
- <div class="card-divider">
42
- <h2 class="card-title">
43
- <%= t(".invites") %>
44
- <%= link_to t(".invite_attendee"), conference.registrations_enabled ? new_conference_conference_invite_path(conference) : "#", class: "button tiny button--title #{'disabled' unless conference.registrations_enabled && allowed_to?(:invite_attendee, :conference, conference: conference) }" %>
45
- </h2>
41
+ <% end %>
42
+ </div>
46
43
  </div>
47
44
 
48
- <div class="card-section">
49
- <div class="table-scroll">
50
- <table class="table-list">
51
- <thead>
52
- <tr>
53
- <th><%= t("models.conference_invite.fields.name", scope: "decidim.conferences") %></th>
54
- <th><%= t("models.conference_invite.fields.email", scope: "decidim.conferences") %></th>
55
- <th><%= t("models.conference_invite.fields.sent_at", scope: "decidim.conferences") %></th>
56
- <th><%= t("models.conference_invite.fields.status", scope: "decidim.conferences") %></th>
57
- <th><%= t("models.conference_invite.fields.registration_type", scope: "decidim.conferences") %></th>
45
+ <div class="table-scroll">
46
+ <table class="table-list">
47
+ <thead>
48
+ <tr>
49
+ <th><%= t("models.conference_invite.fields.name", scope: "decidim.conferences") %></th>
50
+ <th><%= t("models.conference_invite.fields.email", scope: "decidim.conferences") %></th>
51
+ <th><%= t("models.conference_invite.fields.sent_at", scope: "decidim.conferences") %></th>
52
+ <th><%= t("models.conference_invite.fields.status", scope: "decidim.conferences") %></th>
53
+ <th><%= t("models.conference_invite.fields.registration_type", scope: "decidim.conferences") %></th>
54
+ </tr>
55
+ </thead>
56
+ <tbody>
57
+ <% @conference_invites.each do |invite| %>
58
+ <% presenter = Decidim::Conferences::ConferenceInvitePresenter.new(invite) %>
59
+ <tr data-id="<%= invite.id %>">
60
+ <td>
61
+ <%= invite.user.name %>
62
+ </td>
63
+ <td>
64
+ <%= invite.user.email %>
65
+ </td>
66
+ <td>
67
+ <% if invite.sent_at %>
68
+ <%= l invite.sent_at, format: :long %>
69
+ <% end %>
70
+ </td>
71
+ <td class="<%= presenter.status_html_class %>">
72
+ <%= presenter.status %>
73
+ </td>
74
+ <td>
75
+ <%= translated_attribute(invite.registration_type.title) %>
76
+ </td>
58
77
  </tr>
59
- </thead>
60
- <tbody>
61
- <% @conference_invites.each do |invite| %>
62
- <% presenter = Decidim::Conferences::ConferenceInvitePresenter.new(invite) %>
63
- <tr data-id="<%= invite.id %>">
64
- <td>
65
- <%= invite.user.name %>
66
- </td>
67
- <td>
68
- <%= invite.user.email %>
69
- </td>
70
- <td>
71
- <% if invite.sent_at %>
72
- <%= l invite.sent_at, format: :long %>
73
- <% end %>
74
- </td>
75
- <td class="<%= presenter.status_html_class %>">
76
- <%= presenter.status %>
77
- </td>
78
- <td>
79
- <%= translated_attribute(invite.registration_type.title) %>
80
- </td>
81
- </tr>
82
- <% end %>
83
- </tbody>
84
- </table>
85
- <%= paginate @conference_invites, theme: "decidim" %>
86
- </div>
78
+ <% end %>
79
+ </tbody>
80
+ </table>
87
81
  </div>
82
+ <%= decidim_paginate @conference_invites %>
88
83
  </div>
@@ -1,22 +1,26 @@
1
1
  <% add_decidim_page_title(t(".new_invite")) %>
2
- <h2 class="process-title-summary">
3
- <%= t(".new_invite") %>
4
- </h2>
5
2
 
6
- <div class="section">
7
- <div class="callout warning">
8
- <p><%= t(".explanation") %></p>
9
- </div>
10
- </div>
3
+ <%= cell("decidim/announcement", t(".explanation"), callout_class: "warning") %>
11
4
 
12
- <%= decidim_form_for(@form, url: conference_conference_invites_path, method: :post, html: { class: "form new_conference_registration_invite" }) do |f| %>
13
- <div class="card">
14
- <div class="card-section">
15
- <%= render partial: "form", object: f %>
16
- </div>
17
- </div>
5
+ <div class="item_show__header">
6
+ <h2 class="item_show__header-title">
7
+ <%= t(".new_invite") %>
8
+ </h2>
9
+ </div>
18
10
 
19
- <div class="button--double form-general-submit">
20
- <%= f.submit t(".invite") %>
11
+ <div class="item__edit item__edit-1col">
12
+ <div class="item__edit-form">
13
+ <%= decidim_form_for(@form, url: conference_conference_invites_path, method: :post, html: { class: "form form-defaults new_conference_registration_invite" }) do |f| %>
14
+ <div class="card">
15
+ <div class="card-section">
16
+ <%= render partial: "form", object: f %>
17
+ </div>
18
+ </div>
19
+ <div class="item__edit-sticky">
20
+ <div class="item__edit-sticky-container">
21
+ <%= f.submit t(".invite"), class: "button button__sm button__secondary" %>
22
+ </div>
23
+ </div>
24
+ <% end %>
21
25
  </div>
22
- <% end %>
26
+ </div>
@@ -1,60 +1,60 @@
1
1
  <% add_decidim_page_title(t(".registrations")) %>
2
2
  <div class="card" id="conference-registrations">
3
- <div class="card-divider">
4
- <h2 class="card-title">
3
+ <div class="item_show__header">
4
+ <h2 class="item_show__header-title">
5
5
  <%= t(".registrations") %>
6
6
  <% if allowed_to? :export_conference_registrations, :conference, conference: conference %>
7
- <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
7
+ <span class="exports button button__sm button__secondary button--simple button--title" data-toggle="export-dropdown">
8
+ <%= t "actions.export", scope: "decidim.admin" %>
9
+ <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
10
+ </span>
8
11
  <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
9
12
  <ul class="vertical menu add-components">
10
- <% %w{CSV JSON Excel}.each do |format| %>
11
- <li class="exports--format--<%= format.downcase %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.admin.conferences.exports.registrations"), export_format: format), export_conference_conference_registrations_path(conference_id: conference, format: format) %></li>
13
+ <% %w(CSV JSON Excel).each do |format| %>
14
+ <li class="exports--format--<%= format.downcase %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.admin.conferences.exports.registrations"), export_format: format), export_conference_conference_registrations_path(conference_id: conference, format:) %></li>
12
15
  <% end %>
13
16
  </ul>
14
17
  </div>
15
18
  <% end %>
16
19
  </h2>
17
20
  </div>
18
-
19
- <div class="card-section">
20
- <div class="table-scroll">
21
- <table class="table-list">
22
- <thead>
23
- <tr>
24
- <th><%= t("models.conference_registration.fields.name", scope: "decidim.conferences") %></th>
25
- <th><%= t("models.conference_registration.fields.email", scope: "decidim.conferences") %></th>
26
- <th><%= t("models.conference_registration.fields.registration_type", scope: "decidim.conferences") %></th>
27
- <th><%= t("models.conference_registration.fields.state", scope: "decidim.conferences") %></th>
28
- <th></th>
29
- </tr>
30
- </thead>
31
- <tbody>
32
- <% @conference_registrations.each do |registration| %>
33
- <tr data-id="<%= registration.id %>">
34
- <td>
35
- <%= registration.user.name %>
36
- </td>
37
- <td>
38
- <%= registration.user.email %>
39
- </td>
40
- <td>
41
- <%= translated_attribute(registration.registration_type.title) %>
42
- </td>
43
- <td>
44
- <%= t("models.conference_registration.fields.states.#{registration.confirmed? ? "confirmed" : "pending"}", scope: "decidim.conferences") %>
45
- </td>
46
- <td>
47
- <% if allowed_to?(:confirm, :conference_registration, conference_registration: registration) %>
48
- <% if !registration.confirmed? %>
49
- <%= icon_link_to "check", confirm_conference_conference_registration_path(current_conference, registration), t("actions.confirm", scope: "decidim.admin"), class: "action-icon--publish", method: :post %>
50
- <% end %>
21
+ <div class="table-scroll">
22
+ <table class="table-list">
23
+ <thead>
24
+ <tr>
25
+ <th><%= t("models.conference_registration.fields.name", scope: "decidim.conferences") %></th>
26
+ <th><%= t("models.conference_registration.fields.email", scope: "decidim.conferences") %></th>
27
+ <th><%= t("models.conference_registration.fields.registration_type", scope: "decidim.conferences") %></th>
28
+ <th><%= t("models.conference_registration.fields.state", scope: "decidim.conferences") %></th>
29
+ <th></th>
30
+ </tr>
31
+ </thead>
32
+ <tbody>
33
+ <% @conference_registrations.each do |registration| %>
34
+ <tr data-id="<%= registration.id %>">
35
+ <td>
36
+ <%= registration.user.name %>
37
+ </td>
38
+ <td>
39
+ <%= registration.user.email %>
40
+ </td>
41
+ <td>
42
+ <%= translated_attribute(registration.registration_type.title) %>
43
+ </td>
44
+ <td>
45
+ <%= t("models.conference_registration.fields.states.#{registration.confirmed? ? "confirmed" : "pending"}", scope: "decidim.conferences") %>
46
+ </td>
47
+ <td>
48
+ <% if allowed_to?(:confirm, :conference_registration, conference_registration: registration) %>
49
+ <% if !registration.confirmed? %>
50
+ <%= icon_link_to "check-line", confirm_conference_conference_registration_path(current_conference, registration), t("actions.confirm", scope: "decidim.admin"), class: "action-icon--publish", method: :post %>
51
51
  <% end %>
52
- </td>
53
- </tr>
54
- <% end %>
55
- </tbody>
56
- </table>
57
- <%= paginate @conference_registrations, theme: "decidim" %>
58
- </div>
52
+ <% end %>
53
+ </td>
54
+ </tr>
55
+ <% end %>
56
+ </tbody>
57
+ </table>
59
58
  </div>
59
+ <%= decidim_paginate @conference_registrations %>
60
60
  </div>
@@ -1,61 +1,57 @@
1
- <div class="card">
2
- <div class="card-divider">
3
- <h2 class="card-title">
4
- <%= title %>
5
- </h2>
6
- </div>
1
+ <div class="form__wrapper">
2
+ <div class="card pt-4">
3
+ <div class="card-section">
4
+ <div class="user-fields">
5
+ <div class="row column">
6
+ <%= form.select :existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], label: t(".user_type") %>
7
+ </div>
8
+
9
+ <div class="row column user-fields--full-name">
10
+ <%= form.text_field :full_name, autofocus: true %>
11
+ </div>
12
+
13
+ <div class="row column user-fields--user-picker">
14
+ <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
15
+ <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false }, prompt_options) do |user|
16
+ { value: user.id, label: "#{user.name} (@#{user.nickname})" }
17
+ end %>
18
+ </div>
19
+ </div>
7
20
 
8
- <div class="card-section">
9
- <div class="user-fields">
10
21
  <div class="row column">
11
- <%= form.select :existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], label: t(".user_type") %>
22
+ <% if @form.meetings %>
23
+ <%= form.select :conference_meeting_ids,
24
+ options_for_select(@form.meetings, selected: meetings_selected ),
25
+ { include_blank: true },
26
+ { multiple: true, class: "chosen-select" } %>
27
+ <% end %>
12
28
  </div>
13
29
 
14
- <div class="row column user-fields--full-name">
15
- <%= form.text_field :full_name, autofocus: true %>
30
+ <div class="row column">
31
+ <%= form.translated :text_field, :position, aria: { label: :position } %>
16
32
  </div>
17
33
 
18
- <div class="row column user-fields--user-picker">
19
- <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
20
- <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false }, prompt_options) do |user|
21
- { value: user.id, label: "#{user.name} (@#{user.nickname})" }
22
- end %>
34
+ <div class="row column">
35
+ <%= form.translated :text_field, :affiliation, aria: { label: :affiliation } %>
23
36
  </div>
24
- </div>
25
-
26
- <div class="row column">
27
- <% if @form.meetings %>
28
- <%= form.select :conference_meeting_ids,
29
- options_for_select(@form.meetings, selected: meetings_selected ),
30
- { include_blank: true },
31
- { multiple: true, class: "chosen-select" } %>
32
- <% end %>
33
- </div>
34
-
35
- <div class="row column">
36
- <%= form.translated :text_field, :position %>
37
- </div>
38
-
39
- <div class="row column">
40
- <%= form.translated :text_field, :affiliation %>
41
- </div>
42
37
 
43
- <div class="row column">
44
- <%= form.translated :editor, :short_bio %>
45
- </div>
38
+ <div class="row column">
39
+ <%= form.translated :editor, :short_bio, aria: { label: :short_bio } %>
40
+ </div>
46
41
 
47
- <div class="row column">
48
- <%= form.text_field :twitter_handle %>
49
- </div>
42
+ <div class="row column">
43
+ <%= form.text_field :twitter_handle %>
44
+ </div>
50
45
 
51
- <div class="row column">
52
- <%= form.url_field :personal_url %>
53
- </div>
46
+ <div class="row column">
47
+ <%= form.url_field :personal_url %>
48
+ </div>
54
49
 
55
- <div class="row column">
56
- <%= form.upload :avatar %>
50
+ <div class="row column">
51
+ <%= form.upload :avatar, button_class: "button button__sm button__transparent-secondary" %>
52
+ </div>
57
53
  </div>
58
54
  </div>
59
55
  </div>
60
56
 
61
- <%= javascript_pack_tag "decidim_conferences_admin" %>
57
+ <%= append_javascript_pack_tag "decidim_conferences_admin" %>
@@ -1,8 +1,18 @@
1
1
  <% add_decidim_page_title(t("conference_speakers.edit.title", scope: "decidim.admin")) %>
2
- <%= decidim_form_for(@form, url: conference_speaker_path(conference_speaker.conference, conference_speaker), html: { class: "form edit_conference_speaker" }) do |f| %>
3
- <%= render partial: "form", object: f, locals: { title: t("conference_speakers.edit.title", scope: "decidim.admin") } %>
4
-
5
- <div class="button--double form-general-submit">
6
- <%= f.submit t("conference_speakers.edit.update", scope: "decidim.admin") %>
2
+ <div class="item_show__header">
3
+ <h2 class="item_show__header-title">
4
+ <%= t("conference_speakers.edit.title", scope: "decidim.admin") %>
5
+ </h2>
6
+ </div>
7
+ <div class="item__edit item__edit-1col">
8
+ <div class="item__edit-form">
9
+ <%= decidim_form_for(@form, url: conference_speaker_path(conference_speaker.conference, conference_speaker), html: { class: "form-defaults form edit_conference_speaker" }) do |f| %>
10
+ <%= render partial: "form", object: f %>
11
+ <div class="item__edit-sticky">
12
+ <div class="item__edit-sticky-container">
13
+ <%= f.submit t("conference_speakers.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
14
+ </div>
15
+ </div>
16
+ <% end %>
7
17
  </div>
8
- <% end %>
18
+ </div>
@@ -1,70 +1,67 @@
1
1
  <% add_decidim_page_title(t("conference_speakers.index.conference_speakers_title", scope: "decidim.admin")) %>
2
- <div class="filters row">
3
- <div class="column medium-4">
4
- <%= form_tag "", method: :get do %>
5
- <div class="filters__search">
2
+
3
+ <div class="card" id="conference_speakers">
4
+ <div class="item_show__header">
5
+ <h2 class="item_show__header-title">
6
+ <%= t("conference_speakers.index.conference_speakers_title", scope: "decidim.admin") %>
7
+ <% if allowed_to? :create, :conference_speaker %>
8
+ <%= link_to t("actions.new_speaker", scope: "decidim.admin"), new_conference_speaker_path(current_conference), class: "button button__sm button__secondary new" %>
9
+ <% end %>
10
+ </h2>
11
+ </div>
12
+
13
+ <div class="filters__section">
14
+ <div class="fcell search">
15
+ <%= form_tag "", method: :get do %>
6
16
  <div class="input-group">
7
17
  <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
8
18
  <div class="input-group-button">
9
- <button type="submit" class="button">
10
- <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
19
+ <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
20
+ <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
11
21
  </button>
12
22
  </div>
13
23
  </div>
14
- </div>
15
- <% end %>
16
- </div>
17
- </div>
18
-
19
- <div class='card' id="conference_speakers">
20
- <div class="card-divider">
21
- <h2 class="card-title">
22
- <%= t("conference_speakers.index.conference_speakers_title", scope: "decidim.admin") %>
23
- <% if allowed_to? :create, :conference_speaker %>
24
- <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.conference_speaker.name", scope: "decidim.admin")), new_conference_speaker_path(current_conference), class: "button tiny button--title new" %>
25
24
  <% end %>
26
- </h2>
25
+ </div>
27
26
  </div>
28
27
 
29
- <div class="card-section">
30
- <div class="table-scroll">
31
- <table class="stack">
32
- <thead>
28
+ <div class="table-scroll">
29
+ <table class="table-list">
30
+ <thead>
31
+ <tr>
32
+ <th><%= t("models.conference_speaker.fields.full_name", scope: "decidim.admin") %></th>
33
+ <th><%= t("models.conference_speaker.fields.position", scope: "decidim.admin") %></th>
34
+ <th><%= t("models.conference_speaker.fields.affiliation", scope: "decidim.admin") %></th>
35
+
36
+ <th class="actions"></th>
37
+ </tr>
38
+ </thead>
39
+ <tbody>
40
+ <% @conference_speakers.each do |speaker| %>
41
+ <% speaker_presenter = Decidim::Admin::ConferenceSpeakerPresenter.new(speaker) %>
33
42
  <tr>
34
- <th><%= t("models.conference_speaker.fields.full_name", scope: "decidim.admin") %></th>
35
- <th><%= t("models.conference_speaker.fields.position", scope: "decidim.admin") %></th>
36
- <th><%= t("models.conference_speaker.fields.affiliation", scope: "decidim.admin") %></th>
43
+ <td>
44
+ <%= speaker_presenter.name %>
45
+ </td>
46
+ <td>
47
+ <%= translated_attribute(speaker.position) %>
48
+ </td>
49
+ <td>
50
+ <%= translated_attribute(speaker.affiliation) %>
51
+ </td>
52
+ <td class="table-list__actions">
53
+ <% if allowed_to? :update, :conference_speaker, speaker: speaker %>
54
+ <%= icon_link_to "pencil-line", edit_conference_speaker_path(current_conference, speaker), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
55
+ <% end %>
37
56
 
38
- <th class="actions"></th>
57
+ <% if allowed_to? :destroy, :conference_speaker, speaker: speaker %>
58
+ <%= icon_link_to "delete-bin-line", conference_speaker_path(current_conference, speaker), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
59
+ <% end %>
60
+ </td>
39
61
  </tr>
40
- </thead>
41
- <tbody>
42
- <% @conference_speakers.each do |speaker| %>
43
- <% speaker_presenter = Decidim::Admin::ConferenceSpeakerPresenter.new(speaker) %>
44
- <tr>
45
- <td>
46
- <%= speaker_presenter.name %>
47
- </td>
48
- <td>
49
- <%= translated_attribute(speaker.position) %>
50
- </td>
51
- <td>
52
- <%= translated_attribute(speaker.affiliation) %>
53
- </td>
54
- <td class="table-list__actions">
55
- <% if allowed_to? :update, :conference_speaker, speaker: speaker %>
56
- <%= icon_link_to "pencil", edit_conference_speaker_path(current_conference, speaker), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
57
- <% end %>
58
-
59
- <% if allowed_to? :destroy, :conference_speaker, speaker: speaker %>
60
- <%= icon_link_to "circle-x", conference_speaker_path(current_conference, speaker), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
61
- <% end %>
62
- </td>
63
- </tr>
64
- <% end %>
65
- </tbody>
66
- </table>
67
- <%= paginate @conference_speakers, theme: "decidim" %>
68
- </div>
62
+ <% end %>
63
+ </tbody>
64
+ </table>
69
65
  </div>
66
+ <%= decidim_paginate @conference_speakers %>
70
67
  </div>