From bc90c3b2939cbcae47b5690215065c87758f13fa Mon Sep 17 00:00:00 2001 From: Max Starkenburg Date: Tue, 26 Nov 2024 21:59:56 -0500 Subject: [PATCH 1/5] D4G-83: Webform config for two remaining needed webforms. --- .../webform.webform.submit_a_blog_post.yml | 224 +++++++++++++++++ ...form.webform.webinar_presenter_request.yml | 238 ++++++++++++++++++ 2 files changed, 462 insertions(+) create mode 100644 config/default/webform.webform.submit_a_blog_post.yml create mode 100644 config/default/webform.webform.webinar_presenter_request.yml diff --git a/config/default/webform.webform.submit_a_blog_post.yml b/config/default/webform.webform.submit_a_blog_post.yml new file mode 100644 index 0000000..02961ff --- /dev/null +++ b/config/default/webform.webform.submit_a_blog_post.yml @@ -0,0 +1,224 @@ +uuid: 8ea2e387-9bc2-4541-9ff0-e4a9e6901430 +langcode: en +status: open +dependencies: { } +weight: 0 +open: null +close: null +uid: 1 +template: false +archive: false +id: submit_a_blog_post +title: 'Submit a Blog Post' +description: '' +categories: { } +elements: |- + name: + '#title': 'Your Name' + '#type': textfield + '#required': true + '#default_value': '[current-user:display-name]' + email: + '#title': 'Your Email' + '#type': email + '#required': true + '#default_value': '[current-user:mail]' + subject: + '#title': Subject + '#type': textfield + '#required': true + '#test': 'Testing contact webform from [site:name]' + message: + '#title': Message + '#type': textarea + '#required': true + '#test': 'Please ignore this email.' + actions: + '#type': webform_actions + '#title': 'Submit button(s)' + '#submit__label': Send +css: '' +javascript: '' +settings: + ajax: false + ajax_scroll_top: form + ajax_progress_type: '' + ajax_effect: '' + ajax_speed: null + page: true + page_submit_path: '' + page_confirm_path: '' + page_theme_name: '' + form_title: source_entity_webform + form_submit_once: false + form_open_message: '' + form_close_message: '' + form_exception_message: '' + form_previous_submissions: true + form_confidential: false + form_confidential_message: '' + form_disable_remote_addr: false + form_convert_anonymous: false + form_prepopulate: false + form_prepopulate_source_entity: false + form_prepopulate_source_entity_required: false + form_prepopulate_source_entity_type: '' + form_unsaved: false + form_disable_back: false + form_submit_back: false + form_disable_autocomplete: false + form_novalidate: false + form_disable_inline_errors: false + form_required: false + form_autofocus: false + form_details_toggle: false + form_reset: false + form_access_denied: default + form_access_denied_title: '' + form_access_denied_message: '' + form_access_denied_attributes: { } + form_file_limit: '' + form_attributes: { } + form_method: '' + form_action: '' + share: false + share_node: false + share_theme_name: '' + share_title: true + share_page_body_attributes: { } + submission_label: '' + submission_exception_message: '' + submission_locked_message: '' + submission_log: false + submission_excluded_elements: { } + submission_exclude_empty: false + submission_exclude_empty_checkbox: false + submission_views: { } + submission_views_replace: { } + submission_user_columns: { } + submission_user_duplicate: false + submission_access_denied: default + submission_access_denied_title: '' + submission_access_denied_message: '' + submission_access_denied_attributes: { } + previous_submission_message: '' + previous_submissions_message: '' + autofill: false + autofill_message: '' + autofill_excluded_elements: { } + wizard_progress_bar: true + wizard_progress_pages: false + wizard_progress_percentage: false + wizard_progress_link: false + wizard_progress_states: false + wizard_start_label: '' + wizard_preview_link: false + wizard_confirmation: true + wizard_confirmation_label: '' + wizard_auto_forward: true + wizard_auto_forward_hide_next_button: false + wizard_keyboard: true + wizard_track: '' + wizard_prev_button_label: '' + wizard_next_button_label: '' + wizard_toggle: false + wizard_toggle_show_label: '' + wizard_toggle_hide_label: '' + wizard_page_type: container + wizard_page_title_tag: h2 + preview: 1 + preview_label: '' + preview_title: '' + preview_message: '' + preview_attributes: { } + preview_excluded_elements: { } + preview_exclude_empty: true + preview_exclude_empty_checkbox: false + draft: all + draft_multiple: true + draft_auto_save: true + draft_saved_message: '' + draft_loaded_message: '' + draft_pending_single_message: '' + draft_pending_multiple_message: '' + confirmation_type: message + confirmation_url: '' + confirmation_title: '' + confirmation_message: '

