From 2be84e7d557295c9ce692fe7b029849b1f623f8a Mon Sep 17 00:00:00 2001 From: Christopher Thompson Date: Wed, 29 Apr 2020 14:32:19 -0400 Subject: [PATCH] Add contact form updates and change mailer --- ...snapshot.config_sync.module.mailsystem.yml | 19 +++++++ ...napshot.config_sync.module.swiftmailer.yml | 39 +++++++++++++++ config/sync/core.extension.yml | 2 + config/sync/language/es/views.view.files.yml | 4 ++ .../language/es/views.view.group_content.yml | 6 +++ .../language/es/views.view.group_members.yml | 4 ++ .../language/es/views.view.group_nodes.yml | 4 ++ .../es/views.view.related_content.yml | 7 +++ .../language/es/views.view.taxonomy_term.yml | 6 +++ .../es/views.view.user_admin_people.yml | 2 + .../es/views.view.webform_submissions.yml | 4 ++ config/sync/mailsystem.settings.yml | 11 ++++ config/sync/swiftmailer.message.yml | 7 +++ config/sync/swiftmailer.transport.yml | 17 +++++++ config/sync/system.mail.yml | 1 - ...bform.attend_the_tech_and_rev_workshop.yml | 2 +- config/sync/webform.webform.blog_posts.yml | 2 +- config/sync/webform.webform.capacitacion.yml | 2 +- config/sync/webform.webform.contact.yml | 6 +-- .../sync/webform.webform.contact_confirm.yml | 2 +- .../sync/webform.webform.general_services.yml | 2 +- .../webform.webform.join_the_movement.yml | 2 +- ...form.webform.join_the_movement_confirm.yml | 2 +- config/sync/webform.webform.migrations.yml | 2 +- ...rm.webform.migrations_training_confirm.yml | 2 +- ...webform.webform.speaker_request_agaric.yml | 50 ++++++++++++++++--- ....webform.speaker_request_clayton_dewey.yml | 2 +- ...bform.speaker_request_mauricio_dinarte.yml | 2 +- ....webform.speaker_request_michele_metts.yml | 2 +- ...rm.webform.speaker_request_micky_metts.yml | 2 +- config/sync/webform.webform.training.yml | 2 +- 31 files changed, 193 insertions(+), 24 deletions(-) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.mailsystem.yml create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.swiftmailer.yml create mode 100644 config/sync/language/es/views.view.related_content.yml create mode 100644 config/sync/mailsystem.settings.yml create mode 100644 config/sync/swiftmailer.message.yml create mode 100644 config/sync/swiftmailer.transport.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.mailsystem.yml b/config/sync/config_snapshot.snapshot.config_sync.module.mailsystem.yml new file mode 100644 index 0000000..3f065a2 --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.mailsystem.yml @@ -0,0 +1,19 @@ +uuid: 6a2ad6d2-8940-4fa9-8101-44700971ce85 +langcode: en +status: true +dependencies: + module: + - mailsystem +id: config_sync.module.mailsystem +snapshotSet: config_sync +extensionType: module +extensionName: mailsystem +items: + - + collection: '' + name: mailsystem.settings + data: + theme: current + defaults: + sender: php_mail + formatter: php_mail diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.swiftmailer.yml b/config/sync/config_snapshot.snapshot.config_sync.module.swiftmailer.yml new file mode 100644 index 0000000..9605c04 --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.swiftmailer.yml @@ -0,0 +1,39 @@ +uuid: 82ed1c8a-055b-4762-9ee4-14fe4465ce79 +langcode: en +status: true +dependencies: + module: + - swiftmailer +id: config_sync.module.swiftmailer +snapshotSet: config_sync +extensionType: module +extensionName: swiftmailer +items: + - + collection: '' + name: swiftmailer.message + data: + format: text/plain + filter_format: plain_text + respect_format: true + convert_mode: false + character_set: UTF-8 + - + collection: '' + name: swiftmailer.transport + data: + transport: native + smtp_host: 127.0.0.1 + smtp_port: 25 + smtp_encryption: '' + smtp_credential_provider: swiftmailer + smtp_credentials: + swiftmailer: + username: '' + password: '' + key: + username: '' + password: '' + sendmail_path: /usr/sbin/sendmail + sendmail_mode: bs + spool_directory: '' diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 4be6f14..0dd869b 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -96,6 +96,7 @@ module: link: 0 locale: 0 mailchimp: 0 + mailsystem: 0 markdown: 0 menu_block: 0 menu_trail_by_path: 0 @@ -133,6 +134,7 @@ module: skins: 0 social_media_links: 0 statistics: 0 + swiftmailer: 0 syslog: 0 system: 0 taxonomy: 0 diff --git a/config/sync/language/es/views.view.files.yml b/config/sync/language/es/views.view.files.yml index ec3bfac..ae17a1d 100644 --- a/config/sync/language/es/views.view.files.yml +++ b/config/sync/language/es/views.view.files.yml @@ -15,3 +15,7 @@ display: fields: entity_label: label: Entidad + arguments: + fid: + exception: + title: Todo(s) diff --git a/config/sync/language/es/views.view.group_content.yml b/config/sync/language/es/views.view.group_content.yml index 046da7c..7966afc 100644 --- a/config/sync/language/es/views.view.group_content.yml +++ b/config/sync/language/es/views.view.group_content.yml @@ -1,3 +1,9 @@ display: + default: + display_options: + arguments: + gid: + exception: + title: Todo(s) page_1: display_title: Página diff --git a/config/sync/language/es/views.view.group_members.yml b/config/sync/language/es/views.view.group_members.yml index 1cc436c..e90d741 100644 --- a/config/sync/language/es/views.view.group_members.yml +++ b/config/sync/language/es/views.view.group_members.yml @@ -4,6 +4,10 @@ display: fields: name: label: Usuario + arguments: + gid: + exception: + title: Todo(s) title: Miembros page_1: display_title: Página diff --git a/config/sync/language/es/views.view.group_nodes.yml b/config/sync/language/es/views.view.group_nodes.yml index 61e6b26..8856dd6 100644 --- a/config/sync/language/es/views.view.group_nodes.yml +++ b/config/sync/language/es/views.view.group_nodes.yml @@ -6,5 +6,9 @@ display: label: Título status: label: Estado + arguments: + gid: + exception: + title: Todo(s) page_1: display_title: Página diff --git a/config/sync/language/es/views.view.related_content.yml b/config/sync/language/es/views.view.related_content.yml new file mode 100644 index 0000000..6728b1e --- /dev/null +++ b/config/sync/language/es/views.view.related_content.yml @@ -0,0 +1,7 @@ +display: + default: + display_options: + arguments: + similar_nid: + exception: + title: Todo(s) diff --git a/config/sync/language/es/views.view.taxonomy_term.yml b/config/sync/language/es/views.view.taxonomy_term.yml index 046da7c..691e7a4 100644 --- a/config/sync/language/es/views.view.taxonomy_term.yml +++ b/config/sync/language/es/views.view.taxonomy_term.yml @@ -1,3 +1,9 @@ display: + default: + display_options: + arguments: + tid: + exception: + title: Todo(s) page_1: display_title: Página diff --git a/config/sync/language/es/views.view.user_admin_people.yml b/config/sync/language/es/views.view.user_admin_people.yml index e108449..93160f7 100644 --- a/config/sync/language/es/views.view.user_admin_people.yml +++ b/config/sync/language/es/views.view.user_admin_people.yml @@ -2,6 +2,8 @@ display: default: display_options: fields: + name: + label: 'Nombre de usuario' status: label: Estado filters: diff --git a/config/sync/language/es/views.view.webform_submissions.yml b/config/sync/language/es/views.view.webform_submissions.yml index c78a66c..aa5320a 100644 --- a/config/sync/language/es/views.view.webform_submissions.yml +++ b/config/sync/language/es/views.view.webform_submissions.yml @@ -4,6 +4,10 @@ display: fields: created: label: Creado + arguments: + in_draft: + exception: + title: Todo(s) embed_administer: display_options: fields: diff --git a/config/sync/mailsystem.settings.yml b/config/sync/mailsystem.settings.yml new file mode 100644 index 0000000..960558c --- /dev/null +++ b/config/sync/mailsystem.settings.yml @@ -0,0 +1,11 @@ +theme: current +defaults: + sender: swiftmailer + formatter: swiftmailer +_core: + default_config_hash: IhwTepsVwtbtbcT5GzQKhCXDCRvbk3MNkWqPiuiZ10s +modules: + swiftmailer: + none: + formatter: swiftmailer + sender: swiftmailer diff --git a/config/sync/swiftmailer.message.yml b/config/sync/swiftmailer.message.yml new file mode 100644 index 0000000..cd8d849 --- /dev/null +++ b/config/sync/swiftmailer.message.yml @@ -0,0 +1,7 @@ +format: text/html +filter_format: plain_text +respect_format: false +convert_mode: false +character_set: UTF-8 +_core: + default_config_hash: cMBhfAJB7-sK5yjwcEvT-QkAPFfTj2jEPpjlB5qlXW8 diff --git a/config/sync/swiftmailer.transport.yml b/config/sync/swiftmailer.transport.yml new file mode 100644 index 0000000..d8dc5ee --- /dev/null +++ b/config/sync/swiftmailer.transport.yml @@ -0,0 +1,17 @@ +transport: native +smtp_host: 127.0.0.1 +smtp_port: 25 +smtp_encryption: '' +smtp_credential_provider: swiftmailer +smtp_credentials: + swiftmailer: + username: '' + password: '' + key: + username: '' + password: '' +sendmail_path: /usr/sbin/sendmail +sendmail_mode: bs +spool_directory: '' +_core: + default_config_hash: 0dJfQivKgyEp-S8D6gSRTBbpRFApE3VkpltnPMBQ5OY diff --git a/config/sync/system.mail.yml b/config/sync/system.mail.yml index da8293c..60ed34d 100644 --- a/config/sync/system.mail.yml +++ b/config/sync/system.mail.yml @@ -1,5 +1,4 @@ interface: default: php_mail - webform: webform_php_mail _core: default_config_hash: rYgt7uhPafP2ngaN_ZUPFuyI4KdE0zU868zLNSlzKoE diff --git a/config/sync/webform.webform.attend_the_tech_and_rev_workshop.yml b/config/sync/webform.webform.attend_the_tech_and_rev_workshop.yml index 5fba096..67adea0 100644 --- a/config/sync/webform.webform.attend_the_tech_and_rev_workshop.yml +++ b/config/sync/webform.webform.attend_the_tech_and_rev_workshop.yml @@ -1,3 +1,4 @@ +uuid: 23478458-4054-4226-beac-4aa007c044c3 langcode: en status: open dependencies: { } @@ -196,4 +197,3 @@ access: permissions: { } handlers: { } variants: { } -uuid: 23478458-4054-4226-beac-4aa007c044c3 diff --git a/config/sync/webform.webform.blog_posts.yml b/config/sync/webform.webform.blog_posts.yml index da60400..703c3fb 100644 --- a/config/sync/webform.webform.blog_posts.yml +++ b/config/sync/webform.webform.blog_posts.yml @@ -1,3 +1,4 @@ +uuid: d57a0f50-13eb-4c78-a398-7d685d50322f langcode: en status: open dependencies: { } @@ -189,4 +190,3 @@ access: permissions: { } handlers: { } variants: { } -uuid: d57a0f50-13eb-4c78-a398-7d685d50322f diff --git a/config/sync/webform.webform.capacitacion.yml b/config/sync/webform.webform.capacitacion.yml index 1a83a62..b90dbdb 100644 --- a/config/sync/webform.webform.capacitacion.yml +++ b/config/sync/webform.webform.capacitacion.yml @@ -1,3 +1,4 @@ +uuid: 1270ffba-cf31-4bfc-8eb3-a5192a1d47ea langcode: en status: open dependencies: { } @@ -209,4 +210,3 @@ access: permissions: { } handlers: { } variants: { } -uuid: 1270ffba-cf31-4bfc-8eb3-a5192a1d47ea diff --git a/config/sync/webform.webform.contact.yml b/config/sync/webform.webform.contact.yml index 48fbc4e..a17ee27 100644 --- a/config/sync/webform.webform.contact.yml +++ b/config/sync/webform.webform.contact.yml @@ -1,9 +1,12 @@ +uuid: 334440fc-4195-4388-bd1d-c9d22c37c496 langcode: en status: open dependencies: enforced: module: - webform +_core: + default_config_hash: B-E6t3OGPrgG1OPuVOmoXmjWLXkta_R-lSr_ppfU2Ww open: null close: null weight: 0 @@ -250,6 +253,3 @@ handlers: theme_name: '' parameters: { } variants: { } -uuid: 334440fc-4195-4388-bd1d-c9d22c37c496 -_core: - default_config_hash: B-E6t3OGPrgG1OPuVOmoXmjWLXkta_R-lSr_ppfU2Ww diff --git a/config/sync/webform.webform.contact_confirm.yml b/config/sync/webform.webform.contact_confirm.yml index 004ddb8..a958166 100644 --- a/config/sync/webform.webform.contact_confirm.yml +++ b/config/sync/webform.webform.contact_confirm.yml @@ -1,3 +1,4 @@ +uuid: 9b05041e-37e3-4ee5-ab00-2faa67fdb9f3 langcode: en status: open dependencies: { } @@ -194,4 +195,3 @@ access: permissions: { } handlers: { } variants: { } -uuid: 9b05041e-37e3-4ee5-ab00-2faa67fdb9f3 diff --git a/config/sync/webform.webform.general_services.yml b/config/sync/webform.webform.general_services.yml index b21f887..3ac8bc3 100644 --- a/config/sync/webform.webform.general_services.yml +++ b/config/sync/webform.webform.general_services.yml @@ -1,3 +1,4 @@ +uuid: 439948f3-c134-40f5-a8a2-2c2b834e4cf9 langcode: en status: open dependencies: { } @@ -196,4 +197,3 @@ access: permissions: { } handlers: { } variants: { } -uuid: 439948f3-c134-40f5-a8a2-2c2b834e4cf9 diff --git a/config/sync/webform.webform.join_the_movement.yml b/config/sync/webform.webform.join_the_movement.yml index f21e068..b6eebfa 100644 --- a/config/sync/webform.webform.join_the_movement.yml +++ b/config/sync/webform.webform.join_the_movement.yml @@ -1,3 +1,4 @@ +uuid: 31bef3a4-a584-4234-bd2f-ab081d1d5704 langcode: en status: open dependencies: @@ -203,4 +204,3 @@ handlers: interest_groups: { } control: '' variants: { } -uuid: 31bef3a4-a584-4234-bd2f-ab081d1d5704 diff --git a/config/sync/webform.webform.join_the_movement_confirm.yml b/config/sync/webform.webform.join_the_movement_confirm.yml index ff82581..a3fe1af 100644 --- a/config/sync/webform.webform.join_the_movement_confirm.yml +++ b/config/sync/webform.webform.join_the_movement_confirm.yml @@ -1,3 +1,4 @@ +uuid: e00580b9-1381-408d-8ddc-e8314675680e langcode: en status: open dependencies: { } @@ -179,4 +180,3 @@ access: permissions: { } handlers: { } variants: { } -uuid: e00580b9-1381-408d-8ddc-e8314675680e diff --git a/config/sync/webform.webform.migrations.yml b/config/sync/webform.webform.migrations.yml index dc6b531..4c34304 100644 --- a/config/sync/webform.webform.migrations.yml +++ b/config/sync/webform.webform.migrations.yml @@ -1,3 +1,4 @@ +uuid: 51839431-8d15-4b15-b7e6-e0a70dd6f679 langcode: en status: open dependencies: @@ -203,4 +204,3 @@ handlers: interest_groups: { } control: '' variants: { } -uuid: 51839431-8d15-4b15-b7e6-e0a70dd6f679 diff --git a/config/sync/webform.webform.migrations_training_confirm.yml b/config/sync/webform.webform.migrations_training_confirm.yml index 66ccd16..f7b9f93 100644 --- a/config/sync/webform.webform.migrations_training_confirm.yml +++ b/config/sync/webform.webform.migrations_training_confirm.yml @@ -1,3 +1,4 @@ +uuid: c45ac27c-cac5-4fc1-9413-f8d60fdd2fbe langcode: en status: open dependencies: { } @@ -183,4 +184,3 @@ access: permissions: { } handlers: { } variants: { } -uuid: c45ac27c-cac5-4fc1-9413-f8d60fdd2fbe diff --git a/config/sync/webform.webform.speaker_request_agaric.yml b/config/sync/webform.webform.speaker_request_agaric.yml index bcee81b..16eee84 100644 --- a/config/sync/webform.webform.speaker_request_agaric.yml +++ b/config/sync/webform.webform.speaker_request_agaric.yml @@ -1,8 +1,12 @@ +uuid: 231b71a1-0001-400f-aa79-b25634c5c04f langcode: en status: open dependencies: module: - antibot +third_party_settings: + antibot: + antibot: true open: null close: null weight: 0 @@ -17,20 +21,59 @@ elements: | event_website: '#type': url '#title': 'Event website' + '#description': 'Optional: The URL of a website with further details of your event.' event_dates: '#type': datetime '#title': 'Event date' '#date_date_datepicker_button': false '#date_time_element': none + event_where: + '#type': select + '#title': 'Event Location' + '#options': + Online: Online + 'Conference Call': 'Conference Call' + 'In Person': 'In Person' event_location: '#type': textfield - '#title': 'Event location' + '#title': 'Event address' + '#states': + visible: + ':input[name="event_where"]': + value: 'In Person' + online_video_chat: + '#type': checkbox + '#title': 'Would you like Agaric to provide a video chat for your event?' + '#title_display': before + '#states': + visible: + ':input[name="event_where"]': + value: Online + would_you_like_agaric_to_provide_a_video_recording_of_your_event: + '#type': checkbox + '#title': 'Would you like Agaric to provide a video recording of your event?' + '#title_display': before + '#states': + visible: + ':input[name="event_where"]': + value: Online description_of_event: '#type': textarea '#title': 'What should the speaker know about this event?' budget_for_speaker: '#type': textfield '#title': 'Budget for speaker' + i_do_not_have_a_budget_: + '#type': checkbox + '#title': 'I do not have a budget.' + what_is_the_value_to_the_community_: + '#type': textarea + '#title': 'What is the value to the community?' + '#description': 'Please give us an idea of how a chat with us could bring value to your community. A brief description of the topic and why you think it is important will suffice! We do not wish to discourage people that may not have funds in dollars.' + '#states': + visible: + ':input[name="i_do_not_have_a_budget_"]': + checked: true your_name: '#type': webform_name '#title': 'Your name' @@ -58,7 +101,6 @@ elements: | '#options': 'Ben Melançon': 'Ben Melançon' 'Mauricio Dinarte': 'Mauricio Dinarte' - 'Clayton Dewey': 'Clayton Dewey' 'Micky Metts': 'Micky Metts' 'David Valdez': 'David Valdez' 'Christopher Thompson': 'Christopher Thompson' @@ -271,7 +313,3 @@ handlers: theme_name: '' parameters: { } variants: { } -uuid: 231b71a1-0001-400f-aa79-b25634c5c04f -third_party_settings: - antibot: - antibot: true diff --git a/config/sync/webform.webform.speaker_request_clayton_dewey.yml b/config/sync/webform.webform.speaker_request_clayton_dewey.yml index b12b431..fca9a73 100644 --- a/config/sync/webform.webform.speaker_request_clayton_dewey.yml +++ b/config/sync/webform.webform.speaker_request_clayton_dewey.yml @@ -1,3 +1,4 @@ +uuid: a4189539-46d5-486f-8e0e-ec913e2093e5 langcode: en status: open dependencies: { } @@ -254,4 +255,3 @@ handlers: theme_name: '' parameters: { } variants: { } -uuid: a4189539-46d5-486f-8e0e-ec913e2093e5 diff --git a/config/sync/webform.webform.speaker_request_mauricio_dinarte.yml b/config/sync/webform.webform.speaker_request_mauricio_dinarte.yml index 20c786a..50c1e7d 100644 --- a/config/sync/webform.webform.speaker_request_mauricio_dinarte.yml +++ b/config/sync/webform.webform.speaker_request_mauricio_dinarte.yml @@ -1,3 +1,4 @@ +uuid: 69315a59-1746-485d-873a-1815072dd1d0 langcode: en status: open dependencies: { } @@ -254,4 +255,3 @@ handlers: theme_name: '' parameters: { } variants: { } -uuid: 69315a59-1746-485d-873a-1815072dd1d0 diff --git a/config/sync/webform.webform.speaker_request_michele_metts.yml b/config/sync/webform.webform.speaker_request_michele_metts.yml index 3e31037..33fa91a 100644 --- a/config/sync/webform.webform.speaker_request_michele_metts.yml +++ b/config/sync/webform.webform.speaker_request_michele_metts.yml @@ -1,3 +1,4 @@ +uuid: ab839464-7156-4b3b-a13b-a5502e429e70 langcode: en status: open dependencies: { } @@ -254,4 +255,3 @@ handlers: theme_name: '' parameters: { } variants: { } -uuid: ab839464-7156-4b3b-a13b-a5502e429e70 diff --git a/config/sync/webform.webform.speaker_request_micky_metts.yml b/config/sync/webform.webform.speaker_request_micky_metts.yml index 2bdce75..f5878c7 100644 --- a/config/sync/webform.webform.speaker_request_micky_metts.yml +++ b/config/sync/webform.webform.speaker_request_micky_metts.yml @@ -1,3 +1,4 @@ +uuid: 36bb8d28-cf95-4fe6-a299-aae734f204c9 langcode: en status: closed dependencies: { } @@ -254,4 +255,3 @@ handlers: theme_name: '' parameters: { } variants: { } -uuid: 36bb8d28-cf95-4fe6-a299-aae734f204c9 diff --git a/config/sync/webform.webform.training.yml b/config/sync/webform.webform.training.yml index ab6d1c8..e3198bb 100644 --- a/config/sync/webform.webform.training.yml +++ b/config/sync/webform.webform.training.yml @@ -1,3 +1,4 @@ +uuid: 4a93727f-5bc1-4fa5-a8dc-c283d3005c15 langcode: en status: open dependencies: { } @@ -207,4 +208,3 @@ access: permissions: { } handlers: { } variants: { } -uuid: 4a93727f-5bc1-4fa5-a8dc-c283d3005c15