decidim-meetings 0.23.0 → 0.27.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of decidim-meetings might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/elements.erb +16 -0
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/heading.erb +1 -0
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb +33 -0
- data/app/cells/decidim/meetings/content_blocks/{upcoming_events → upcoming_meetings}/show.erb +6 -6
- data/app/cells/decidim/meetings/content_blocks/{upcoming_events_cell.rb → upcoming_meetings_cell.rb} +13 -10
- data/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb +5 -4
- data/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb +22 -1
- data/app/cells/decidim/meetings/join_meeting_button/registration_confirm.erb +6 -0
- data/app/cells/decidim/meetings/join_meeting_button/show.erb +15 -6
- data/app/cells/decidim/meetings/join_meeting_button_cell.rb +1 -1
- data/app/cells/decidim/meetings/meeting_activity_cell.rb +13 -5
- data/app/cells/decidim/meetings/meeting_cell.rb +2 -4
- data/app/cells/decidim/meetings/meeting_highlighted_list_item/show.erb +21 -0
- data/app/cells/decidim/meetings/meeting_highlighted_list_item_cell.rb +10 -0
- data/app/cells/decidim/meetings/meeting_list_item_cell.rb +11 -1
- data/app/cells/decidim/meetings/meeting_m/address.erb +5 -1
- data/app/cells/decidim/meetings/meeting_m_cell.rb +54 -0
- data/app/cells/decidim/meetings/meeting_s_cell.rb +22 -0
- data/app/cells/decidim/meetings/meeting_url/show.erb +20 -0
- data/app/cells/decidim/meetings/meeting_url_cell.rb +29 -0
- data/app/cells/decidim/meetings/meetings_map/show.erb +1 -1
- data/app/cells/decidim/meetings/meetings_map_cell.rb +7 -1
- data/app/cells/decidim/meetings/online_meeting_cell.rb +51 -0
- data/app/cells/decidim/meetings/online_meeting_link/show.erb +44 -0
- data/app/cells/decidim/meetings/online_meeting_link_cell.rb +23 -0
- data/app/cells/decidim/meetings/public_participants_list/show.erb +16 -0
- data/app/cells/decidim/meetings/public_participants_list_cell.rb +32 -0
- data/app/cells/decidim/meetings/question_responses/show.erb +7 -0
- data/app/cells/decidim/meetings/question_responses_cell.rb +72 -0
- data/app/cells/decidim/meetings/reported_content/show.erb +3 -0
- data/app/cells/decidim/meetings/reported_content_cell.rb +13 -0
- data/app/commands/decidim/meetings/admin/close_meeting.rb +4 -1
- data/app/commands/decidim/meetings/admin/copy_meeting.rb +1 -10
- data/app/commands/decidim/meetings/admin/create_agenda.rb +1 -1
- data/app/commands/decidim/meetings/admin/create_meeting.rb +16 -20
- data/app/commands/decidim/meetings/admin/destroy_meeting.rb +3 -1
- data/app/commands/decidim/meetings/admin/export_meeting_registrations.rb +1 -1
- data/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb +10 -12
- data/app/commands/decidim/meetings/admin/publish_meeting.rb +74 -0
- data/app/commands/decidim/meetings/admin/unpublish_meeting.rb +45 -0
- data/app/commands/decidim/meetings/admin/update_agenda.rb +1 -1
- data/app/commands/decidim/meetings/admin/update_meeting.rb +17 -6
- data/app/commands/decidim/meetings/admin/update_question_status.rb +57 -0
- data/app/commands/decidim/meetings/admin/update_questionnaire.rb +96 -0
- data/app/commands/decidim/meetings/admin/update_registrations.rb +5 -3
- data/app/commands/decidim/meetings/admin/validate_registration_code.rb +3 -1
- data/app/commands/decidim/meetings/close_meeting.rb +68 -0
- data/app/commands/decidim/meetings/create_answer.rb +52 -0
- data/app/commands/decidim/meetings/create_meeting.rb +26 -5
- data/app/commands/decidim/meetings/decline_invitation.rb +1 -1
- data/app/commands/decidim/meetings/join_meeting.rb +17 -8
- data/app/commands/decidim/meetings/leave_meeting.rb +5 -5
- data/app/commands/decidim/meetings/update_meeting.rb +15 -4
- data/app/commands/decidim/meetings/withdraw_meeting.rb +39 -0
- data/app/controllers/concerns/decidim/meetings/admin/filterable.rb +55 -0
- data/app/controllers/concerns/decidim/meetings/filterable.rb +27 -0
- data/app/controllers/concerns/decidim/meetings/polls_resources.rb +29 -0
- data/app/controllers/decidim/meetings/admin/application_controller.rb +6 -2
- data/app/controllers/decidim/meetings/admin/invites_controller.rb +0 -2
- data/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb +3 -3
- data/app/controllers/decidim/meetings/admin/meetings_controller.rb +46 -1
- data/app/controllers/decidim/meetings/admin/meetings_poll_controller.rb +107 -0
- data/app/controllers/decidim/meetings/calendars_controller.rb +9 -1
- data/app/controllers/decidim/meetings/directory/application_controller.rb +16 -0
- data/app/controllers/decidim/meetings/directory/meetings_controller.rb +40 -26
- data/app/controllers/decidim/meetings/live_events_controller.rb +35 -0
- data/app/controllers/decidim/meetings/meeting_closes_controller.rb +43 -0
- data/app/controllers/decidim/meetings/meetings_controller.rb +43 -29
- data/app/controllers/decidim/meetings/polls/answers_controller.rb +37 -0
- data/app/controllers/decidim/meetings/polls/questions_controller.rb +45 -0
- data/app/events/decidim/meetings/close_meeting_event.rb +1 -3
- data/app/events/decidim/meetings/create_meeting_event.rb +16 -2
- data/app/events/decidim/meetings/meeting_event.rb +37 -0
- data/app/events/decidim/meetings/meeting_registration_notification_event.rb +1 -1
- data/app/events/decidim/meetings/meeting_registrations_enabled_event.rb +1 -3
- data/app/events/decidim/meetings/meeting_registrations_over_percentage_event.rb +2 -4
- data/app/events/decidim/meetings/registration_code_validated_event.rb +2 -4
- data/app/events/decidim/meetings/upcoming_meeting_event.rb +1 -3
- data/app/events/decidim/meetings/update_meeting_event.rb +1 -3
- data/app/forms/decidim/meetings/admin/answer_option_form.rb +24 -0
- data/app/forms/decidim/meetings/admin/close_meeting_form.rb +9 -7
- data/app/forms/decidim/meetings/admin/meeting_copy_form.rb +4 -13
- data/app/forms/decidim/meetings/admin/meeting_form.rb +76 -26
- data/app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb +1 -1
- data/app/forms/decidim/meetings/admin/meeting_registrations_form.rb +17 -4
- data/app/forms/decidim/meetings/admin/question_form.rb +44 -0
- data/app/forms/decidim/meetings/admin/questionnaire_form.rb +19 -0
- data/app/forms/decidim/meetings/answer_choice_form.rb +14 -0
- data/app/forms/decidim/meetings/answer_form.rb +64 -0
- data/app/forms/decidim/meetings/base_meeting_form.rb +59 -0
- data/app/forms/decidim/meetings/close_meeting_form.rb +35 -0
- data/app/forms/decidim/meetings/join_meeting_form.rb +1 -0
- data/app/forms/decidim/meetings/meeting_form.rb +83 -22
- data/app/helpers/decidim/meetings/admin/filterable_helper.rb +13 -0
- data/app/helpers/decidim/meetings/application_helper.rb +59 -10
- data/app/helpers/decidim/meetings/directory/application_helper.rb +148 -0
- data/app/helpers/decidim/meetings/map_helper.rb +2 -2
- data/app/helpers/decidim/meetings/meeting_cells_helper.rb +4 -1
- data/app/helpers/decidim/meetings/meetings_helper.rb +23 -1
- data/app/jobs/decidim/meetings/send_close_meeting_reminder_job.rb +17 -0
- data/app/jobs/decidim/meetings/upcoming_meeting_notification_job.rb +4 -1
- data/app/mailers/decidim/meetings/close_meeting_reminder_mailer.rb +43 -0
- data/app/models/decidim/meetings/agenda_item.rb +2 -2
- data/app/models/decidim/meetings/answer.rb +48 -0
- data/app/models/decidim/meetings/answer_choice.rb +15 -0
- data/app/models/decidim/meetings/answer_option.rb +24 -0
- data/app/models/decidim/meetings/invite.rb +2 -2
- data/app/models/decidim/meetings/meeting.rb +230 -24
- data/app/models/decidim/meetings/poll.rb +19 -0
- data/app/models/decidim/meetings/question.rb +54 -0
- data/app/models/decidim/meetings/questionnaire.rb +29 -0
- data/app/models/decidim/meetings/registration.rb +4 -2
- data/app/packs/entrypoints/decidim_meetings.js +6 -0
- data/app/packs/entrypoints/decidim_meetings_admin.js +5 -0
- data/app/{assets/images/decidim/gamification/badges/attended_meetings.svg → packs/images/decidim/gamification/badges/decidim_gamification_badges_attended_meetings.svg} +0 -0
- data/app/{assets/images/decidim/meetings/icon.svg → packs/images/decidim/meetings/decidim_meetings.svg} +0 -0
- data/app/packs/src/decidim/meetings/admin/agendas.js +159 -0
- data/app/{assets/javascripts/decidim/meetings/admin/destroy_meeting_alert.js.es6 → packs/src/decidim/meetings/admin/destroy_meeting_alert.js} +0 -0
- data/app/{assets/javascripts/decidim/meetings/admin/meetings_form.js.es6 → packs/src/decidim/meetings/admin/meetings_form.js} +67 -5
- data/app/{assets/javascripts/decidim/meetings/admin/registrations_form.js.es6 → packs/src/decidim/meetings/admin/registrations_form.js} +2 -0
- data/app/{assets/javascripts/decidim/meetings/admin/registrations_invite_form.es6 → packs/src/decidim/meetings/admin/registrations_invite_form.js} +3 -3
- data/app/packs/src/decidim/meetings/meetings_form.js +73 -0
- data/app/packs/src/decidim/meetings/meetings_polls.js +46 -0
- data/app/packs/src/decidim/meetings/poll.component.js +166 -0
- data/app/packs/stylesheets/decidim/meetings/_header.scss +52 -0
- data/app/packs/stylesheets/decidim/meetings/_main.scss +178 -0
- data/app/packs/stylesheets/decidim/meetings/_meetings.scss +2 -0
- data/app/permissions/decidim/meetings/admin/permissions.rb +16 -8
- data/app/permissions/decidim/meetings/permissions.rb +60 -17
- data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb +7 -3
- data/app/presenters/decidim/meetings/admin_log/{minutes_presenter.rb → questionnaire_presenter.rb} +13 -16
- data/app/presenters/decidim/meetings/meeting_edition_presenter.rb +14 -0
- data/app/presenters/decidim/meetings/meeting_presenter.rb +73 -24
- data/app/queries/decidim/meetings/admin/invites.rb +1 -1
- data/app/queries/decidim/meetings/filtered_meetings.rb +2 -2
- data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb +1 -1
- data/app/queries/decidim/meetings/questionnaire_user_answers.rb +29 -0
- data/app/serializers/decidim/meetings/{data_portability_invite_serializer.rb → download_your_data_invite_serializer.rb} +4 -3
- data/app/serializers/decidim/meetings/{data_portability_registration_serializer.rb → download_your_data_registration_serializer.rb} +4 -3
- data/app/serializers/decidim/meetings/registration_serializer.rb +3 -12
- data/app/services/decidim/meetings/calendar/base_calendar.rb +4 -3
- data/app/services/decidim/meetings/calendar/component_calendar.rb +7 -9
- data/app/services/decidim/meetings/calendar/meeting_calendar.rb +33 -0
- data/app/services/decidim/meetings/calendar/organization_calendar.rb +1 -1
- data/app/services/decidim/meetings/calendar_renderer.rb +5 -3
- data/app/services/decidim/meetings/close_meeting_reminder_generator.rb +68 -0
- data/app/services/decidim/meetings/diff_renderer.rb +4 -4
- data/app/services/decidim/meetings/meeting_iframe_embedder.rb +90 -0
- data/app/services/decidim/meetings/meeting_search.rb +7 -20
- data/app/views/decidim/meetings/_calendar_modal.html.erb +19 -2
- data/app/views/decidim/meetings/admin/agenda/_form.html.erb +1 -1
- data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb +4 -4
- data/app/views/decidim/meetings/admin/invites/_form.html.erb +1 -1
- data/app/views/decidim/meetings/admin/invites/index.html.erb +1 -1
- data/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb +16 -1
- data/app/views/decidim/meetings/admin/meeting_copies/_form.html.erb +17 -2
- data/app/views/decidim/meetings/admin/meeting_copies/new.html.erb +1 -1
- data/app/views/decidim/meetings/admin/meetings/_form.html.erb +47 -2
- data/app/views/decidim/meetings/admin/meetings/_services.html.erb +1 -1
- data/app/views/decidim/meetings/admin/meetings/edit.html.erb +2 -2
- data/app/views/decidim/meetings/admin/meetings/index.html.erb +60 -10
- data/app/views/decidim/meetings/admin/meetings/new.html.erb +2 -2
- data/app/views/decidim/meetings/admin/poll/_answer_option.html.erb +34 -0
- data/app/views/decidim/meetings/admin/poll/_answer_option_template.html.erb +7 -0
- data/app/views/decidim/meetings/admin/poll/_form.html.erb +63 -0
- data/app/views/decidim/meetings/admin/poll/_question.html.erb +96 -0
- data/app/views/decidim/meetings/admin/poll/edit.html.erb +9 -0
- data/app/views/decidim/meetings/admin/registrations/_form.html.erb +10 -1
- data/app/views/decidim/meetings/admin/registrations/edit.html.erb +20 -18
- data/app/views/decidim/meetings/close_meeting_reminder_mailer/close_meeting_reminder.html.erb +5 -0
- data/app/views/decidim/meetings/directory/meetings/_filters.html.erb +34 -0
- data/app/views/decidim/meetings/directory/meetings/_meetings.html.erb +6 -1
- data/app/views/decidim/meetings/directory/meetings/index.html.erb +5 -21
- data/app/views/decidim/meetings/directory/meetings/index.js.erb +9 -4
- data/app/views/decidim/meetings/layouts/live_event.html.erb +55 -0
- data/app/views/decidim/meetings/live_events/show.html.erb +12 -0
- data/app/views/decidim/meetings/meeting_closes/_form.html.erb +14 -0
- data/app/views/decidim/meetings/meeting_closes/edit.html.erb +25 -0
- data/app/views/decidim/meetings/meeting_closes/proposals_picker.html.erb +1 -0
- data/app/views/decidim/meetings/meetings/_calendar_modal.html.erb +26 -0
- data/app/views/decidim/meetings/meetings/_count.html.erb +1 -1
- data/app/views/decidim/meetings/meetings/_filters.html.erb +13 -5
- data/app/views/decidim/meetings/meetings/_filters_small_view.html.erb +4 -4
- data/app/views/decidim/meetings/meetings/_form.html.erb +55 -3
- data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb +2 -2
- data/app/views/decidim/meetings/meetings/_meeting_minutes.html.erb +7 -18
- data/app/views/decidim/meetings/meetings/_meetings.html.erb +24 -1
- data/app/views/decidim/meetings/meetings/edit.html.erb +2 -2
- data/app/views/decidim/meetings/meetings/index.html.erb +7 -6
- data/app/views/decidim/meetings/meetings/index.js.erb +7 -4
- data/app/views/decidim/meetings/meetings/new.html.erb +2 -2
- data/app/views/decidim/meetings/meetings/show.html.erb +50 -43
- data/app/views/decidim/meetings/polls/answers/_multiple_option.html.erb +13 -0
- data/app/views/decidim/meetings/polls/answers/_single_option.html.erb +19 -0
- data/app/views/decidim/meetings/polls/answers/create.js.erb +5 -0
- data/app/views/decidim/meetings/polls/questions/_closed_question.html.erb +7 -0
- data/app/views/decidim/meetings/polls/questions/_index.html.erb +5 -0
- data/app/views/decidim/meetings/polls/questions/_index_admin.html.erb +43 -0
- data/app/views/decidim/meetings/polls/questions/_published_question.html.erb +29 -0
- data/app/views/decidim/meetings/polls/questions/_question.html.erb +7 -0
- data/app/views/decidim/meetings/polls/questions/index.js.erb +5 -0
- data/app/views/decidim/meetings/polls/questions/index_admin.js.erb +5 -0
- data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb +8 -3
- data/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb +1 -1
- data/app/views/devise/mailer/join_meeting.html.erb +6 -6
- data/config/assets.rb +11 -0
- data/config/locales/ar.yml +27 -40
- data/config/locales/bg.yml +1 -0
- data/config/locales/ca.yml +211 -44
- data/config/locales/cs.yml +220 -51
- data/config/locales/de.yml +249 -106
- data/config/locales/el.yml +6 -43
- data/config/locales/en.yml +208 -42
- data/config/locales/es-MX.yml +208 -41
- data/config/locales/es-PY.yml +209 -42
- data/config/locales/es.yml +210 -43
- data/config/locales/eu.yml +221 -39
- data/config/locales/fi-plain.yml +209 -42
- data/config/locales/fi.yml +337 -170
- data/config/locales/fr-CA.yml +208 -41
- data/config/locales/fr-LU.yml +534 -0
- data/config/locales/fr.yml +221 -54
- data/config/locales/ga-IE.yml +201 -0
- data/config/locales/gl.yml +92 -40
- data/config/locales/hu.yml +194 -41
- data/config/locales/id-ID.yml +6 -40
- data/config/locales/is-IS.yml +4 -30
- data/config/locales/it.yml +145 -42
- data/config/locales/ja.yml +246 -80
- data/config/locales/lb-LU.yml +211 -0
- data/config/locales/lb.yml +403 -0
- data/config/locales/lt.yml +688 -0
- data/config/locales/lv.yml +6 -43
- data/config/locales/nl.yml +264 -89
- data/config/locales/no.yml +167 -42
- data/config/locales/oc-FR.yml +1 -0
- data/config/locales/pl.yml +111 -61
- data/config/locales/pt-BR.yml +174 -40
- data/config/locales/pt.yml +143 -42
- data/config/locales/ro-RO.yml +257 -109
- data/config/locales/ru.yml +4 -39
- data/config/locales/si-LK.yml +1 -0
- data/config/locales/sk.yml +6 -43
- data/config/locales/sl.yml +1 -3
- data/config/locales/sr-CS.yml +1 -0
- data/config/locales/sv.yml +193 -42
- data/config/locales/sw-KE.yml +1 -0
- data/config/locales/tr-TR.yml +187 -120
- data/config/locales/uk.yml +4 -31
- data/config/locales/val-ES.yml +1 -0
- data/config/locales/zh-CN.yml +6 -43
- data/db/migrate/20180809134748_add_upcoming_events_as_content_block.rb +1 -1
- data/db/migrate/20201006140511_add_online_meeting_url.rb +7 -0
- data/db/migrate/20201009124057_add_type_of_meeting.rb +7 -0
- data/db/migrate/20201016112641_add_registration_type_and_url_to_meetings.rb +19 -0
- data/db/migrate/20201111133246_add_salt_to_decidim_meetings.rb +8 -0
- data/db/migrate/20210217124802_add_registration_custom_content_to_meetings.rb +8 -0
- data/db/migrate/20210310120731_add_followable_counter_cache_to_meetings.rb +16 -0
- data/db/migrate/20210413050756_add_published_at_to_meetings.rb +7 -0
- data/db/migrate/20210413050917_update_published_at_to_existing_meetings.rb +20 -0
- data/db/migrate/20210430123416_add_public_participation_to_decidim_meetings_registrations.rb +7 -0
- data/db/migrate/20210506180226_merge_meetings_minutes_into_meetings_table.rb +48 -0
- data/db/migrate/20210512055802_create_decidim_meetings_polls.rb +10 -0
- data/db/migrate/20210512100333_drop_decidim_meetings_minutes_table.rb +78 -0
- data/db/migrate/20210518133236_merge_minutes_with_closing_report_in_meetings_table.rb +57 -0
- data/db/migrate/20210519133705_add_comments_availability_columns_to_meetings_table.rb +14 -0
- data/db/migrate/20210520084247_create_decidim_meetings_questionnaires.rb +11 -0
- data/db/migrate/20210520084253_create_decidim_meetings_questions.rb +15 -0
- data/db/migrate/20210520084321_create_decidim_meetings_answers.rb +13 -0
- data/db/migrate/20210520084330_create_decidim_meetings_answer_options.rb +10 -0
- data/db/migrate/20210520084337_create_decidim_meetings_answer_choices.rb +13 -0
- data/db/migrate/20210520134834_add_status_to_meetings_questions.rb +7 -0
- data/db/migrate/20210602040614_add_setting_embed_iframe_to_meetings.rb +7 -0
- data/db/migrate/20210727085318_add_state_field_to_meeting.rb +7 -0
- data/db/migrate/20210903143040_add_iframe_access_level_to_decidim_meetings.rb +7 -0
- data/db/migrate/20210922140454_transform_show_embedded_iframe_column.rb +15 -0
- data/db/migrate/20210928095036_rename_upcoming_events_content_block_to_upcoming_meetings.rb +13 -0
- data/db/migrate/20211105115625_remove_not_null_on_customize_registration_email.rb +7 -0
- data/lib/decidim/api/agenda_item_type.rb +22 -0
- data/lib/decidim/api/agenda_type.rb +19 -0
- data/lib/decidim/api/linked_resources_interface.rb +14 -6
- data/lib/decidim/api/meeting_type.rb +79 -0
- data/lib/decidim/api/meetings_type.rb +26 -0
- data/{app/types/decidim/meetings → lib/decidim/api}/service_type.rb +4 -4
- data/lib/decidim/api/services_interface.rb +3 -3
- data/lib/decidim/content_parsers/meeting_parser.rb +20 -0
- data/lib/decidim/content_renderers/meeting_renderer.rb +17 -0
- data/lib/decidim/meetings/admin_engine.rb +5 -1
- data/lib/decidim/meetings/api.rb +5 -0
- data/lib/decidim/meetings/component.rb +108 -34
- data/lib/decidim/meetings/directory_engine.rb +3 -3
- data/lib/decidim/meetings/download_your_data_user_answers_serializer.rb +33 -0
- data/lib/decidim/meetings/engine.rb +39 -27
- data/lib/decidim/meetings/meeting_serializer.rb +5 -3
- data/lib/decidim/meetings/polls.rb +10 -0
- data/lib/decidim/meetings/test/factories.rb +131 -13
- data/lib/decidim/meetings/test/notifications_handling.rb +39 -0
- data/lib/decidim/meetings/test/translated_event.rb +22 -0
- data/lib/decidim/meetings/user_answers_serializer.rb +47 -0
- data/lib/decidim/meetings/version.rb +1 -1
- data/lib/decidim/meetings.rb +28 -1
- metadata +160 -137
- data/app/assets/config/decidim_meetings_manifest.js +0 -8
- data/app/assets/javascripts/decidim/meetings/admin/agendas.js.es6 +0 -158
- data/app/assets/javascripts/decidim/meetings/meetings_form.js.es6 +0 -9
- data/app/commands/decidim/meetings/admin/create_minutes.rb +0 -55
- data/app/commands/decidim/meetings/admin/update_minutes.rb +0 -63
- data/app/controllers/decidim/meetings/admin/minutes_controller.rb +0 -69
- data/app/forms/decidim/meetings/admin/minutes_form.rb +0 -20
- data/app/models/decidim/meetings/minutes.rb +0 -22
- data/app/types/decidim/meetings/agenda_item_type.rb +0 -28
- data/app/types/decidim/meetings/agenda_type.rb +0 -25
- data/app/types/decidim/meetings/meeting_type.rb +0 -65
- data/app/types/decidim/meetings/meetings_type.rb +0 -32
- data/app/types/decidim/meetings/minutes_type.rb +0 -26
- data/app/views/decidim/meetings/admin/minutes/_form.html.erb +0 -23
- data/app/views/decidim/meetings/admin/minutes/edit.html.erb +0 -7
- data/app/views/decidim/meetings/admin/minutes/new.html.erb +0 -7
- data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_meetings.html.erb +0 -15
- data/app/views/decidim/participatory_processes/participatory_process_groups/_meeting.html.erb +0 -10
- data/config/locales/ja-JP.yml +0 -494
@@ -0,0 +1,96 @@
|
|
1
|
+
<% question = form.object %>
|
2
|
+
<% is_expanded = question.errors.any? %>
|
3
|
+
|
4
|
+
<div class="card questionnaire-question" id="<%= id %>-field">
|
5
|
+
<div class="card-divider question-divider">
|
6
|
+
<h2 class="card-title">
|
7
|
+
<span>
|
8
|
+
<% if editable %>
|
9
|
+
<%== icon("move") %>
|
10
|
+
<% end %>
|
11
|
+
<%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t("question", scope: "decidim.forms.admin.questionnaires.question")) %>
|
12
|
+
</span>
|
13
|
+
|
14
|
+
<button type="button" class="button small secondary button--title question--collapse" data-toggle="<%= id %>-question-card button--collapse-question-<%= id %> button--expand-question-<%= id %>">
|
15
|
+
<span id="button--collapse-question-<%= id %>" data-toggler=".hide" class="icon-collapse <%= "hide" unless is_expanded %>">
|
16
|
+
<%== icon("caret-top", aria_label: t("collapse", scope: "decidim.forms.admin.questionnaires.question"), role: "img") %>
|
17
|
+
</span>
|
18
|
+
|
19
|
+
<span id="button--expand-question-<%= id %>" data-toggler=".hide" class="icon-expand <%= "hide" if is_expanded %>">
|
20
|
+
<%== icon("caret-bottom", aria_label: t("expand", scope: "decidim.forms.admin.questionnaires.question"), role: "img") %>
|
21
|
+
</span>
|
22
|
+
</button>
|
23
|
+
|
24
|
+
<% if editable %>
|
25
|
+
<button class="button small alert hollow move-up-question button--title">
|
26
|
+
<%== "#{icon("arrow-top")} #{t("up", scope: "decidim.forms.admin.questionnaires.question")}" %>
|
27
|
+
</button>
|
28
|
+
|
29
|
+
<button class="button small alert hollow move-down-question button--title">
|
30
|
+
<%== "#{icon("arrow-bottom")} #{t("down", scope: "decidim.forms.admin.questionnaires.question")}" %>
|
31
|
+
</button>
|
32
|
+
|
33
|
+
<button class="button small alert hollow remove-question button--title">
|
34
|
+
<%= t("remove", scope: "decidim.forms.admin.questionnaires.question") %>
|
35
|
+
</button>
|
36
|
+
<% end %>
|
37
|
+
</h2>
|
38
|
+
</div>
|
39
|
+
|
40
|
+
<div class="card-section collapsible <%= "hide" unless is_expanded %>" data-toggler=".hide" id="<%= id %>-question-card">
|
41
|
+
<div class="row column">
|
42
|
+
<%=
|
43
|
+
form.translated(
|
44
|
+
:text_field,
|
45
|
+
:body,
|
46
|
+
tabs_id: id,
|
47
|
+
label: t("statement", scope: "decidim.forms.admin.questionnaires.question"),
|
48
|
+
disabled: !editable
|
49
|
+
)
|
50
|
+
%>
|
51
|
+
</div>
|
52
|
+
|
53
|
+
<div class="row column">
|
54
|
+
<%=
|
55
|
+
form.select(
|
56
|
+
:question_type,
|
57
|
+
options_from_collection_for_select(question_types, :first, :last, question.question_type),
|
58
|
+
{},
|
59
|
+
disabled: !editable
|
60
|
+
)
|
61
|
+
%>
|
62
|
+
</div>
|
63
|
+
|
64
|
+
<% if question.persisted? %>
|
65
|
+
<%= form.hidden_field :id, disabled: !editable %>
|
66
|
+
<% end %>
|
67
|
+
|
68
|
+
<%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
|
69
|
+
<%= form.hidden_field :deleted, disabled: !editable %>
|
70
|
+
|
71
|
+
<div class="questionnaire-question-answer-options" data-template="<%= answer_option_template_selector %>">
|
72
|
+
<div class="questionnaire-question-answer-options-list">
|
73
|
+
<% question.answer_options.each do |answer_option| %>
|
74
|
+
<%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", answer_option do |answer_option_form| %>
|
75
|
+
<%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question: question, editable: editable %>
|
76
|
+
<% end %>
|
77
|
+
<% end %>
|
78
|
+
</div>
|
79
|
+
|
80
|
+
<% if editable %>
|
81
|
+
<button class="button add-answer-option"><%= t("add_answer_option", scope: "decidim.forms.admin.questionnaires.question") %></button>
|
82
|
+
<% end %>
|
83
|
+
</div>
|
84
|
+
|
85
|
+
<div class="row column questionnaire-question-max-choices">
|
86
|
+
<%=
|
87
|
+
form.select(
|
88
|
+
:max_choices,
|
89
|
+
(2..question.number_of_options),
|
90
|
+
{ include_blank: t("any", scope: "decidim.forms.admin.questionnaires.question") },
|
91
|
+
disabled: !editable
|
92
|
+
)
|
93
|
+
%>
|
94
|
+
</div>
|
95
|
+
</div>
|
96
|
+
</div>
|
@@ -0,0 +1,9 @@
|
|
1
|
+
<%= decidim_form_for(@form, url: update_url, method: :put, html: { class: "form edit_questionnaire" }) do |form| %>
|
2
|
+
<%= render partial: "decidim/meetings/admin/poll/form", object: form %>
|
3
|
+
|
4
|
+
<% if questionnaire.questions_editable? %>
|
5
|
+
<div class="button--double form-general-submit">
|
6
|
+
<%= form.submit t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button" %>
|
7
|
+
</div>
|
8
|
+
<% end %>
|
9
|
+
<% end %>
|
@@ -41,10 +41,19 @@
|
|
41
41
|
<p class="help-text"><%= t(".reserved_slots_help") %></p>
|
42
42
|
</div>
|
43
43
|
|
44
|
+
<div class="row column">
|
45
|
+
<%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
|
46
|
+
</div>
|
47
|
+
|
48
|
+
<div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
|
49
|
+
<%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
|
50
|
+
<p class="help-text"><%= t(".registration_email_help") %></p>
|
51
|
+
</div>
|
52
|
+
|
44
53
|
<div class="row column">
|
45
54
|
<%= form.translated :editor, :registration_terms %>
|
46
55
|
</div>
|
47
56
|
</div>
|
48
57
|
</div>
|
49
58
|
|
50
|
-
<%=
|
59
|
+
<%= javascript_pack_tag "decidim_meetings_admin" %>
|
@@ -1,26 +1,28 @@
|
|
1
|
-
|
2
|
-
<div class="card
|
3
|
-
<
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
1
|
+
<% if meeting.component.settings.registration_code_enabled %>
|
2
|
+
<div class="card">
|
3
|
+
<div class="card-divider">
|
4
|
+
<h2 class="card-title">
|
5
|
+
<%= t(".validate_registration_code") %>
|
6
|
+
</h2>
|
7
|
+
</div>
|
8
|
+
<div class="card-section">
|
9
|
+
<%= decidim_form_for(@validation_form, url: validate_registration_code_meeting_registrations_path, html: { class: "form validate_meeting_registration_code" }) do |f| %>
|
9
10
|
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
11
|
+
<div class="grid-x grid-margin-x">
|
12
|
+
<div class="auto cell">
|
13
|
+
<%= f.text_field :code %>
|
14
|
+
</div>
|
14
15
|
|
15
|
-
|
16
|
-
|
17
|
-
|
16
|
+
<div class="shrink cell">
|
17
|
+
<div class="text-center mt-sm">
|
18
|
+
<%= f.submit t(".validate") %>
|
19
|
+
</div>
|
18
20
|
</div>
|
19
21
|
</div>
|
20
|
-
|
21
|
-
|
22
|
+
<% end %>
|
23
|
+
</div>
|
22
24
|
</div>
|
23
|
-
|
25
|
+
<% end %>
|
24
26
|
|
25
27
|
<%= decidim_form_for(@form, url: meeting_registrations_path, html: { class: "form edit_meeting_registrations" }) do |f| %>
|
26
28
|
<%= render partial: "form", object: f %>
|
@@ -0,0 +1,5 @@
|
|
1
|
+
<p class="email-greeting"><%= t "decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.hello", username: @user.name %></p>
|
2
|
+
|
3
|
+
<p class="email-instructions"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.body", meeting_title: translated_attribute(@meeting.title), meeting_path: @meeting.reported_content_url).html_safe %></p>
|
4
|
+
|
5
|
+
<p class="email-closing"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
|
@@ -0,0 +1,34 @@
|
|
1
|
+
<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "meetings" } %>
|
2
|
+
|
3
|
+
<%= filter_form_for filter do |form| %>
|
4
|
+
<div class="filters__section">
|
5
|
+
<div class="filters__search">
|
6
|
+
<div class="input-group">
|
7
|
+
<%= form.search_field :title_or_description_cont, label: false, class: "input-group-field", placeholder: t("decidim.meetings.meetings.filters.search"), title: t("decidim.meetings.meetings.filters.search"), "aria-label": t("decidim.meetings.meetings.filters.search"), data: { disable_dynamic_change: true } %>
|
8
|
+
<div class="input-group-button">
|
9
|
+
<button type="submit" class="button" aria-controls="meetings">
|
10
|
+
<%= icon "magnifying-glass", aria_label: t("decidim.meetings.meetings.filters.search"), role: "img" %>
|
11
|
+
</button>
|
12
|
+
</div>
|
13
|
+
</div>
|
14
|
+
</div>
|
15
|
+
</div>
|
16
|
+
|
17
|
+
<% unless @forced_past_meetings %>
|
18
|
+
<%= form.collection_radio_buttons :with_any_date, filter_date_values, :first, :last, legend_title: t("decidim.meetings.meetings.filters.date") %>
|
19
|
+
<% end %>
|
20
|
+
|
21
|
+
<%= form.check_boxes_tree :with_any_type, filter_type_values, legend_title: t("decidim.meetings.meetings.filters.type") %>
|
22
|
+
|
23
|
+
<%= form.check_boxes_tree :with_any_scope, directory_filter_scopes_values, legend_title: t("decidim.meetings.meetings.filters.scope") %>
|
24
|
+
|
25
|
+
<%= form.check_boxes_tree :with_any_global_category, directory_filter_categories_values, legend_title: t("decidim.meetings.meetings.filters.category") %>
|
26
|
+
|
27
|
+
<%= form.check_boxes_tree :with_any_origin, directory_filter_origin_values, legend_title: t("decidim.meetings.meetings.filters.origin") %>
|
28
|
+
|
29
|
+
<%= form.check_boxes_tree :with_any_space, directory_meeting_spaces_values, legend_title: t("decidim.meetings.directory.meetings.index.space_type") %>
|
30
|
+
|
31
|
+
<% if current_user %>
|
32
|
+
<%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t("decidim.meetings.meetings.filters.activity") }, "aria-controls": "meetings" %>
|
33
|
+
<% end %>
|
34
|
+
<% end %>
|
@@ -8,7 +8,12 @@
|
|
8
8
|
<%= render partial: "decidim/shared/results_per_page" %>
|
9
9
|
</div>
|
10
10
|
<div class="column">
|
11
|
-
<%= render partial: "decidim/meetings/calendar_modal", locals: {
|
11
|
+
<%= render partial: "decidim/meetings/calendar_modal", locals: {
|
12
|
+
path: short_url(
|
13
|
+
route_name: "calendar",
|
14
|
+
params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }
|
15
|
+
)
|
16
|
+
} %>
|
12
17
|
</div>
|
13
18
|
</div>
|
14
19
|
|
@@ -2,29 +2,15 @@
|
|
2
2
|
|
3
3
|
<div class="wrapper">
|
4
4
|
<div class="row">
|
5
|
-
<h1 class="section-heading"
|
5
|
+
<h1 class="section-heading" id="meetings-count">
|
6
|
+
<%= render partial: "decidim/meetings/meetings/count" %>
|
7
|
+
</h1>
|
6
8
|
|
7
|
-
<%= cell "decidim/meetings/meetings_map", search.
|
9
|
+
<%= cell "decidim/meetings/meetings_map", search.result %>
|
8
10
|
|
9
11
|
<div class="columns mediumlarge-4 large-3">
|
10
12
|
<div class="card card--secondary show-for-mediumlarge">
|
11
|
-
|
12
|
-
<div class="filters__section">
|
13
|
-
<div class="filters__search">
|
14
|
-
<div class="input-group">
|
15
|
-
<%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search") %>
|
16
|
-
<div class="input-group-button">
|
17
|
-
<button type="submit" class="button">
|
18
|
-
<%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
|
19
|
-
</button>
|
20
|
-
</div>
|
21
|
-
</div>
|
22
|
-
</div>
|
23
|
-
</div>
|
24
|
-
|
25
|
-
<%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
|
26
|
-
<%= form.collection_radio_buttons :space, @meeting_spaces, :first, :last, legend_title: t(".space_type") %>
|
27
|
-
<% end %>
|
13
|
+
<%= render partial: "filters" %>
|
28
14
|
</div>
|
29
15
|
</div>
|
30
16
|
<div id="meetings" class="columns mediumlarge-8 large-9">
|
@@ -32,5 +18,3 @@
|
|
32
18
|
</div>
|
33
19
|
</div>
|
34
20
|
</div>
|
35
|
-
|
36
|
-
<%= javascript_include_tag("decidim/filters") %>
|
@@ -1,18 +1,23 @@
|
|
1
1
|
var $meetings = $('#meetings');
|
2
|
+
var $meetingsCount = $('#meetings-count');
|
3
|
+
|
4
|
+
// make sure that calendar modal will use the updated filter values
|
5
|
+
var $calendarShare = $('#calendarShare');
|
6
|
+
$calendarShare.remove();
|
2
7
|
|
3
8
|
$meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
|
9
|
+
$meetingsCount.html('<%= j(render partial: "decidim/meetings/meetings/count").strip.html_safe %>');
|
4
10
|
|
5
11
|
var $dropdownMenu = $('.dropdown.menu', $meetings);
|
6
12
|
$dropdownMenu.foundation();
|
7
13
|
|
8
|
-
|
14
|
+
$("#calendarShare").foundation(); // initialize export calendar on the page
|
15
|
+
|
16
|
+
var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result).to_json.html_safe %>');
|
9
17
|
|
10
18
|
var $map = $("#map");
|
11
19
|
var controller = $map.data("map-controller");
|
12
20
|
if (controller) {
|
13
21
|
controller.clearMarkers();
|
14
22
|
controller.addMarkers(markerData);
|
15
|
-
} else {
|
16
|
-
// @deprecated Legacy support
|
17
|
-
window.Decidim.currentMap = window.Decidim.loadMap('map', markerData);
|
18
23
|
}
|
@@ -0,0 +1,55 @@
|
|
1
|
+
<!DOCTYPE html>
|
2
|
+
<html lang="<%= I18n.locale %>" class="no-js">
|
3
|
+
<head>
|
4
|
+
<title><%= decidim_page_title %></title>
|
5
|
+
<%= render partial: "layouts/decidim/head" %>
|
6
|
+
</head>
|
7
|
+
|
8
|
+
<body>
|
9
|
+
<%= render partial: "layouts/decidim/timeout_modal" %>
|
10
|
+
<%= render partial: "layouts/decidim/data_consent_warning" %>
|
11
|
+
<%= cell("decidim/data_consent", current_organization) %>
|
12
|
+
|
13
|
+
<header class="meeting-polls__header">
|
14
|
+
<% if current_user && poll %>
|
15
|
+
<div class="flex--cc">
|
16
|
+
<button class="meeting-polls__button meeting-polls__action-list">
|
17
|
+
<%= t(".questions") %> <span id="visible-questions-count">(<%= questionnaire.questions.visible.count %>)</span>
|
18
|
+
</button>
|
19
|
+
|
20
|
+
<% if admin_allowed_to?(:update, :poll, meeting: meeting, poll: poll) %>
|
21
|
+
<button class="meeting-polls__button meeting-polls__action-administrate"><%= t(".administrate") %></button>
|
22
|
+
<% end %>
|
23
|
+
</div>
|
24
|
+
<% end %>
|
25
|
+
|
26
|
+
<div>
|
27
|
+
<strong class="text-secondary"><%= current_organization.name %></strong> / <strong><%= present(meeting).title(links: true) %></strong>
|
28
|
+
</div>
|
29
|
+
|
30
|
+
<div class="flex--cc">
|
31
|
+
<% if current_user %>
|
32
|
+
<span>
|
33
|
+
<%= link_to current_user.name, decidim.account_path, target: "_blank", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name) %>
|
34
|
+
</span>
|
35
|
+
<% end %>
|
36
|
+
|
37
|
+
<span class="meeting-polls__close">
|
38
|
+
<%= link_to meeting_path(meeting), "aria-label": t(".close") do %>
|
39
|
+
<%= t(".close") %>
|
40
|
+
<%= icon "x", class: "text-small" %>
|
41
|
+
<% end %>
|
42
|
+
</span>
|
43
|
+
</div>
|
44
|
+
</header>
|
45
|
+
|
46
|
+
<main class="meeting-polls__main">
|
47
|
+
<aside class="meeting-polls__aside" id="meeting-poll-aside" data-decidim-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting) %>"}'></aside>
|
48
|
+
<aside class="meeting-polls__aside" id="admin-meeting-poll-aside" data-decidim-admin-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting, admin: true) %>"}'></aside>
|
49
|
+
<%= yield %>
|
50
|
+
</main>
|
51
|
+
|
52
|
+
<%= render partial: "layouts/decidim/decidim_javascript" %>
|
53
|
+
<%= javascript_pack_tag "decidim_meetings" %>
|
54
|
+
</body>
|
55
|
+
</html>
|
@@ -0,0 +1,12 @@
|
|
1
|
+
<% provide(:title, present(meeting).title) %>
|
2
|
+
|
3
|
+
<% add_decidim_meta_tags({
|
4
|
+
title: present(meeting).title,
|
5
|
+
description: present(meeting).description,
|
6
|
+
url: meeting_url(meeting.id)
|
7
|
+
}) %>
|
8
|
+
|
9
|
+
<aside class="meeting-polls__aside"></aside>
|
10
|
+
<div class="meeting-polls__iframe">
|
11
|
+
<%== live_meeting_embed_code %>
|
12
|
+
</div>
|
@@ -0,0 +1,14 @@
|
|
1
|
+
<div class="field hashtags__container">
|
2
|
+
<%= text_editor_for(form, :closing_report, hashtaggable: true) %>
|
3
|
+
</div>
|
4
|
+
|
5
|
+
<div class="field hashtags__container">
|
6
|
+
<%= form.number_field :attendees_count, min: 0 %>
|
7
|
+
<div class="help-text help-text-form-required-fields"><%= t("decidim.forms.meetings.attendees_count_help_text") %></div>
|
8
|
+
</div>
|
9
|
+
|
10
|
+
<% if Decidim::Meetings.enable_proposal_linking %>
|
11
|
+
<div class="field hashtags__container">
|
12
|
+
<%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
|
13
|
+
</div>
|
14
|
+
<% end %>
|
@@ -0,0 +1,25 @@
|
|
1
|
+
<div class="row">
|
2
|
+
<div class="columns large-3">
|
3
|
+
<%= link_to :back do %>
|
4
|
+
<%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
|
5
|
+
<%= t(".back") %>
|
6
|
+
<% end %>
|
7
|
+
</div>
|
8
|
+
|
9
|
+
<div class="columns large-6">
|
10
|
+
<h2 class="section-heading"><%= t(".title") %></h2>
|
11
|
+
<div class="card">
|
12
|
+
<div class="card__content">
|
13
|
+
<%= decidim_form_for(@form, url: meeting_meeting_close_path(meeting, @form), html: { class: "form edit_close_meeting" }) do |f| %>
|
14
|
+
<%= render partial: "form", object: f, locals: { title: t(".title") } %>
|
15
|
+
|
16
|
+
<div class="button--double form-general-submit">
|
17
|
+
<%= f.submit t(".close") %>
|
18
|
+
</div>
|
19
|
+
<% end %>
|
20
|
+
</div>
|
21
|
+
</div>
|
22
|
+
</div>
|
23
|
+
|
24
|
+
<div class="columns large-3"></div>
|
25
|
+
</div>
|
@@ -0,0 +1 @@
|
|
1
|
+
<%= cell "decidim/proposals/proposals_picker", current_component %>
|
@@ -0,0 +1,26 @@
|
|
1
|
+
<div class="text-center">
|
2
|
+
<button class="share-link link text-center" data-open="calendarShare">
|
3
|
+
<%= t("add_to_calendar", scope: "decidim.meetings.meetings.calendar_modal" ) %>
|
4
|
+
<%= icon "calendar", class: "icon--after", role: "img", "aria-hidden": true %>
|
5
|
+
</button>
|
6
|
+
</div>
|
7
|
+
|
8
|
+
<div class="reveal" id="calendarShare" data-reveal>
|
9
|
+
<div class="reveal__header">
|
10
|
+
<h2 class="reveal__title"><%= t("add_to_calendar", scope: "decidim.meetings.meetings.calendar_modal") %></h2>
|
11
|
+
<button class="close-button" data-close aria-label="<%= t("close_window", scope: "decidim.meetings.meetings.calendar_modal") %>" type="button">
|
12
|
+
<span aria-hidden="true">×</span>
|
13
|
+
</button>
|
14
|
+
</div>
|
15
|
+
<ul>
|
16
|
+
<li>
|
17
|
+
<%= link_to t("outlook", scope: "decidim.meetings.meetings.calendar_modal"), ics_url %>
|
18
|
+
</li>
|
19
|
+
<li>
|
20
|
+
<%= link_to t("apple", scope: "decidim.meetings.meetings.calendar_modal"), ics_url %>
|
21
|
+
</li>
|
22
|
+
<li>
|
23
|
+
<%= link_to t("google", scope: "decidim.meetings.meetings.calendar_modal"), google_url, target: "_blank" %>
|
24
|
+
</li>
|
25
|
+
</ul>
|
26
|
+
</div>
|
@@ -1 +1 @@
|
|
1
|
-
<%= t(".meetings_count", count: search.
|
1
|
+
<%= t(".meetings_count", count: search.result.count) %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<div class="filters__section">
|
5
5
|
<div class="filters__search">
|
6
6
|
<div class="input-group">
|
7
|
-
<%= form.search_field :
|
7
|
+
<%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
|
8
8
|
<div class="input-group-button">
|
9
9
|
<button type="submit" class="button" aria-controls="meetings">
|
10
10
|
<%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
|
@@ -14,19 +14,27 @@
|
|
14
14
|
</div>
|
15
15
|
</div>
|
16
16
|
|
17
|
+
<%= form.hidden_field "with_availability", value: params.dig("filter", "with_availability") %>
|
18
|
+
|
17
19
|
<% unless @forced_past_meetings %>
|
18
|
-
<%= form.
|
20
|
+
<%= form.collection_radio_buttons :with_any_date, filter_date_values, :first, :last, legend_title: t(".date") %>
|
19
21
|
<% end %>
|
20
22
|
|
23
|
+
<%= form.check_boxes_tree :with_any_type, filter_type_values, legend_title: t(".type") %>
|
24
|
+
|
21
25
|
<% if current_component.has_subscopes? %>
|
22
|
-
<%= form.check_boxes_tree :
|
26
|
+
<%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope") %>
|
23
27
|
<% end %>
|
24
28
|
|
25
29
|
<% if current_component.categories.any? %>
|
26
|
-
<%= form.check_boxes_tree :
|
30
|
+
<%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category") %>
|
27
31
|
<% end %>
|
28
32
|
|
29
33
|
<% if component_settings.creation_enabled_for_participants? %>
|
30
|
-
<%= form.check_boxes_tree :
|
34
|
+
<%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin") %>
|
35
|
+
<% end %>
|
36
|
+
|
37
|
+
<% if current_user %>
|
38
|
+
<%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t(".activity") }, "aria-controls": "meetings" %>
|
31
39
|
<% end %>
|
32
40
|
<% end %>
|
@@ -1,18 +1,18 @@
|
|
1
1
|
<div class="filters-controls hide-for-mediumlarge">
|
2
|
-
<button data-open="filter-box" class="filters-controls__trigger">
|
2
|
+
<button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
|
3
3
|
<%= t ".filter" %>
|
4
4
|
<%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
|
5
5
|
</button>
|
6
6
|
</div>
|
7
7
|
|
8
|
-
<div class="reveal" id="filter-box" data-reveal>
|
8
|
+
<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
|
9
9
|
<div class="reveal__header">
|
10
|
-
<h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
|
10
|
+
<h3 id="filter-box-label" class="reveal__title"><%= t ".filter_by" %>:</h3>
|
11
11
|
<button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
|
12
12
|
<span aria-hidden="true">×</span>
|
13
13
|
</button>
|
14
14
|
</div>
|
15
15
|
<div class="filters">
|
16
|
-
<%= render partial: "filters" %>
|
16
|
+
<%= render partial: "filters", locals: { type: :small } %>
|
17
17
|
</div>
|
18
18
|
</div>
|
@@ -7,11 +7,18 @@
|
|
7
7
|
</div>
|
8
8
|
|
9
9
|
<div class="field">
|
10
|
-
<%= form.
|
10
|
+
<%= form.select :type_of_meeting,
|
11
|
+
@form.type_of_meeting_select,
|
12
|
+
{ include_blank: t(".select_a_meeting_type") },
|
13
|
+
{ multiple: false } %>
|
14
|
+
</div>
|
15
|
+
|
16
|
+
<div class="field" data-meeting-type="in_person">
|
17
|
+
<%= form.geocoding_field :address, input_html: { required: false } %>
|
11
18
|
<p class="help-text"><%= t(".address_help") %></p>
|
12
19
|
</div>
|
13
20
|
|
14
|
-
<div class="field">
|
21
|
+
<div class="field" data-meeting-type="in_person">
|
15
22
|
<%= form.text_area :location %>
|
16
23
|
<p class="help-text"><%= t(".location_help") %></p>
|
17
24
|
</div>
|
@@ -21,6 +28,27 @@
|
|
21
28
|
<p class="help-text"><%= t(".location_hints_help") %></p>
|
22
29
|
</div>
|
23
30
|
|
31
|
+
<div class="field" data-meeting-type="online">
|
32
|
+
<%= form.text_field :online_meeting_url %>
|
33
|
+
<p class="help-text"><%= t(".online_meeting_url_help") %></p>
|
34
|
+
</div>
|
35
|
+
|
36
|
+
<div class="iframe-fields">
|
37
|
+
<div class="field" data-meeting-type="online">
|
38
|
+
<%= form.select :iframe_embed_type,
|
39
|
+
@form.iframe_embed_type_select,
|
40
|
+
{ multiple: false } %>
|
41
|
+
<p class="help-text"><%= t(".show_embedded_iframe_help", domains: Decidim::Meetings.embeddable_services&.join(" ")) %></p>
|
42
|
+
</div>
|
43
|
+
|
44
|
+
<div class="field iframe-fields--access-level" id="meeting_iframe_embed_type" data-meeting-type="online-access-level">
|
45
|
+
<%= form.select :iframe_access_level,
|
46
|
+
@form.iframe_access_level_select,
|
47
|
+
{ include_blank: t(".select_an_iframe_access_level") },
|
48
|
+
{ multiple: false } %>
|
49
|
+
</div>
|
50
|
+
</div>
|
51
|
+
|
24
52
|
<div class="field">
|
25
53
|
<%= form.datetime_field :start_time %>
|
26
54
|
</div>
|
@@ -39,6 +67,28 @@
|
|
39
67
|
<%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: t(".select_a_category"), disable_parents: false %>
|
40
68
|
</div>
|
41
69
|
|
70
|
+
<div class="row column">
|
71
|
+
<%= form.select :registration_type,
|
72
|
+
@form.registration_type_select,
|
73
|
+
{ include_blank: t(".select_a_registration_type") },
|
74
|
+
{ multiple: false } %>
|
75
|
+
</div>
|
76
|
+
|
77
|
+
<div class="row column" id="meeting_available_slots">
|
78
|
+
<%= form.number_field :available_slots %>
|
79
|
+
<p class="help-text"><%= t(".available_slots_help") %></p>
|
80
|
+
</div>
|
81
|
+
|
82
|
+
<div class="field" id="meeting_registration_terms">
|
83
|
+
<%= text_editor_for(form, :registration_terms) %>
|
84
|
+
</div>
|
85
|
+
|
86
|
+
<div class="field" id="meeting_registration_url">
|
87
|
+
<%= form.text_field :registration_url %>
|
88
|
+
<p class="help-text"><%= t(".registration_url_help") %></p>
|
89
|
+
<label><%= t(".disclaimer", organization: current_component.organization.name) %></label><br>
|
90
|
+
</div>
|
91
|
+
|
42
92
|
<div class="field">
|
43
93
|
<%= form.select(
|
44
94
|
:user_group_id,
|
@@ -48,4 +98,6 @@
|
|
48
98
|
) %>
|
49
99
|
</div>
|
50
100
|
|
51
|
-
|
101
|
+
<% content_for :js_content do %>
|
102
|
+
<%= javascript_pack_tag "decidim_meetings" %>
|
103
|
+
<% end %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<div class="card card--meeting">
|
5
5
|
<div class="card__content">
|
6
6
|
<%= link_to resource_locator(meeting).path, class: "card__link" do %>
|
7
|
-
<h5 class="card__title"><%= present(meeting).title %></h5>
|
7
|
+
<h5 class="card__title"><%= present(meeting).title(html_escape: true) %></h5>
|
8
8
|
<% end %>
|
9
9
|
<div class="card__datetime">
|
10
10
|
<div class="card__datetime__date">
|
@@ -14,7 +14,7 @@
|
|
14
14
|
<%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
|
15
15
|
</div>
|
16
16
|
</div>
|
17
|
-
<%=
|
17
|
+
<%= decidim_sanitize_editor(present(meeting).description) %>
|
18
18
|
</div>
|
19
19
|
</div>
|
20
20
|
</div>
|