By speaking and sharing your expertise through blog posts, webinars, conference sessions, half-day training sessions, or as a trainer, you play a vital role in advancing the knowledge and skills of our community members. Your contributions help foster innovation, collaboration, and growth within the Drupal and government sectors.

' + confirmation_attributes: { } + confirmation_back: true + confirmation_back_label: '' + confirmation_back_attributes: { } + confirmation_exclude_query: false + confirmation_exclude_token: false + confirmation_update: false + limit_total: null + limit_total_interval: null + limit_total_message: '' + limit_total_unique: false + limit_user: null + limit_user_interval: null + limit_user_message: '' + limit_user_unique: false + entity_limit_total: null + entity_limit_total_interval: null + entity_limit_user: null + entity_limit_user_interval: null + purge: draft + purge_days: 7 + results_disabled: false + results_disabled_ignore: false + results_customize: false + token_view: false + token_update: false + token_delete: false + serial_disabled: false +access: + create: + roles: + - anonymous + - authenticated + users: { } + permissions: { } + view_any: + roles: { } + users: { } + permissions: { } + update_any: + roles: { } + users: { } + permissions: { } + delete_any: + roles: { } + users: { } + permissions: { } + purge_any: + roles: { } + users: { } + permissions: { } + view_own: + roles: { } + users: { } + permissions: { } + update_own: + roles: { } + users: { } + permissions: { } + delete_own: + roles: { } + users: { } + permissions: { } + administer: + roles: { } + users: { } + permissions: { } + test: + roles: { } + users: { } + permissions: { } + configuration: + roles: { } + users: { } + permissions: { } +handlers: { } +variants: { } diff --git a/config/default/webform.webform.webinar_presenter_request.yml b/config/default/webform.webform.webinar_presenter_request.yml new file mode 100644 index 0000000..e66ddea --- /dev/null +++ b/config/default/webform.webform.webinar_presenter_request.yml @@ -0,0 +1,238 @@ +uuid: 98fc4286-3567-4e40-a4e1-7bd11cf23f82 +langcode: en +status: open +dependencies: { } +weight: 0 +open: null +close: null +uid: 1 +template: false +archive: false +id: webinar_presenter_request +title: 'Webinar Presenter Request' +description: '' +categories: { } +elements: |- + name: + '#title': 'Your Name' + '#type': textfield + '#required': true + '#default_value': '[current-user:display-name]' + email: + '#title': 'Your Email' + '#type': email + '#required': false + '#default_value': '[current-user:mail]' + phone: + '#title': 'Your Phone Number' + '#type': textfield + '#required': false + background: + '#title': 'Professional Background' + '#type': textarea + '#required': true + topics: + '#title': 'Presentation Topics' + '#type': textarea + '#required': true + format: + '#title': 'Presentation Format' + '#type': textarea + '#required': true + experience: + '#title': 'Previous Experience' + '#type': textarea + '#required': true + additional: + '#title': 'Additional Information' + '#type': textarea + '#reuqired': false + actions: + '#type': webform_actions + '#title': 'Submit button(s)' + '#submit__label': Submit +css: '' +javascript: '' +settings: + ajax: false + ajax_scroll_top: form + ajax_progress_type: '' + ajax_effect: '' + ajax_speed: null + page: true + page_submit_path: '' + page_confirm_path: '' + page_theme_name: '' + form_title: source_entity_webform + form_submit_once: false + form_open_message: '' + form_close_message: '' + form_exception_message: '' + form_previous_submissions: true + form_confidential: false + form_confidential_message: '' + form_disable_remote_addr: false + form_convert_anonymous: false + form_prepopulate: false + form_prepopulate_source_entity: false + form_prepopulate_source_entity_required: false + form_prepopulate_source_entity_type: '' + form_unsaved: false + form_disable_back: false + form_submit_back: false + form_disable_autocomplete: false + form_novalidate: false + form_disable_inline_errors: false + form_required: false + form_autofocus: false + form_details_toggle: false + form_reset: false + form_access_denied: default + form_access_denied_title: '' + form_access_denied_message: '' + form_access_denied_attributes: { } + form_file_limit: '' + form_attributes: { } + form_method: '' + form_action: '' + share: false + share_node: false + share_theme_name: '' + share_title: true + share_page_body_attributes: { } + submission_label: '' + submission_exception_message: '' + submission_locked_message: '' + submission_log: false + submission_excluded_elements: { } + submission_exclude_empty: false + submission_exclude_empty_checkbox: false + submission_views: { } + submission_views_replace: { } + submission_user_columns: { } + submission_user_duplicate: false + submission_access_denied: default + submission_access_denied_title: '' + submission_access_denied_message: '' + submission_access_denied_attributes: { } + previous_submission_message: '' + previous_submissions_message: '' + autofill: false + autofill_message: '' + autofill_excluded_elements: { } + wizard_progress_bar: true + wizard_progress_pages: false + wizard_progress_percentage: false + wizard_progress_link: false + wizard_progress_states: false + wizard_start_label: '' + wizard_preview_link: false + wizard_confirmation: true + wizard_confirmation_label: '' + wizard_auto_forward: true + wizard_auto_forward_hide_next_button: false + wizard_keyboard: true + wizard_track: '' + wizard_prev_button_label: '' + wizard_next_button_label: '' + wizard_toggle: false + wizard_toggle_show_label: '' + wizard_toggle_hide_label: '' + wizard_page_type: container + wizard_page_title_tag: h2 + preview: 1 + preview_label: '' + preview_title: '' + preview_message: '' + preview_attributes: { } + preview_excluded_elements: { } + preview_exclude_empty: true + preview_exclude_empty_checkbox: false + draft: all + draft_multiple: true + draft_auto_save: true + draft_saved_message: '' + draft_loaded_message: '' + draft_pending_single_message: '' + draft_pending_multiple_message: '' + confirmation_type: message + confirmation_url: '' + confirmation_title: '' + confirmation_message: '

