decidim-core 0.28.2 → 0.29.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/cells/decidim/activities_cell.rb +0 -1
- data/app/cells/decidim/activity_cell.rb +5 -7
- data/app/cells/decidim/address_cell.rb +3 -5
- data/app/cells/decidim/amendable/amend_button_card_cell.rb +0 -2
- data/app/cells/decidim/amendable/amendments_cell.rb +0 -2
- data/app/cells/decidim/amendable/announcement_cell.rb +10 -14
- data/app/cells/decidim/amendable/emendation_actions_cell.rb +0 -2
- data/app/cells/decidim/amendable/promote_button_card_cell.rb +0 -2
- data/app/cells/decidim/amendable/wizard_step_form_cell.rb +6 -19
- data/app/cells/decidim/announcement/show.erb +1 -1
- data/app/cells/decidim/announcement_cell.rb +6 -2
- data/app/cells/decidim/attachments_file_tab/show.erb +3 -0
- data/app/cells/decidim/attachments_file_tab_cell.rb +11 -0
- data/app/cells/decidim/attachments_link_tab/show.erb +12 -0
- data/app/cells/decidim/attachments_link_tab_cell.rb +21 -0
- data/app/cells/decidim/author/flag.erb +2 -2
- data/app/cells/decidim/author_cell.rb +0 -2
- data/app/cells/decidim/authorization_modal_cell.rb +0 -3
- data/app/cells/decidim/badge_cell.rb +0 -4
- data/app/cells/decidim/badges_cell.rb +0 -2
- data/app/cells/decidim/button_cell.rb +0 -3
- data/app/cells/decidim/card_cell.rb +1 -5
- data/app/cells/decidim/card_g_cell.rb +2 -2
- data/app/cells/decidim/card_l/space.erb +1 -1
- data/app/cells/decidim/card_l_cell.rb +1 -3
- data/app/cells/decidim/card_metadata_cell.rb +1 -5
- data/app/cells/decidim/card_s_cell.rb +1 -4
- data/app/cells/decidim/coauthorships_cell.rb +0 -2
- data/app/cells/decidim/comments_button_cell.rb +0 -2
- data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/footer_sub_hero_cell.rb +0 -3
- data/app/cells/decidim/content_blocks/hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/hero_cell.rb +0 -1
- data/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb +0 -2
- data/app/cells/decidim/content_blocks/how_to_participate/show.erb +1 -1
- data/app/cells/decidim/content_blocks/how_to_participate_cell.rb +0 -1
- data/app/cells/decidim/content_blocks/participatory_space_documents/content.erb +1 -1
- data/app/cells/decidim/content_blocks/participatory_space_documents_cell.rb +17 -1
- data/app/cells/decidim/content_blocks/participatory_space_hero_cell.rb +0 -2
- data/app/cells/decidim/content_blocks/participatory_space_last_activity_cell.rb +1 -3
- data/app/cells/decidim/content_blocks/stats/show.erb +1 -1
- data/app/cells/decidim/content_blocks/sub_hero_cell.rb +0 -3
- data/app/cells/decidim/date_range/show.erb +10 -10
- data/app/cells/decidim/date_range_cell.rb +0 -2
- data/app/cells/decidim/diff_cell.rb +0 -1
- data/app/cells/decidim/documents_panel/show.erb +4 -0
- data/app/cells/decidim/documents_panel_cell.rb +9 -1
- data/app/cells/decidim/endorsement_buttons_cell.rb +5 -13
- data/app/cells/decidim/flag_modal/flag_user.erb +3 -3
- data/app/cells/decidim/followers_cell.rb +0 -1
- data/app/cells/decidim/following_cell.rb +0 -1
- data/app/cells/decidim/footer_topics/show.erb +8 -0
- data/app/cells/decidim/footer_topics_cell.rb +39 -0
- data/app/cells/decidim/groups_cell.rb +0 -3
- data/app/cells/decidim/linked_resources_for_cell.rb +0 -3
- data/app/cells/decidim/members_cell.rb +0 -1
- data/app/cells/decidim/navbar_admin_link_cell.rb +0 -2
- data/app/cells/decidim/newsletter_templates/base_cell.rb +0 -1
- data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb +2 -2
- data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb +2 -2
- data/app/cells/decidim/notification/show.erb +5 -0
- data/app/cells/decidim/notification_actions/base_cell.rb +13 -0
- data/app/cells/decidim/notification_actions/buttons/show.erb +5 -0
- data/app/cells/decidim/notification_actions/buttons_cell.rb +41 -0
- data/app/cells/decidim/notification_cell.rb +9 -3
- data/app/cells/decidim/notifications_cell.rb +0 -1
- data/app/cells/decidim/pad_iframe/show.erb +2 -2
- data/app/cells/decidim/pad_iframe_cell.rb +0 -1
- data/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb +1 -2
- data/app/cells/decidim/photo_cell.rb +1 -5
- data/app/cells/decidim/photos_list_cell.rb +0 -2
- data/app/cells/decidim/profile_cell.rb +0 -2
- data/app/cells/decidim/profile_sidebar/show.erb +20 -20
- data/app/cells/decidim/profile_sidebar_cell.rb +1 -10
- data/app/cells/decidim/progress_bar/show.erb +8 -6
- data/app/cells/decidim/public_participation/show.erb +1 -1
- data/app/cells/decidim/report_button/flag_modal.erb +1 -1
- data/app/cells/decidim/resource_types_filter_cell.rb +0 -2
- data/app/cells/decidim/scopes_picker/show.erb +1 -1
- data/app/cells/decidim/scopes_picker_cell.rb +0 -1
- data/app/cells/decidim/search_results_cell.rb +1 -1
- data/app/cells/decidim/statistic_cell.rb +0 -2
- data/app/cells/decidim/tab_panels/show.erb +1 -1
- data/app/cells/decidim/tab_panels_cell.rb +12 -2
- data/app/cells/decidim/tags_cell.rb +0 -2
- data/app/cells/decidim/tos_page_cell.rb +0 -3
- data/app/cells/decidim/translation_bar/show.erb +1 -1
- data/app/cells/decidim/translation_bar_cell.rb +0 -2
- data/app/cells/decidim/upload_modal/files.erb +1 -1
- data/app/cells/decidim/upload_modal_cell.rb +1 -3
- data/app/cells/decidim/user_conversation/new.erb +1 -1
- data/app/cells/decidim/user_conversation/show.erb +1 -1
- data/app/cells/decidim/user_conversation_cell.rb +0 -1
- data/app/cells/decidim/user_conversations/show.erb +1 -1
- data/app/cells/decidim/user_conversations_cell.rb +0 -1
- data/app/cells/decidim/user_group_pending_invitations_list_cell.rb +0 -1
- data/app/cells/decidim/user_group_pending_requests_list_cell.rb +0 -1
- data/app/cells/decidim/user_timeline/show.erb +1 -1
- data/app/cells/decidim/version_cell.rb +3 -5
- data/app/cells/decidim/versions_list_cell.rb +1 -3
- data/app/cells/decidim/versions_list_item_cell.rb +2 -4
- data/app/cells/decidim/wizard_step_form/wizard_aside.erb +2 -2
- data/app/cells/decidim/wizard_step_form/wizard_header.erb +2 -3
- data/app/cells/decidim/wizard_step_form_cell.rb +0 -8
- data/app/commands/decidim/amendable/create_draft.rb +4 -3
- data/app/commands/decidim/amendable/promote.rb +3 -2
- data/app/commands/decidim/amendable/publish_draft.rb +3 -2
- data/app/commands/decidim/amendable/update_draft.rb +4 -3
- data/app/commands/decidim/amendable/withdraw.rb +1 -1
- data/app/commands/decidim/create_follow.rb +4 -4
- data/app/commands/decidim/create_report.rb +3 -3
- data/app/commands/decidim/create_user_report.rb +5 -5
- data/app/commands/decidim/delete_follow.rb +4 -4
- data/app/commands/decidim/demote_membership.rb +2 -2
- data/app/commands/decidim/destroy_account.rb +21 -19
- data/app/commands/decidim/endorse_resource.rb +1 -1
- data/app/commands/decidim/invite_user_to_group.rb +5 -4
- data/app/commands/decidim/update_account.rb +24 -22
- data/app/commands/decidim/update_notifications_settings.rb +13 -11
- data/app/commands/decidim/update_password.rb +7 -7
- data/app/commands/decidim/update_user_interests.rb +9 -7
- data/app/controllers/concerns/decidim/devise_controllers.rb +2 -0
- data/app/controllers/concerns/decidim/filter_resource.rb +1 -1
- data/app/controllers/concerns/decidim/needs_rtl_direction.rb +23 -0
- data/app/controllers/concerns/decidim/participatory_space_context.rb +1 -23
- data/app/controllers/concerns/decidim/payload_info.rb +2 -1
- data/app/controllers/concerns/decidim/registers_permissions.rb +4 -4
- data/app/controllers/concerns/decidim/use_organization_time_zone.rb +1 -1
- data/app/controllers/concerns/decidim/withdrawable.rb +1 -1
- data/app/controllers/decidim/account_controller.rb +2 -2
- data/app/controllers/{concerns/decidim → decidim}/amendments_controller.rb +3 -16
- data/app/controllers/decidim/application_controller.rb +1 -0
- data/app/controllers/decidim/components/base_controller.rb +1 -1
- data/app/controllers/decidim/devise/invitations_controller.rb +1 -1
- data/app/controllers/decidim/devise/passwords_controller.rb +2 -2
- data/app/controllers/decidim/endorsements_controller.rb +1 -1
- data/app/controllers/decidim/favicon_controller.rb +1 -1
- data/app/controllers/decidim/follows_controller.rb +2 -2
- data/app/controllers/decidim/group_invites_controller.rb +36 -9
- data/app/controllers/decidim/newsletters_opt_in_controller.rb +1 -1
- data/app/controllers/decidim/notifications_settings_controller.rb +1 -1
- data/app/controllers/decidim/report_users_controller.rb +1 -1
- data/app/controllers/decidim/reports_controller.rb +1 -1
- data/app/controllers/decidim/user_interests_controller.rb +1 -1
- data/app/events/decidim/change_nickname_event.rb +0 -1
- data/app/events/decidim/invited_to_group_event.rb +29 -0
- data/app/events/decidim/welcome_notification_event.rb +2 -4
- data/app/forms/decidim/form.rb +4 -0
- data/app/forms/decidim/omniauth_registration_form.rb +1 -1
- data/app/forms/decidim/upload_validation_form.rb +1 -1
- data/app/helpers/concerns/decidim/flash_helper_extensions.rb +1 -1
- data/app/helpers/decidim/amendments_helper.rb +4 -14
- data/app/helpers/decidim/application_helper.rb +8 -0
- data/app/helpers/decidim/authorization_form_helper.rb +2 -2
- data/app/helpers/decidim/breadcrumb_helper.rb +1 -1
- data/app/helpers/decidim/cells_helper.rb +1 -1
- data/app/helpers/decidim/check_boxes_tree_helper.rb +1 -1
- data/app/helpers/decidim/datalist_select_helper.rb +1 -1
- data/app/helpers/decidim/decidim_form_helper.rb +3 -3
- data/app/helpers/decidim/filters_helper.rb +1 -1
- data/app/helpers/decidim/layout_helper.rb +1 -36
- data/app/helpers/decidim/localized_locales_helper.rb +1 -1
- data/app/helpers/decidim/menu_helper.rb +8 -0
- data/app/helpers/decidim/meta_tags_helper.rb +26 -23
- data/app/helpers/decidim/modal_helper.rb +1 -1
- data/app/helpers/decidim/orders_helper.rb +1 -1
- data/app/helpers/decidim/organization_helper.rb +55 -0
- data/app/helpers/decidim/paginate_helper.rb +1 -1
- data/app/helpers/decidim/resource_helper.rb +0 -7
- data/app/helpers/decidim/scopes_helper.rb +4 -2
- data/app/helpers/decidim/searches_helper.rb +1 -1
- data/app/helpers/decidim/short_link_helper.rb +2 -2
- data/app/helpers/decidim/translations_helper.rb +2 -2
- data/app/helpers/decidim/twitter_search_helper.rb +1 -1
- data/app/helpers/decidim/user_profile_helper.rb +0 -1
- data/app/jobs/decidim/email_notifications_digest_generator_job.rb +2 -2
- data/app/mailers/decidim/application_mailer.rb +6 -2
- data/app/mailers/decidim/block_user_mailer.rb +1 -1
- data/app/mailers/decidim/decidim_devise_mailer.rb +7 -1
- data/app/mailers/decidim/newsletter_mailer.rb +1 -4
- data/app/mailers/decidim/newsletters_opt_in_mailer.rb +2 -2
- data/app/mailers/decidim/notification_mailer.rb +0 -1
- data/app/mailers/decidim/notifications_digest_mailer.rb +0 -1
- data/app/mailers/decidim/reported_mailer.rb +6 -3
- data/app/mailers/decidim/user_report_mailer.rb +1 -1
- data/app/models/decidim/action_log.rb +1 -1
- data/app/models/decidim/area_type.rb +1 -1
- data/app/models/decidim/attachment.rb +26 -2
- data/app/models/decidim/authorization.rb +1 -1
- data/app/models/decidim/authorization_transfer.rb +1 -0
- data/app/models/decidim/component.rb +2 -2
- data/app/models/decidim/content_block.rb +1 -1
- data/app/models/decidim/messaging/message.rb +2 -2
- data/app/models/decidim/newsletter.rb +9 -9
- data/app/models/decidim/notification.rb +2 -2
- data/app/models/decidim/organization.rb +23 -2
- data/app/models/decidim/push_notification_message.rb +1 -1
- data/app/models/decidim/resource_link.rb +1 -1
- data/app/models/decidim/user.rb +2 -2
- data/app/models/decidim/user_group.rb +2 -2
- data/app/packs/src/decidim/a11y.js +46 -0
- data/app/packs/src/decidim/attachments/file_or_link_tabs.js +55 -0
- data/app/packs/src/decidim/attachments/index.js +1 -0
- data/app/packs/src/decidim/back_to_list.js +1 -1
- data/app/packs/src/decidim/check_boxes_tree.js +1 -1
- data/app/packs/src/decidim/data_consent/consent_manager.js +1 -1
- data/app/packs/src/decidim/data_consent/consent_manager.test.js +6 -6
- data/app/packs/src/decidim/data_consent/index.js +1 -1
- data/app/packs/src/decidim/datepicker/datepicker_functions.js +243 -0
- data/app/packs/src/decidim/datepicker/datepicker_listeners.js +78 -0
- data/app/packs/src/decidim/datepicker/form_datepicker.js +91 -0
- data/app/packs/src/decidim/datepicker/generate_datepicker.js +148 -0
- data/app/packs/src/decidim/datepicker/generate_timepicker.js +298 -0
- data/app/packs/src/decidim/datepicker/test/date.test.js +118 -0
- data/app/packs/src/decidim/datepicker/test/time.test.js +227 -0
- data/app/packs/src/decidim/editor/extensions/indent/index.js +1 -1
- data/app/packs/src/decidim/editor/extensions/video_embed/index.js +4 -4
- data/app/packs/src/decidim/editor/test/extensions/decidim_kit.test.js +0 -15
- data/app/packs/src/decidim/editor/test/extensions/indent.test.js +1 -1
- data/app/packs/src/decidim/editor/test/fixtures/upload_templates.js +1 -1
- data/app/packs/src/decidim/editor/test/helpers.js +1 -14
- data/app/packs/src/decidim/editor/utilities/paste_transform.js +2 -2
- data/app/packs/src/decidim/external_domain_warning.js +2 -2
- data/app/packs/src/decidim/external_domain_warning.test.js +4 -4
- data/app/packs/src/decidim/form_filter.js +4 -4
- data/app/packs/src/decidim/impersonation.js +1 -1
- data/app/packs/src/decidim/index.js +11 -5
- data/app/packs/src/decidim/input_character_counter.js +1 -1
- data/app/packs/src/decidim/input_emoji.js +171 -72
- data/app/packs/src/decidim/input_hashtags.js +1 -1
- data/app/packs/src/decidim/input_mentions.js +1 -1
- data/app/packs/src/decidim/notifications_actions.js +40 -0
- data/app/packs/src/decidim/sticky_header.js +87 -0
- data/app/packs/src/decidim/sw/sw.js +8 -6
- data/app/packs/src/decidim/tooltips.js +1 -1
- data/app/packs/stylesheets/decidim/_datepicker.scss +193 -0
- data/app/packs/stylesheets/decidim/_dropdown.scss +36 -0
- data/app/packs/stylesheets/decidim/_emoji.scss +36 -0
- data/app/packs/stylesheets/decidim/_filters.scss +4 -2
- data/app/packs/stylesheets/decidim/_flash.scss +2 -2
- data/app/packs/stylesheets/decidim/_footer.scss +1 -3
- data/app/packs/stylesheets/decidim/_forms.scss +9 -1
- data/app/packs/stylesheets/decidim/_header.scss +70 -50
- data/app/packs/stylesheets/decidim/_home.scss +1 -1
- data/app/packs/stylesheets/decidim/_layout.scss +13 -0
- data/app/packs/stylesheets/decidim/_modal.scss +1 -1
- data/app/packs/stylesheets/decidim/_modal_update.scss +1 -1
- data/app/packs/stylesheets/decidim/_notifications.scss +4 -0
- data/app/packs/stylesheets/decidim/_tabs_x.scss +5 -1
- data/app/packs/stylesheets/decidim/application.scss +4 -0
- data/app/packs/stylesheets/decidim/legacy/leaflet.scss +1 -1
- data/app/packs/stylesheets/decidim/vendor/_datepicker_light.scss +228 -0
- data/app/permissions/decidim/default_permissions.rb +2 -2
- data/app/presenters/decidim/admin_log/organization_presenter.rb +1 -1
- data/app/presenters/decidim/admin_log/static_page_presenter.rb +1 -1
- data/app/presenters/decidim/authorization_transfer_presenter.rb +1 -1
- data/app/presenters/decidim/component_attachment_collection_presenter.rb +81 -0
- data/app/presenters/decidim/footer_menu_presenter.rb +1 -1
- data/app/presenters/decidim/home_stats_presenter.rb +1 -1
- data/app/presenters/decidim/organization_presenter.rb +1 -1
- data/app/queries/decidim/metric_measure.rb +1 -1
- data/app/queries/decidim/public_activities.rb +1 -1
- data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
- data/app/services/decidim/action_logger.rb +3 -3
- data/app/services/decidim/log/diff_changeset_calculator.rb +2 -2
- data/app/services/decidim/notifications_digest_sending_decider.rb +1 -1
- data/app/uploaders/decidim/organization_favicon_uploader.rb +1 -1
- data/app/uploaders/decidim/record_image_uploader.rb +2 -2
- data/app/validators/organization_present_validator.rb +1 -1
- data/app/validators/passthru_validator.rb +1 -1
- data/app/validators/uploader_image_dimensions_validator.rb +2 -2
- data/app/views/decidim/account/show.html.erb +1 -1
- data/app/views/decidim/amendments/_wizard_header.html.erb +1 -2
- data/app/views/decidim/application/_collection.html.erb +3 -1
- data/app/views/decidim/application/_component_documents.html.erb +4 -0
- data/app/views/decidim/application/_document.html.erb +23 -9
- data/app/views/decidim/block_user_mailer/notify.html.erb +2 -2
- data/app/views/decidim/devise/invitations/edit.html.erb +2 -2
- data/app/views/decidim/devise/omniauth_registrations/new.html.erb +1 -1
- data/app/views/decidim/devise/registrations/new.html.erb +1 -1
- data/app/views/decidim/devise/shared/_login_boxes.html.erb +1 -1
- data/app/views/decidim/doorkeeper/authorizations/new.html.erb +1 -1
- data/app/views/decidim/endorsements/_identity.html.erb +1 -1
- data/app/views/decidim/gamification/badges/index.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb +2 -2
- data/app/views/decidim/messaging/conversations/_error_modal.html.erb +5 -5
- data/app/views/decidim/newsletter_mailer/newsletter.html.erb +1 -1
- data/app/views/decidim/newsletters/show.html.erb +1 -1
- data/app/views/decidim/newsletters_opt_in_mailer/notify.html.erb +2 -2
- data/app/views/decidim/pages/index.html.erb +1 -2
- data/app/views/decidim/reported_mailer/report.html.erb +4 -2
- data/app/views/decidim/scopes/picker.html.erb +5 -5
- data/app/views/decidim/searches/_resources_filter_block.html.erb +6 -6
- data/app/views/decidim/shared/_extended_navigation_bar.html.erb +8 -8
- data/app/views/decidim/shared/_login_modal.html.erb +1 -1
- data/app/views/decidim/user_interests/_areas.html.erb +2 -2
- data/app/views/decidim/user_report_mailer/notify.html.erb +2 -2
- data/app/views/decidim/user_update_mailer/notify.html.erb +1 -1
- data/app/views/decidim/widgets/_data_picker.html.erb +1 -1
- data/app/views/devise/mailer/invitation_instructions.html.erb +1 -1
- data/app/views/devise/mailer/invitation_instructions.text.erb +1 -1
- data/app/views/devise/mailer/invite_admin.html.erb +2 -2
- data/app/views/devise/mailer/invite_admin.text.erb +2 -2
- data/app/views/devise/mailer/invite_collaborator.html.erb +2 -2
- data/app/views/devise/mailer/invite_collaborator.text.erb +2 -2
- data/app/views/devise/mailer/invite_private_user.html.erb +2 -2
- data/app/views/devise/mailer/invite_private_user.text.erb +2 -2
- data/app/views/devise/mailer/organization_admin_invitation_instructions.html.erb +1 -1
- data/app/views/devise/mailer/organization_admin_invitation_instructions.text.erb +1 -1
- data/app/views/layouts/decidim/_application.html.erb +3 -6
- data/app/views/layouts/decidim/_data_consent_warning.html.erb +2 -2
- data/app/views/layouts/decidim/_decidim_javascript.html.erb +1 -1
- data/app/views/layouts/decidim/_head_extra.html.erb +2 -2
- data/app/views/layouts/decidim/_impersonation_warning.html.erb +1 -1
- data/app/views/layouts/decidim/_js_configuration.html.erb +7 -2
- data/app/views/layouts/decidim/_logo.html.erb +2 -2
- data/app/views/layouts/decidim/_logo_mobile.html.erb +11 -0
- data/app/views/layouts/decidim/_mailer_logo.html.erb +2 -2
- data/app/views/layouts/decidim/_meta_tags_config.html.erb +1 -1
- data/app/views/layouts/decidim/_wrapper.html.erb +16 -9
- data/app/views/layouts/decidim/footer/_main.html.erb +2 -3
- data/app/views/layouts/decidim/footer/_main_intro.html.erb +2 -2
- data/app/views/layouts/decidim/footer/_main_legal.html.erb +2 -3
- data/app/views/layouts/decidim/footer/_main_links.html.erb +13 -11
- data/app/views/layouts/decidim/footer/_main_social_media_links.html.erb +8 -8
- data/app/views/layouts/decidim/header/_main.html.erb +9 -22
- data/app/views/layouts/decidim/header/_main_links_desktop.html.erb +3 -4
- data/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb +10 -3
- data/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb +24 -0
- data/app/views/layouts/decidim/header/_main_links_mobile_search.html.erb +0 -21
- data/app/views/layouts/decidim/header/_main_menu_mobile.html.erb +12 -0
- data/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb +1 -1
- data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_mobile.html.erb +17 -0
- data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_top_left.html.erb +1 -1
- data/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb +1 -1
- data/app/views/layouts/decidim/header/_menu_form_search_mobile.html.erb +16 -0
- data/app/views/layouts/decidim/header/_mobile_language_choose.html.erb +25 -0
- data/app/views/layouts/decidim/mailer.html.erb +2 -2
- data/app/views/layouts/decidim/shared/_layout_center.html.erb +1 -1
- data/app/views/layouts/decidim/shared/_layout_item.html.erb +0 -14
- data/config/initializers/active_storage.rb +3 -0
- data/config/initializers/devise.rb +1 -1
- data/config/initializers/new_framework_defaults_7_0.rb +145 -0
- data/config/locales/ar.yml +2 -42
- data/config/locales/bg.yml +55 -57
- data/config/locales/ca.yml +65 -54
- data/config/locales/cs.yml +53 -55
- data/config/locales/de.yml +63 -52
- data/config/locales/el.yml +0 -29
- data/config/locales/en.yml +68 -57
- data/config/locales/es-MX.yml +67 -56
- data/config/locales/es-PY.yml +67 -56
- data/config/locales/es.yml +66 -55
- data/config/locales/eu.yml +67 -56
- data/config/locales/fi-plain.yml +66 -55
- data/config/locales/fi.yml +65 -54
- data/config/locales/fr-CA.yml +60 -55
- data/config/locales/fr.yml +55 -50
- data/config/locales/ga-IE.yml +0 -11
- data/config/locales/gl.yml +0 -18
- data/config/locales/hu.yml +36 -56
- data/config/locales/id-ID.yml +0 -14
- data/config/locales/is-IS.yml +0 -10
- data/config/locales/it.yml +0 -25
- data/config/locales/ja.yml +67 -56
- data/config/locales/lb.yml +0 -25
- data/config/locales/lt.yml +0 -48
- data/config/locales/lv.yml +0 -21
- data/config/locales/nl.yml +0 -24
- data/config/locales/no.yml +0 -25
- data/config/locales/pl.yml +67 -56
- data/config/locales/pt-BR.yml +4 -51
- data/config/locales/pt.yml +0 -25
- data/config/locales/ro-RO.yml +1 -28
- data/config/locales/ru.yml +0 -15
- data/config/locales/sk.yml +0 -21
- data/config/locales/sl.yml +0 -8
- data/config/locales/sv.yml +0 -33
- data/config/locales/tr-TR.yml +4 -27
- data/config/locales/uk.yml +0 -10
- data/config/locales/zh-CN.yml +0 -22
- data/config/locales/zh-TW.yml +0 -47
- data/config/routes.rb +0 -1
- data/db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb +1 -1
- data/db/migrate/20240110150230_rename_external_domain_whitelist_to_external_domain_allowlist.rb +7 -0
- data/db/migrate/20240326104215_remove_show_in_footer_in_static_pages.rb +7 -0
- data/db/migrate/20240401192628_change_name_on_decidim_organizations.rb +31 -0
- data/db/seeds/avatars/001.jpg +0 -0
- data/db/seeds/avatars/002.jpg +0 -0
- data/db/seeds/avatars/003.jpg +0 -0
- data/db/seeds/avatars/004.jpg +0 -0
- data/db/seeds/avatars/005.jpg +0 -0
- data/db/seeds/avatars/006.jpg +0 -0
- data/db/seeds/avatars/007.jpg +0 -0
- data/db/seeds/avatars/008.jpg +0 -0
- data/db/seeds/avatars/009.jpg +0 -0
- data/db/seeds/avatars/010.jpg +0 -0
- data/db/seeds/avatars/011.jpg +0 -0
- data/db/seeds/avatars/012.jpg +0 -0
- data/db/seeds/avatars/013.jpg +0 -0
- data/db/seeds/avatars/014.jpg +0 -0
- data/db/seeds/avatars/015.jpg +0 -0
- data/db/seeds/avatars/016.jpg +0 -0
- data/db/seeds/avatars/017.jpg +0 -0
- data/db/seeds/avatars/018.jpg +0 -0
- data/db/seeds/avatars/019.jpg +0 -0
- data/db/seeds/avatars/020.jpg +0 -0
- data/db/seeds/avatars/021.jpg +0 -0
- data/db/seeds/avatars/022.jpg +0 -0
- data/db/seeds/avatars/023.jpg +0 -0
- data/db/seeds/avatars/024.jpg +0 -0
- data/db/seeds/avatars/025.jpg +0 -0
- data/db/seeds/avatars/026.jpg +0 -0
- data/db/seeds/avatars/027.jpg +0 -0
- data/db/seeds/avatars/028.jpg +0 -0
- data/db/seeds/avatars/029.jpg +0 -0
- data/db/seeds/avatars/030.jpg +0 -0
- data/db/seeds/avatars/031.jpg +0 -0
- data/db/seeds/avatars/032.jpg +0 -0
- data/db/seeds/avatars/033.jpg +0 -0
- data/db/seeds/avatars/034.jpg +0 -0
- data/db/seeds/avatars/035.jpg +0 -0
- data/db/seeds/avatars/036.jpg +0 -0
- data/db/seeds/avatars/037.jpg +0 -0
- data/db/seeds/avatars/038.jpg +0 -0
- data/db/seeds/avatars/039.jpg +0 -0
- data/db/seeds/avatars/040.jpg +0 -0
- data/db/seeds/avatars/041.jpg +0 -0
- data/db/seeds/avatars/042.jpg +0 -0
- data/db/seeds/avatars/043.jpg +0 -0
- data/db/seeds/avatars/044.jpg +0 -0
- data/db/seeds/avatars/045.jpg +0 -0
- data/db/seeds/avatars/046.jpg +0 -0
- data/db/seeds/avatars/047.jpg +0 -0
- data/db/seeds/avatars/048.jpg +0 -0
- data/db/seeds/avatars/049.jpg +0 -0
- data/db/seeds/avatars/050.jpg +0 -0
- data/db/seeds/avatars/051.jpg +0 -0
- data/db/seeds/avatars/052.jpg +0 -0
- data/db/seeds/avatars/053.jpg +0 -0
- data/db/seeds/avatars/054.jpg +0 -0
- data/db/seeds/avatars/055.jpg +0 -0
- data/db/seeds/avatars/056.jpg +0 -0
- data/db/seeds/avatars/057.jpg +0 -0
- data/db/seeds/avatars/058.jpg +0 -0
- data/db/seeds/avatars/059.jpg +0 -0
- data/db/seeds/avatars/060.jpg +0 -0
- data/db/seeds/avatars/061.jpg +0 -0
- data/db/seeds/avatars/062.jpg +0 -0
- data/db/seeds/avatars/063.jpg +0 -0
- data/db/seeds/avatars/064.jpg +0 -0
- data/db/seeds/avatars/065.jpg +0 -0
- data/db/seeds/avatars/066.jpg +0 -0
- data/db/seeds/avatars/067.jpg +0 -0
- data/db/seeds/avatars/068.jpg +0 -0
- data/db/seeds/avatars/069.jpg +0 -0
- data/db/seeds/avatars/070.jpg +0 -0
- data/db/seeds/avatars/071.jpg +0 -0
- data/db/seeds/avatars/072.jpg +0 -0
- data/db/seeds/avatars/073.jpg +0 -0
- data/db/seeds/avatars/074.jpg +0 -0
- data/db/seeds/avatars/075.jpg +0 -0
- data/db/seeds/avatars/076.jpg +0 -0
- data/db/seeds/avatars/077.jpg +0 -0
- data/db/seeds/avatars/078.jpg +0 -0
- data/db/seeds/avatars/079.jpg +0 -0
- data/db/seeds/avatars/080.jpg +0 -0
- data/db/seeds/avatars/081.jpg +0 -0
- data/db/seeds/avatars/082.jpg +0 -0
- data/db/seeds/avatars/083.jpg +0 -0
- data/db/seeds/avatars/084.jpg +0 -0
- data/db/seeds/avatars/085.jpg +0 -0
- data/db/seeds/avatars/086.jpg +0 -0
- data/db/seeds/avatars/087.jpg +0 -0
- data/db/seeds/avatars/088.jpg +0 -0
- data/db/seeds/avatars/089.jpg +0 -0
- data/db/seeds/avatars/090.jpg +0 -0
- data/db/seeds/avatars/091.jpg +0 -0
- data/db/seeds/avatars/092.jpg +0 -0
- data/db/seeds/avatars/093.jpg +0 -0
- data/db/seeds/avatars/094.jpg +0 -0
- data/db/seeds/avatars/095.jpg +0 -0
- data/db/seeds/avatars/096.jpg +0 -0
- data/db/seeds/avatars/097.jpg +0 -0
- data/db/seeds/avatars/098.jpg +0 -0
- data/db/seeds/avatars/099.jpg +0 -0
- data/db/seeds/avatars/100.jpg +0 -0
- data/db/seeds/avatars/CREDITS.md +114 -0
- data/db/seeds/avatars/README.md +25 -0
- data/decidim-core.gemspec +6 -5
- data/lib/decidim/acts_as_author.rb +1 -1
- data/lib/decidim/admin_filter.rb +44 -0
- data/lib/decidim/admin_filters_registry.rb +55 -0
- data/lib/decidim/amendable.rb +1 -2
- data/lib/decidim/api/functions/component_finder_base.rb +1 -1
- data/lib/decidim/api/functions/needs_api_filter_and_order.rb +3 -3
- data/lib/decidim/api/functions/participatory_space_finder_base.rb +1 -1
- data/lib/decidim/api/functions/participatory_space_list_base.rb +1 -1
- data/lib/decidim/api/input_filters/user_entity_input_filter.rb +3 -3
- data/lib/decidim/api/interfaces/author_interface.rb +1 -1
- data/lib/decidim/api/types/organization_type.rb +1 -1
- data/lib/decidim/api/types/user_group_type.rb +1 -1
- data/lib/decidim/api/types/user_type.rb +1 -1
- data/lib/decidim/asset_router/pipeline.rb +2 -2
- data/lib/decidim/assets/tailwind/instance.rb +1 -1
- data/lib/decidim/assets/tailwind/tailwind.config.js.erb +8 -3
- data/lib/decidim/attribute_object/model.rb +2 -2
- data/lib/decidim/attribute_object/type_resolver.rb +1 -3
- data/lib/decidim/attribute_object.rb +2 -2
- data/lib/decidim/attributes.rb +0 -4
- data/lib/decidim/authorable.rb +5 -0
- data/lib/decidim/command.rb +2 -2
- data/lib/decidim/commands/create_resource.rb +63 -0
- data/lib/decidim/commands/destroy_resource.rb +74 -0
- data/lib/decidim/commands/hook_error.rb +8 -0
- data/lib/decidim/commands/resource_handler.rb +85 -0
- data/lib/decidim/commands/update_resource.rb +64 -0
- data/lib/decidim/component_manifest.rb +3 -1
- data/lib/decidim/component_validator.rb +1 -1
- data/lib/decidim/content_blocks/has_related_components.rb +1 -1
- data/lib/decidim/content_parsers/resource_parser.rb +2 -2
- data/lib/decidim/content_processor.rb +1 -1
- data/lib/decidim/content_security_policy.rb +1 -1
- data/lib/decidim/core/engine.rb +12 -15
- data/lib/decidim/core/menu.rb +13 -3
- data/lib/decidim/core/seeds.rb +120 -147
- data/lib/decidim/core/test/factories.rb +24 -3
- data/lib/decidim/core/test/shared_examples/acts_as_author_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/amendable/withdraw_amendment_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/announcements_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/assembly_announcements_examples.rb +4 -4
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +88 -82
- data/lib/decidim/core/test/shared_examples/comments_reports_examples.rb +4 -4
- data/lib/decidim/core/test/shared_examples/digest_mail_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/edit_link_shared_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/editor_shared_examples.rb +7 -7
- data/lib/decidim/core/test/shared_examples/fingerprint_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/follows_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/has_attachment_collections.rb +4 -2
- data/lib/decidim/core/test/shared_examples/has_attachments.rb +3 -2
- data/lib/decidim/core/test/shared_examples/has_contextual_help.rb +4 -4
- data/lib/decidim/core/test/shared_examples/has_reference.rb +1 -1
- data/lib/decidim/core/test/shared_examples/logo_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/manage_component_share_tokens.rb +9 -9
- data/lib/decidim/core/test/shared_examples/map_examples.rb +5 -5
- data/lib/decidim/core/test/shared_examples/paginated_resource_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/process_announcements_examples.rb +4 -4
- data/lib/decidim/core/test/shared_examples/reports_examples.rb +5 -5
- data/lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb +10 -10
- data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/searchable_results_examples.rb +8 -8
- data/lib/decidim/core/test/shared_examples/share_link_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/simple_event.rb +1 -1
- data/lib/decidim/core/test/shared_examples/space_cell_changes_button_text_cta.rb +3 -3
- data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +11 -11
- data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/uncommentable_component_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +24 -6
- data/lib/decidim/dependency_resolver.rb +3 -3
- data/lib/decidim/diffy_extension.rb +1 -1
- data/lib/decidim/download_your_data_serializers/download_your_data_user_serializer.rb +2 -1
- data/lib/decidim/engine_router.rb +2 -2
- data/lib/decidim/events/base_event.rb +19 -0
- data/lib/decidim/events/simple_event.rb +1 -0
- data/lib/decidim/exporters/export_manifest.rb +1 -1
- data/lib/decidim/faker/localized.rb +3 -3
- data/lib/decidim/form_builder.rb +4 -4
- data/lib/decidim/hashtag.rb +1 -1
- data/lib/decidim/jsonb_attributes.rb +4 -4
- data/lib/decidim/manifest_messages.rb +2 -2
- data/lib/decidim/organization_settings.rb +5 -5
- data/lib/decidim/paddable.rb +1 -1
- data/lib/decidim/participable.rb +1 -1
- data/lib/decidim/participatory_space_manifest.rb +1 -1
- data/lib/decidim/resourceable.rb +1 -1
- data/lib/decidim/search_resource_fields_mapper.rb +2 -2
- data/lib/decidim/searchable.rb +3 -3
- data/lib/decidim/seeds.rb +62 -0
- data/lib/decidim/stats_registry.rb +2 -2
- data/lib/decidim/translatable_attributes.rb +3 -3
- data/lib/decidim/translatable_resource.rb +1 -1
- data/lib/decidim/view_hooks.rb +1 -1
- data/lib/decidim/view_model.rb +4 -0
- data/lib/decidim/webpacker/esbuild.config.js +14 -0
- data/lib/decidim/webpacker/shakapacker.yml +2 -2
- data/lib/decidim/webpacker/tsconfig.json +11 -0
- data/lib/decidim/webpacker/webpack/custom.js +13 -35
- data/lib/devise/models/decidim_newsletterable.rb +1 -1
- data/lib/tasks/decidim_download_your_data_tasks.rake +2 -2
- data/lib/tasks/decidim_locales_tasks.rake +1 -1
- data/lib/tasks/decidim_mailers_tasks.rake +2 -2
- data/lib/tasks/decidim_metrics_tasks.rake +6 -6
- data/lib/tasks/decidim_procfile.rake +9 -3
- data/lib/tasks/decidim_tasks.rake +5 -4
- data/lib/tasks/decidim_webpacker_tasks.rake +126 -117
- data/lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake +80 -0
- data/lib/tasks/upgrade/decidim_content_blocks_tasks.rake +50 -0
- data/lib/tasks/upgrade/decidim_deduplicate_endorsements.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_categorization.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_short_url_resolver.rake +1 -1
- data/lib/tasks/upgrade/decidim_moderation_tasks.rake +1 -1
- data/lib/tasks/upgrade/decidim_user_moderation.rake +1 -1
- metadata +202 -75
- data/app/cells/decidim/content_blocks/cta/show.erb +0 -12
- data/app/cells/decidim/content_blocks/cta_cell.rb +0 -31
- data/app/cells/decidim/footer_pages/pages.erb +0 -3
- data/app/cells/decidim/footer_pages/topics.erb +0 -12
- data/app/cells/decidim/footer_pages_cell.rb +0 -68
- data/app/packs/src/decidim/vendor/modernizr.js +0 -5
- data/app/queries/decidim/similar_emendations.rb +0 -56
- data/app/uploaders/decidim/cw/application_uploader.rb +0 -77
- data/app/uploaders/decidim/cw/attachment_uploader.rb +0 -56
- data/app/uploaders/decidim/cw/avatar_uploader.rb +0 -24
- data/app/uploaders/decidim/cw/banner_image_uploader.rb +0 -7
- data/app/uploaders/decidim/cw/download_your_data_uploader.rb +0 -15
- data/app/uploaders/decidim/cw/downloader.rb +0 -9
- data/app/uploaders/decidim/cw/hero_image_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/homepage_image_uploader.rb +0 -14
- data/app/uploaders/decidim/cw/image_uploader.rb +0 -78
- data/app/uploaders/decidim/cw/newsletter_template_image_uploader.rb +0 -38
- data/app/uploaders/decidim/cw/oauth_application_logo_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/official_image_footer_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/official_image_header_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/open_data_uploader.rb +0 -23
- data/app/uploaders/decidim/cw/organization_favicon_uploader.rb +0 -18
- data/app/uploaders/decidim/cw/organization_logo_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/record_image_uploader.rb +0 -15
- data/app/uploaders/decidim/downloader.rb +0 -9
- data/app/views/decidim/amendments/compare_draft.html.erb +0 -18
- data/app/views/layouts/decidim/_edit_link.html.erb +0 -0
- data/app/views/layouts/decidim/header/_main_links_mobile.html.erb +0 -36
- data/config/initializers/carrierwave.rb +0 -15
- data/lib/decidim/carrier_wave_migrator_service.rb +0 -287
- data/lib/tasks/decidim_active_storage_migration_tasks.rake +0 -114
- data/lib/tasks/decidim_content_blocks_tasks.rake +0 -48
- /data/app/views/layouts/decidim/header/{_menu_breadcrumb_main_dropdown.html.erb → _menu_breadcrumb_main_dropdown_desktop.html.erb} +0 -0
@@ -18,7 +18,7 @@
|
|
18
18
|
<div class="form__wrapper">
|
19
19
|
<%= f.text_field :name, help_text: t("decidim.devise.omniauth_registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
|
20
20
|
|
21
|
-
<%= f.text_field :nickname, help_text: t("decidim.devise.omniauth_registrations.new.nickname_help", organization:
|
21
|
+
<%= f.text_field :nickname, help_text: t("decidim.devise.omniauth_registrations.new.nickname_help", organization: current_organization_name), autocomplete: "nickname", placeholder: "johndoe" %>
|
22
22
|
|
23
23
|
<%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
|
24
24
|
|
@@ -43,7 +43,7 @@
|
|
43
43
|
<div id="card__tos" class="form__wrapper-block">
|
44
44
|
<h2 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h2>
|
45
45
|
|
46
|
-
<div
|
46
|
+
<div>
|
47
47
|
<% terms_of_service_summary_content_blocks.each do |content_block| %>
|
48
48
|
<%= cell content_block.manifest.cell, content_block %>
|
49
49
|
<% end %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div class="login__box-container">
|
2
2
|
<button type="button" class="login__box" data-dialog-open="loginModal">
|
3
|
-
<%= icon "
|
3
|
+
<%= icon "user-line", class: "login__box-icon" %>
|
4
4
|
<p class="login__box-title">
|
5
5
|
<%= t("already_have_an_account?", scope: ) %>
|
6
6
|
</p>
|
@@ -8,7 +8,7 @@
|
|
8
8
|
|
9
9
|
<div class="login__info">
|
10
10
|
<p>
|
11
|
-
<%= t("connect_your_account_html", scope: "decidim.doorkeeper.authorizations.new", organization:
|
11
|
+
<%= t("connect_your_account_html", scope: "decidim.doorkeeper.authorizations.new", organization: current_organization_name) %>
|
12
12
|
</p>
|
13
13
|
|
14
14
|
<p><%= t("this_application_will_be_able_to", scope: "decidim.doorkeeper.authorizations.new") %></p>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<button type="button" class="<%=
|
1
|
+
<button type="button" class="<%= "is-selected" if selected %>" data-user-identity data-method="<%= http_method.to_s.upcase %>" data-create_url="<%= create_url %>" data-destroy_url="<%= destroy_url %>">
|
2
2
|
<%== cell "decidim/author", identity, skip_profile_link: true %>
|
3
3
|
<%= icon("checkbox-circle-line") %>
|
4
4
|
</button>
|
@@ -27,7 +27,7 @@
|
|
27
27
|
</div>
|
28
28
|
</div>
|
29
29
|
<div class="col-span-7 ml-2">
|
30
|
-
<p><%= badge.description(
|
30
|
+
<p><%= badge.description(current_organization_name) %></p>
|
31
31
|
<p class="mt-4"><strong><%= t ".how" %></strong></p>
|
32
32
|
<ol class="list-decimal">
|
33
33
|
<% badge.conditions.each do |condition| %>
|
@@ -12,10 +12,10 @@
|
|
12
12
|
autocomplete="off"
|
13
13
|
placeholder="<%= t("add_users_placeholder", scope: "decidim.messaging.conversations.add_conversation_users") %>"
|
14
14
|
data-noresults="<%= t("no_results", scope: "decidim.messaging.conversations.add_conversation_users") %>"
|
15
|
-
data-selected="
|
15
|
+
data-selected="conversation__modal-results"
|
16
16
|
contenteditable="true"
|
17
17
|
data-direct-messages-disabled="<%= t("participant_with_disabled_message_reception", scope: "decidim.messaging.conversations.add_conversation_users") %>">
|
18
18
|
</div>
|
19
|
-
<ul class="conversation__modal-results
|
19
|
+
<ul class="conversation__modal-results"></ul>
|
20
20
|
</div>
|
21
21
|
</div>
|
@@ -1,6 +1,6 @@
|
|
1
|
-
<div
|
2
|
-
<div
|
3
|
-
<h2
|
1
|
+
<div id="messageErrorModal" data-reveal>
|
2
|
+
<div>
|
3
|
+
<h2><%= error %></h2>
|
4
4
|
<button class="close-button" data-close aria-label="<%= t(".close") %>"
|
5
5
|
type="button">
|
6
6
|
<span aria-hidden="true">×</span>
|
@@ -13,8 +13,8 @@
|
|
13
13
|
</p>
|
14
14
|
<p><%= t(".correct_errors") %></p>
|
15
15
|
</div>
|
16
|
-
<div
|
17
|
-
<div
|
16
|
+
<div>
|
17
|
+
<div>
|
18
18
|
<a class="button" role="button" href="#" data-close aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
|
19
19
|
</div>
|
20
20
|
</div>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<%= decidim_sanitize_newsletter cell.to_s %>
|
2
2
|
|
3
3
|
<% content_for :note do %>
|
4
|
-
<%== t ".note", organization_name:
|
4
|
+
<%== t ".note", organization_name: organization_name(@organization), link: @newsletter.notifications_settings_url %>
|
5
5
|
<% end %>
|
6
6
|
|
7
7
|
<% content_for :unsubscribe do %>
|
@@ -8,7 +8,7 @@
|
|
8
8
|
<%= decidim_sanitize_newsletter @cell.to_s %>
|
9
9
|
|
10
10
|
<% content_for :note do %>
|
11
|
-
<%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name:
|
11
|
+
<%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: current_organization_name, link: decidim.notifications_settings_url(host: @organization.host) %>
|
12
12
|
<% end %>
|
13
13
|
|
14
14
|
<% if @user.present? %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<p class="email-greeting"><%= t ".hello" %></p>
|
2
2
|
|
3
|
-
<p class="email-instructions"><%= t ".body_1", organization_name:
|
3
|
+
<p class="email-instructions"><%= t ".body_1", organization_name: organization_name(@organization) %></p>
|
4
4
|
|
5
5
|
<p class="email-instructions"><%= t ".body_2" %></p>
|
6
6
|
|
@@ -20,4 +20,4 @@
|
|
20
20
|
|
21
21
|
<p class="email-instructions"><%= t ".body_3" %></p>
|
22
22
|
|
23
|
-
<p class="email-closing"><%= t(".greetings", organization_name:
|
23
|
+
<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
|
@@ -8,13 +8,12 @@ edit_link(
|
|
8
8
|
%>
|
9
9
|
|
10
10
|
<%= render layout:"layouts/decidim/shared/layout_center", locals: { columns: 8 } do %>
|
11
|
-
|
12
11
|
<div class="text-center py-10">
|
13
12
|
<h1 class="title-decorator inline-block text-left mb-12">
|
14
13
|
<%= t "decidim.pages.index.title" %>
|
15
14
|
</h1>
|
16
15
|
<p class="text-lg text-gray-2">
|
17
|
-
<%= t("decidim.pages.index.subheading", name:
|
16
|
+
<%= t("decidim.pages.index.subheading", name: current_organization_name) %>
|
18
17
|
</p>
|
19
18
|
</div>
|
20
19
|
|
@@ -13,7 +13,7 @@
|
|
13
13
|
<p><%= link_to translated_attribute(@participatory_space.title), resource_locator(@participatory_space).url %></p>
|
14
14
|
|
15
15
|
<p><b><%= t(".reason") %></b></p>
|
16
|
-
<p><%= t(@report.reason, organization_name: @participatory_space.organization
|
16
|
+
<p><%= t(@report.reason, organization_name: organization_name(@participatory_space.organization), scope: "decidim.shared.flag_modal") %></p>
|
17
17
|
|
18
18
|
<% if @report.details.present? %>
|
19
19
|
<p><b><%= t(".details") %></b></p>
|
@@ -37,7 +37,9 @@
|
|
37
37
|
<% else %>
|
38
38
|
<p>
|
39
39
|
<%=
|
40
|
-
if @author.
|
40
|
+
if @author.is_a?(Decidim::Organization)
|
41
|
+
organization_name(@author)
|
42
|
+
elsif @author.respond_to?(:name)
|
41
43
|
@author.name
|
42
44
|
elsif @author.respond_to?(:title)
|
43
45
|
translated_attribute(@author.title)
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<div class="
|
1
|
+
<div class="picker-header" data-scope-picker>
|
2
2
|
<h6 id="data_picker-title" class="h2"><%= title %></h6>
|
3
3
|
<button class="close-button" data-close type="button" data-reveal-id="data_picker-modal"><span aria-hidden="true">×</span></button>
|
4
4
|
<div>
|
@@ -21,8 +21,8 @@
|
|
21
21
|
</div>
|
22
22
|
</div>
|
23
23
|
|
24
|
-
<div
|
25
|
-
<div
|
24
|
+
<div data-scope-picker data-content>
|
25
|
+
<div>
|
26
26
|
<% if scopes&.any? %>
|
27
27
|
<ul role="group" aria-label="<%= t("decidim.scopes.picker.change") %>">
|
28
28
|
<% scopes.each do |scope| %>
|
@@ -37,8 +37,8 @@
|
|
37
37
|
</div>
|
38
38
|
</div>
|
39
39
|
|
40
|
-
<div class="
|
41
|
-
<div
|
40
|
+
<div class="picker-footer" data-scope-picker>
|
41
|
+
<div>
|
42
42
|
<% if current || !required %>
|
43
43
|
<a class="button button__sm md:button__lg button__transparent-secondary" role="button" href="<%= scopes_picker_path(current: current&.id, **context) %>" aria-controls="<%= picker_target_id %>" data-picker-value="<%= current&.id || global_value %>" data-picker-text="<%= scope_name_for_picker(current, t("decidim.scopes.global")) %>" data-picker-choose>
|
44
44
|
<%= t("decidim.scopes.picker.choose") %>
|
@@ -1,17 +1,17 @@
|
|
1
1
|
<% resources = @sections.select { |type, _results| types.include?(type) } %>
|
2
|
-
<div class="card
|
3
|
-
<div
|
2
|
+
<div class="card">
|
3
|
+
<div>
|
4
4
|
<% resources.each do |type, results| %>
|
5
5
|
<div class="filters__section--general<%= " no-results" if results[:count].zero? %>">
|
6
6
|
<% if results[:count].positive? %>
|
7
7
|
<%= link_to search_path_by_resource_type(type) do %>
|
8
|
-
<strong
|
9
|
-
<span
|
8
|
+
<strong><%= searchable_resource_human_name(type) %></strong>
|
9
|
+
<span> <%= results[:count] %></span>
|
10
10
|
<% end %>
|
11
11
|
<% else %>
|
12
12
|
<div>
|
13
|
-
<strong
|
14
|
-
<span
|
13
|
+
<strong><%= searchable_resource_human_name(type) %></strong>
|
14
|
+
<span> <%= results[:count] %></span>
|
15
15
|
</div>
|
16
16
|
<% end %>
|
17
17
|
</div>
|
@@ -1,17 +1,17 @@
|
|
1
1
|
<div class="row expanded">
|
2
|
-
<div
|
2
|
+
<div>
|
3
3
|
<div class="row">
|
4
|
-
<button
|
4
|
+
<button data-toggle="process-nav-content">
|
5
5
|
<%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t("decidim.shared.extended_navigation_bar.unfold"), role: "img" %>
|
6
6
|
<% default_item = active_item || items.first %>
|
7
|
-
<span
|
7
|
+
<span>
|
8
8
|
<%= default_item[:name] %>
|
9
9
|
</span>
|
10
10
|
</button>
|
11
|
-
<div class="row column
|
11
|
+
<div class="row column <%= browser.mobile? ? "is-active" : "" %>" id="process-nav-content" data-toggler=".is-active">
|
12
12
|
<ul>
|
13
13
|
<% items.each_with_index do |item, index| %>
|
14
|
-
<li class="<%= "is-active" if item[:active] %>
|
14
|
+
<li class="<%= "is-active" if item[:active] %>">
|
15
15
|
<%= link_to item[:url], class: "process-nav__link #{item[:active] ? "active" : nil}" do %>
|
16
16
|
<%= item[:name] %>
|
17
17
|
<% end %>
|
@@ -20,17 +20,17 @@
|
|
20
20
|
</ul>
|
21
21
|
|
22
22
|
<% if extra_items.any? %>
|
23
|
-
<button class="button
|
23
|
+
<button class="button" data-toggle="process-nav__hide-content">
|
24
24
|
<%= t("decidim.shared.extended_navigation_bar.more") %> <i></i><i></i><i></i>
|
25
25
|
</button>
|
26
|
-
<div class="dropdown-pane
|
26
|
+
<div class="dropdown-pane" id="process-nav__hide-content"
|
27
27
|
data-dropdown
|
28
28
|
data-hover="true"
|
29
29
|
data-hover-pane="true"
|
30
30
|
data-v-offset="-25"
|
31
31
|
data-position="bottom"
|
32
32
|
data-alignment="right">
|
33
|
-
<div
|
33
|
+
<div>
|
34
34
|
<%= t("decidim.shared.extended_navigation_bar.more") %> <i></i><i></i><i></i>
|
35
35
|
</div>
|
36
36
|
<ul>
|
@@ -10,7 +10,7 @@
|
|
10
10
|
|
11
11
|
<%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: nil }) do |f| %>
|
12
12
|
<div data-dialog-container>
|
13
|
-
<%= icon "
|
13
|
+
<%= icon "user-line", class: "w-6 h-6 text-gray fill-current" %>
|
14
14
|
<h3 id="dialog-title-loginModal" class="h3"><%= t(".please_log_in") %></h3>
|
15
15
|
<div>
|
16
16
|
<% if current_organization.sign_in_enabled? %>
|
@@ -1,10 +1,10 @@
|
|
1
1
|
<ul>
|
2
2
|
<% areas.each do |area| %>
|
3
|
-
<li
|
3
|
+
<li>
|
4
4
|
<%= f.fields_for "areas[]", area do |form| %>
|
5
5
|
<%= form.label "checked" do %>
|
6
6
|
<%= form.check_box "checked", label: false, class: "switch-input" %>
|
7
|
-
<span
|
7
|
+
<span></span>
|
8
8
|
<span class="switch-label"><%= translated_attribute area.name %></span>
|
9
9
|
<% end %>
|
10
10
|
<%= form.hidden_field "id", value: area.id %>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
<p class="email-instructions"><%= t ".body_1", user: h(@report.moderation.user.name), token: h(@report.user.name) %></p>
|
4
4
|
|
5
|
-
<p class="email-instructions"><%= t ".body_2", reason: t(@report.reason, organization_name: @report.moderation.user.organization
|
5
|
+
<p class="email-instructions"><%= t ".body_2", reason: t(@report.reason, organization_name: organization_name(@report.moderation.user.organization), scope: "decidim.shared.flag_user_modal") %></p>
|
6
6
|
|
7
7
|
<% if @report.details.present? %>
|
8
8
|
<p class="email-instructions"><%= t(".details") %></p>
|
@@ -11,4 +11,4 @@
|
|
11
11
|
</blockquote>
|
12
12
|
<% end %>
|
13
13
|
|
14
|
-
<p class="email-closing"><%= t(".greetings", organization_name:
|
14
|
+
<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@report.moderation.user.organization), organization_url: decidim.root_url(host: @report.moderation.user.organization.host)).html_safe %></p>
|
@@ -6,4 +6,4 @@
|
|
6
6
|
|
7
7
|
<p class="email-instructions"><%= t ".body_2" %></p>
|
8
8
|
|
9
|
-
<p class="email-closing"><%= t(".greetings", organization_name:
|
9
|
+
<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div id="<%= picker_options[:id] %>" class="data-picker <%= picker_options[:class] %>" data-picker-name="<%= picker_options[:name] %>">
|
2
2
|
<div class="picker-values"><% items.each do |item, params| %>
|
3
|
-
<div><a href="<%= params[:url] %>" class="label
|
3
|
+
<div><a href="<%= params[:url] %>" class="label" data-picker-value="<%= item.id %>"><span aria-hidden="true">×</span> <%= params[:text] %></a></div>
|
4
4
|
<% end %></div>
|
5
5
|
<div class="picker-prompt"><a href="<%= prompt_params[:url] %>"><%= prompt_params[:text] %></a></div>
|
6
6
|
</div>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
|
2
2
|
|
3
3
|
<p class="email-instructions">
|
4
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization
|
4
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
|
5
5
|
</p>
|
6
6
|
|
7
7
|
<p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim.root_path, host: @resource.organization.host) %></p>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
|
2
2
|
|
3
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization
|
3
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
|
4
4
|
|
5
5
|
<%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim.root_path, host: @resource.organization.host) %>
|
6
6
|
|
@@ -2,9 +2,9 @@
|
|
2
2
|
|
3
3
|
<p class="email-instructions">
|
4
4
|
<% if @resource.invited_by.present? %>
|
5
|
-
<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization
|
5
|
+
<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
|
6
6
|
<% else %>
|
7
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization
|
7
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
|
8
8
|
<% end %>
|
9
9
|
</p>
|
10
10
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
<%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
|
2
2
|
|
3
3
|
<% if @resource.invited_by.present? %>
|
4
|
-
<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization
|
4
|
+
<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
|
5
5
|
<% else %>
|
6
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization
|
6
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
|
7
7
|
<% end %>
|
8
8
|
|
9
9
|
<%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>
|
@@ -2,9 +2,9 @@
|
|
2
2
|
|
3
3
|
<p class="email-instructions">
|
4
4
|
<% if @resource.invited_by.present? %>
|
5
|
-
<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization
|
5
|
+
<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
|
6
6
|
<% else %>
|
7
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization
|
7
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
|
8
8
|
<% end %>
|
9
9
|
</p>
|
10
10
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
<%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
|
2
2
|
|
3
3
|
<% if @resource.invited_by.present? %>
|
4
|
-
<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization
|
4
|
+
<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
|
5
5
|
<% else %>
|
6
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: @resource.organization
|
6
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_admin", application: organization_name(@resource.organization)) %>
|
7
7
|
<% end %>
|
8
8
|
|
9
9
|
<%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>
|
@@ -2,9 +2,9 @@
|
|
2
2
|
|
3
3
|
<p class="email-instructions">
|
4
4
|
<% if @resource.invited_by.present? %>
|
5
|
-
<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: @resource.organization
|
5
|
+
<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
|
6
6
|
<% else %>
|
7
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: @resource.organization
|
7
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
|
8
8
|
<% end %>
|
9
9
|
</p>
|
10
10
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
<%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
|
2
2
|
|
3
3
|
<% if @resource.invited_by.present? %>
|
4
|
-
<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: @resource.organization
|
4
|
+
<%= t("devise.mailer.invitation_instructions.invited_you_as_private_user", invited_by: @resource.invited_by.name, application: organization_name(@resource.organization)) %>
|
5
5
|
<% else %>
|
6
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: @resource.organization
|
6
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you_as_private_user", application: organization_name(@resource.organization)) %>
|
7
7
|
<% end %>
|
8
8
|
|
9
9
|
<%= accept_invitation_url(@resource, invitation_token: @token, host: @resource.organization.host) %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
|
2
2
|
|
3
|
-
<p class="email-instructions"><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization
|
3
|
+
<p class="email-instructions"><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %></p>
|
4
4
|
|
5
5
|
<p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %></p>
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %>
|
2
2
|
|
3
|
-
<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization
|
3
|
+
<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: organization_name(@resource.organization)) %>
|
4
4
|
|
5
5
|
<%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>
|
6
6
|
|
@@ -1,19 +1,15 @@
|
|
1
1
|
<%= render partial: "layouts/decidim/meta_tags_config" %>
|
2
2
|
<!DOCTYPE html>
|
3
|
-
<html lang="<%= I18n.locale %>" class="no-js">
|
3
|
+
<html lang="<%= I18n.locale %>" dir="<%= rtl_direction %>" class="no-js">
|
4
4
|
<head>
|
5
5
|
<title><%= decidim_page_title %></title>
|
6
6
|
<%= render partial: "layouts/decidim/head" %>
|
7
7
|
</head>
|
8
8
|
|
9
|
-
<body class="text-black text-md form-defaults">
|
9
|
+
<body class="text-black text-md form-defaults<%= yield (:body_class) %>">
|
10
10
|
<!--noindex--><!--googleoff: all-->
|
11
11
|
<%= link_to t("skip_button", scope: "decidim.accessibility"), "#content", class: "layout-container__skip" %>
|
12
12
|
<%= cell("decidim/data_consent", current_organization) %>
|
13
|
-
<%= render partial: "layouts/decidim/impersonation_warning" %>
|
14
|
-
<%= render partial: "layouts/decidim/omnipresent_banner" %>
|
15
|
-
<%= render partial: "layouts/decidim/timeout_modal" %>
|
16
|
-
<%= render partial: "layouts/decidim/offline_banner" %>
|
17
13
|
<!--googleon: all--><!--/noindex-->
|
18
14
|
|
19
15
|
<%= render "layouts/decidim/wrapper" do %>
|
@@ -22,6 +18,7 @@
|
|
22
18
|
<%= yield %>
|
23
19
|
<% end %>
|
24
20
|
|
21
|
+
<%= render partial: "layouts/decidim/timeout_modal" %>
|
25
22
|
<%= render partial: "decidim/shared/confirm_modal" %>
|
26
23
|
<%= render partial: "decidim/shared/login_modal" unless current_user %>
|
27
24
|
<%= render partial: "decidim/shared/authorization_modal" %>
|
@@ -1,8 +1,8 @@
|
|
1
|
-
<div hidden
|
1
|
+
<div hidden data-dataconsent-warning class="hide">
|
2
2
|
<p>
|
3
3
|
<%= t("layouts.decidim.data_consent.warning.consent_required", categories: t("layouts.decidim.data_consent.warning.all_categories")) %>
|
4
4
|
</p>
|
5
|
-
<a href="#" class="button
|
5
|
+
<a href="#" class="button" data-dialog-open="dc-modal">
|
6
6
|
<%= t("change_settings", scope: "layouts.decidim.data_consent.warning") %>
|
7
7
|
</a>
|
8
8
|
</div>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<%# NOTE: for performance reasons defer this
|
1
|
+
<%# NOTE: for performance reasons defer this javascript call would be good, although there are references to jquery that need to be reviewed %>
|
2
2
|
|
3
3
|
<% if Decidim.service_worker_enabled %>
|
4
4
|
<%= javascript_pack_tag "decidim_core","decidim_sw", defer: false %>
|
@@ -1,8 +1,8 @@
|
|
1
1
|
<%#
|
2
|
-
This file is meant to be
|
2
|
+
This file is meant to be overridden by the app developers in order to
|
3
3
|
include extra headers like tracking, error handling and such.
|
4
4
|
|
5
|
-
Note that
|
5
|
+
Note that the code you add here will be run for all organizations in
|
6
6
|
your instance of Decidim. If you want to add code for a specific
|
7
7
|
organization, add it to the organization's `header_snippets` field,
|
8
8
|
which can be modified at the organization admin section.
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<% if current_user_impersonated? %>
|
2
|
-
<div
|
2
|
+
<div data-impersonation-warning class="flash warning my-0 flex justify-center text-center" data-session-ends-at="<%= impersonation_session_ends_at.iso8601 %>">
|
3
3
|
<div class="flash__message">
|
4
4
|
<%= t(".description_html", user_name: current_user.name) %>
|
5
5
|
<%= t(".expire_time_html", minutes: impersonation_session_remaining_duration_in_minutes) %>
|
@@ -8,9 +8,14 @@ js_configs = {
|
|
8
8
|
"removeRecipient": t("decidim.shared.mentions_modal.remove_recipient", name: "%name%")
|
9
9
|
},
|
10
10
|
emojis: I18n.t("emojis").deep_transform_keys { |k| k.to_s.camelize(:lower) },
|
11
|
-
editor: I18n.t("editor")
|
11
|
+
editor: I18n.t("editor"),
|
12
|
+
date: I18n.t("date"),
|
13
|
+
time: I18n.t("time")
|
12
14
|
},
|
13
|
-
|
15
|
+
notifications: {
|
16
|
+
action_error: I18n.t("decidim.notifications.action_error")
|
17
|
+
},
|
18
|
+
external_domain_allowlist: [current_organization.host] + current_organization.external_domain_allowlist,
|
14
19
|
consent_cookie_name: Decidim.consent_cookie_name,
|
15
20
|
sign_out_path: decidim.destroy_user_session_path
|
16
21
|
}
|
@@ -1,9 +1,9 @@
|
|
1
1
|
<% if organization %>
|
2
2
|
<%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
|
3
3
|
<% if organization.logo.attached? %>
|
4
|
-
<%= image_tag organization.attached_uploader(:logo).variant_path(:medium), alt: t("logo", scope: "decidim.accessibility", organization:
|
4
|
+
<%= image_tag organization.attached_uploader(:logo).variant_path(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
|
5
5
|
<% else %>
|
6
|
-
<span><%=
|
6
|
+
<span><%= current_organization_name %></span>
|
7
7
|
<% end %>
|
8
8
|
<% end %>
|
9
9
|
<% else %>
|
@@ -0,0 +1,11 @@
|
|
1
|
+
<% if organization %>
|
2
|
+
<%= link_to decidim.root_url(host: organization.host), "aria-label": t("front_page_link", scope: "decidim.accessibility") do %>
|
3
|
+
<% if organization.favicon.attached? %>
|
4
|
+
<%= image_tag organization.attached_uploader(:favicon).variant_path(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
|
5
|
+
<% else %>
|
6
|
+
<span><%= current_organization_name %></span>
|
7
|
+
<% end %>
|
8
|
+
<% end %>
|
9
|
+
<% else %>
|
10
|
+
<%= Decidim.application_name %>
|
11
|
+
<% end %>
|
@@ -9,10 +9,10 @@
|
|
9
9
|
<%= image_tag(
|
10
10
|
organization.attached_uploader(:logo).variant_url(:medium, host: organization.host),
|
11
11
|
style: "max-height: 50px",
|
12
|
-
alt:
|
12
|
+
alt: organization_name(organization)
|
13
13
|
) %>
|
14
14
|
<% else %>
|
15
|
-
<span><%= organization
|
15
|
+
<span><%= organization_name(organization) %></span>
|
16
16
|
<% end %>
|
17
17
|
<% end %>
|
18
18
|
<% else %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<% add_decidim_meta_tags({
|
2
2
|
description: strip_tags(translated_attribute(current_organization.description)),
|
3
|
-
title:
|
3
|
+
title: current_organization_name,
|
4
4
|
url: request.original_url,
|
5
5
|
twitter_handler: current_organization.twitter_handler,
|
6
6
|
image_url: Decidim::ContentBlock.published.find_by(
|