Thank you again for your interest in being a webinar presenter for Drupal4Gov. We appreciate your commitment to advancing the use of Drupal in the government sector and look forward to the possibility of collaborating with you to deliver informative and engaging webinars to our community.

' + confirmation_attributes: { } + confirmation_back: true + confirmation_back_label: '' + confirmation_back_attributes: { } + confirmation_exclude_query: false + confirmation_exclude_token: false + confirmation_update: true + limit_total: null + limit_total_interval: null + limit_total_message: '' + limit_total_unique: false + limit_user: null + limit_user_interval: null + limit_user_message: '' + limit_user_unique: false + entity_limit_total: null + entity_limit_total_interval: null + entity_limit_user: null + entity_limit_user_interval: null + purge: draft + purge_days: 7 + results_disabled: false + results_disabled_ignore: false + results_customize: false + token_view: false + token_update: false + token_delete: false + serial_disabled: false +access: + create: + roles: + - anonymous + - authenticated + users: { } + permissions: { } + view_any: + roles: { } + users: { } + permissions: { } + update_any: + roles: { } + users: { } + permissions: { } + delete_any: + roles: { } + users: { } + permissions: { } + purge_any: + roles: { } + users: { } + permissions: { } + view_own: + roles: { } + users: { } + permissions: { } + update_own: + roles: { } + users: { } + permissions: { } + delete_own: + roles: { } + users: { } + permissions: { } + administer: + roles: { } + users: { } + permissions: { } + test: + roles: { } + users: { } + permissions: { } + configuration: + roles: { } + users: { } + permissions: { } +handlers: { } +variants: { } From 5f2dbec12086c241c78f22740904d437602954af Mon Sep 17 00:00:00 2001 From: Max Starkenburg Date: Tue, 26 Nov 2024 22:09:04 -0500 Subject: [PATCH 2/5] D4G-83: Adding field description text as present in Google Sheet for "Be A Webinar Presenter" but not in config (note: I didn't manually edit anything related to requiredness). --- ...ebform.webform.webinar_presenter_request.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/config/default/webform.webform.webinar_presenter_request.yml b/config/default/webform.webform.webinar_presenter_request.yml index e66ddea..2c41f45 100644 --- a/config/default/webform.webform.webinar_presenter_request.yml +++ b/config/default/webform.webform.webinar_presenter_request.yml @@ -21,31 +21,34 @@ elements: |- email: '#title': 'Your Email' '#type': email - '#required': false '#default_value': '[current-user:mail]' phone: '#title': 'Your Phone Number' '#type': textfield - '#required': false background: - '#title': 'Professional Background' '#type': textarea + '#title': 'Professional Background' + '#description': '

Briefly outline your professional background, including your experience in Drupal, government projects, or any relevant domains. Highlight your areas of expertise and the knowledge you can bring to the webinar.

' '#required': true topics: - '#title': 'Presentation Topics' '#type': textarea + '#title': 'Presentation Topics' + '#description': '

Describe the topic(s) you would like to present. Explain why you believe it is relevant and valuable to the Drupal4Gov community. Include an overview of the key points you plan to cover and any unique insights or case studies you can share.

' '#required': true format: - '#title': 'Presentation Format' '#type': textarea + '#title': 'Presentation Format' + '#description': '

Outline the preferred format of your webinar presentation. This could include the duration of the presentation, whether you would like to include live demos or interactive elements, and any other considerations that would enhance the webinar experience.

' '#required': true experience: - '#title': 'Previous Experience' '#type': textarea + '#title': 'Previous Experience' + '#description': '

If you have previous experience as a presenter or speaker, please provide a brief overview, including any relevant conferences, webinars, or events where you have presented.

' '#required': true additional: - '#title': 'Additional Information' '#type': textarea + '#title': 'Additional Information' + '#description': '

Feel free to include any additional information you believe is relevant to your application as a webinar presenter for Drupal4Gov.

' '#reuqired': false actions: '#type': webform_actions From 0c1d0b6581441b0f349330771ec84d1b525a2f29 Mon Sep 17 00:00:00 2001 From: Max Starkenburg Date: Wed, 4 Dec 2024 14:22:53 -0500 Subject: [PATCH 3/5] D4G-83: Make it clearer the user has submitted the webform. Remove span formatting/styling pasted into message content (but not rendered when displayed). --- config/default/webform.webform.submit_a_blog_post.yml | 2 +- config/default/webform.webform.webinar_presenter_request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/default/webform.webform.submit_a_blog_post.yml b/config/default/webform.webform.submit_a_blog_post.yml index 02961ff..e9a3017 100644 --- a/config/default/webform.webform.submit_a_blog_post.yml +++ b/config/default/webform.webform.submit_a_blog_post.yml @@ -144,7 +144,7 @@ settings: confirmation_type: message confirmation_url: '' confirmation_title: '' - confirmation_message: '

By speaking and sharing your expertise through blog posts, webinars, conference sessions, half-day training sessions, or as a trainer, you play a vital role in advancing the knowledge and skills of our community members. Your contributions help foster innovation, collaboration, and growth within the Drupal and government sectors.

' + confirmation_message: '

Thank you for your submission.

By speaking and sharing your expertise through blog posts, webinars, conference sessions, half-day training sessions, or as a trainer, you play a vital role in advancing the knowledge and skills of our community members. Your contributions help foster innovation, collaboration, and growth within the Drupal and government sectors.

' confirmation_attributes: { } confirmation_back: true confirmation_back_label: '' diff --git a/config/default/webform.webform.webinar_presenter_request.yml b/config/default/webform.webform.webinar_presenter_request.yml index 2c41f45..bb9865b 100644 --- a/config/default/webform.webform.webinar_presenter_request.yml +++ b/config/default/webform.webform.webinar_presenter_request.yml @@ -161,7 +161,7 @@ settings: confirmation_type: message confirmation_url: '' confirmation_title: '' - confirmation_message: '

Thank you again for your interest in being a webinar presenter for Drupal4Gov. We appreciate your commitment to advancing the use of Drupal in the government sector and look forward to the possibility of collaborating with you to deliver informative and engaging webinars to our community.

' + confirmation_message: '

Thank you again for your interest in being a webinar presenter for Drupal4Gov.

We appreciate your commitment to advancing the use of Drupal in the government sector and look forward to the possibility of collaborating with you to deliver informative and engaging webinars to our community.

' confirmation_attributes: { } confirmation_back: true confirmation_back_label: '' From c6e1dee9c5ee27760abff52639e51a4565915d7a Mon Sep 17 00:00:00 2001 From: Max Starkenburg Date: Wed, 4 Dec 2024 15:08:39 -0500 Subject: [PATCH 4/5] D4G-83: Add email handlers for the new webforms. Mostly default values except: (a) using to: addresses provided by Luisa in Slack, (b) changing reply-to: values to "your email" fields, and (c) not excluding empty fields in email body. --- .../webform.webform.submit_a_blog_post.yml | 39 ++++++++++++++++++- ...form.webform.webinar_presenter_request.yml | 39 ++++++++++++++++++- 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/config/default/webform.webform.submit_a_blog_post.yml b/config/default/webform.webform.submit_a_blog_post.yml index e9a3017..6123ce8 100644 --- a/config/default/webform.webform.submit_a_blog_post.yml +++ b/config/default/webform.webform.submit_a_blog_post.yml @@ -220,5 +220,42 @@ access: roles: { } users: { } permissions: { } -handlers: { } +handlers: + email: + id: email + handler_id: email + label: Email + notes: '' + status: true + conditions: { } + weight: 0 + settings: + states: + - completed + to_mail: blog@drupal4gov.us + to_options: { } + bcc_mail: '' + bcc_options: { } + cc_mail: '' + cc_options: { } + from_mail: _default + from_options: { } + from_name: _default + reply_to: '[webform_submission:values:email:raw]' + return_path: '' + sender_mail: '' + sender_name: '' + subject: _default + body: _default + excluded_elements: { } + ignore_access: false + exclude_empty: false + exclude_empty_checkbox: false + exclude_attachments: false + html: true + attachments: false + twig: false + theme_name: '' + parameters: { } + debug: false variants: { } diff --git a/config/default/webform.webform.webinar_presenter_request.yml b/config/default/webform.webform.webinar_presenter_request.yml index bb9865b..930b624 100644 --- a/config/default/webform.webform.webinar_presenter_request.yml +++ b/config/default/webform.webform.webinar_presenter_request.yml @@ -237,5 +237,42 @@ access: roles: { } users: { } permissions: { } -handlers: { } +handlers: + email: + id: email + handler_id: email + label: Email + notes: '' + status: true + conditions: { } + weight: 0 + settings: + states: + - completed + to_mail: webinars@drupal4gov.us + to_options: { } + bcc_mail: '' + bcc_options: { } + cc_mail: '' + cc_options: { } + from_mail: _default + from_options: { } + from_name: _default + reply_to: '[webform_submission:values:email:raw]' + return_path: '' + sender_mail: '' + sender_name: '' + subject: _default + body: _default + excluded_elements: { } + ignore_access: false + exclude_empty: false + exclude_empty_checkbox: false + exclude_attachments: false + html: true + attachments: false + twig: false + theme_name: '' + parameters: { } + debug: false variants: { } From e752200972fe8276d00c3bc5630f2e0f93f59106 Mon Sep 17 00:00:00 2001 From: Max Starkenburg Date: Wed, 11 Dec 2024 09:36:43 -0500 Subject: [PATCH 5/5] D4G-83: Unrelated to D4G-83, but this is change needed anyway, and to force a rerun of this branch's job (I don't have permission in Acquia UI). --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cedc1ad..548683d 100755 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ lando blt tests * Ensure no other changes have been made to the upstream/develop branch. If they have, rebase your branch: *(This helps avoid infuriating merge conflicts)* ``` git fetch upstream -git rebase upstream/main +git rebase upstream/develop ``` * Push your commit(s) to *your* origin ```