diff --git a/project/config/liofa/config/core.entity_form_display.node.webform.default.yml b/project/config/liofa/config/core.entity_form_display.node.webform.default.yml index cab18c71e..36fcdc62e 100644 --- a/project/config/liofa/config/core.entity_form_display.node.webform.default.yml +++ b/project/config/liofa/config/core.entity_form_display.node.webform.default.yml @@ -3,7 +3,8 @@ langcode: en-gb status: true dependencies: config: - - field.field.node.webform.body + - field.field.node.webform.field_webform_footer + - field.field.node.webform.field_webform_header - field.field.node.webform.webform - node.type.webform - workflows.workflow.nics_editorial_workflow @@ -19,22 +20,28 @@ targetEntityType: node bundle: webform mode: default content: - body: - type: text_textarea_with_summary - weight: 1 - region: content - settings: - rows: 9 - summary_rows: 3 - placeholder: '' - show_summary: false - third_party_settings: { } created: type: datetime_timestamp weight: 10 region: content settings: { } third_party_settings: { } + field_webform_footer: + type: text_textarea + weight: 3 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_webform_header: + type: text_textarea + weight: 2 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } flag: weight: 10 region: content diff --git a/project/config/liofa/config/core.entity_view_display.node.webform.default.yml b/project/config/liofa/config/core.entity_view_display.node.webform.default.yml index dd89235a7..a56c39a8d 100644 --- a/project/config/liofa/config/core.entity_view_display.node.webform.default.yml +++ b/project/config/liofa/config/core.entity_view_display.node.webform.default.yml @@ -3,7 +3,8 @@ langcode: en-gb status: true dependencies: config: - - field.field.node.webform.body + - field.field.node.webform.field_webform_footer + - field.field.node.webform.field_webform_header - field.field.node.webform.webform - node.type.webform module: @@ -17,7 +18,14 @@ targetEntityType: node bundle: webform mode: default content: - body: + field_webform_footer: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 2 + region: content + field_webform_header: type: text_default label: hidden settings: { } diff --git a/project/config/liofa/config/core.entity_view_display.node.webform.diff.yml b/project/config/liofa/config/core.entity_view_display.node.webform.diff.yml deleted file mode 100644 index 343e8a1eb..000000000 --- a/project/config/liofa/config/core.entity_view_display.node.webform.diff.yml +++ /dev/null @@ -1,37 +0,0 @@ -uuid: 07f399d8-eace-42a9-8da6-ce01468b8b7e -langcode: en -status: true -dependencies: - config: - - core.entity_view_mode.node.diff - - field.field.node.webform.body - - field.field.node.webform.webform - - node.type.webform - module: - - text - - user -id: node.webform.diff -targetEntityType: node -bundle: webform -mode: diff -content: - body: - type: text_default - label: hidden - settings: { } - third_party_settings: { } - weight: 0 - region: content - content_moderation_control: - settings: { } - third_party_settings: { } - weight: -20 - region: content - links: - settings: { } - third_party_settings: { } - weight: 100 - region: content -hidden: - langcode: true - webform: true diff --git a/project/config/liofa/config/core.entity_view_display.node.webform.teaser.yml b/project/config/liofa/config/core.entity_view_display.node.webform.teaser.yml index 828366141..5a26560a2 100644 --- a/project/config/liofa/config/core.entity_view_display.node.webform.teaser.yml +++ b/project/config/liofa/config/core.entity_view_display.node.webform.teaser.yml @@ -4,11 +4,11 @@ status: true dependencies: config: - core.entity_view_mode.node.teaser - - field.field.node.webform.body + - field.field.node.webform.field_webform_footer + - field.field.node.webform.field_webform_header - field.field.node.webform.webform - node.type.webform module: - - text - user _core: default_config_hash: Ls5l3Xs7-YstJnurxFLKj38Exqr2JMZs1j9YeX1Kh2o @@ -17,14 +17,6 @@ targetEntityType: node bundle: webform mode: teaser content: - body: - type: text_summary_or_trimmed - label: hidden - settings: - trim_length: 600 - third_party_settings: { } - weight: 0 - region: content content_moderation_control: settings: { } third_party_settings: { } @@ -36,5 +28,7 @@ content: weight: 100 region: content hidden: + field_webform_footer: true + field_webform_header: true langcode: true webform: true diff --git a/project/config/liofa/config/core.extension.yml b/project/config/liofa/config/core.extension.yml index 8a294d6b6..a614c028f 100644 --- a/project/config/liofa/config/core.extension.yml +++ b/project/config/liofa/config/core.extension.yml @@ -73,6 +73,7 @@ module: link: 0 link_fix_absolute_urls: 0 linkit: 0 + liofa_pledges: 0 locale: 0 media: 0 media_file_delete: 0 @@ -91,6 +92,7 @@ module: node: 0 node_edit_protection: 0 noreferrer: 0 + object_log: 0 options: 0 origins_ckeditor_enhancements: 0 origins_common: 0 diff --git a/project/config/liofa/config/field.field.node.webform.body.yml b/project/config/liofa/config/field.field.node.webform.field_webform_footer.yml similarity index 64% rename from project/config/liofa/config/field.field.node.webform.body.yml rename to project/config/liofa/config/field.field.node.webform.field_webform_footer.yml index 34efac94b..6a6e38716 100644 --- a/project/config/liofa/config/field.field.node.webform.body.yml +++ b/project/config/liofa/config/field.field.node.webform.field_webform_footer.yml @@ -1,9 +1,9 @@ -uuid: 9966ec13-4851-420f-994a-06984edc2c5b -langcode: en +uuid: c2ae6338-7f67-4f99-81c8-a4dde8cfcd87 +langcode: en-gb status: true dependencies: config: - - field.storage.node.body + - field.storage.node.field_webform_footer - filter.format.basic_html - node.type.webform module: @@ -13,19 +13,17 @@ third_party_settings: allowed_formats: allowed_formats: - basic_html -id: node.webform.body -field_name: body +id: node.webform.field_webform_footer +field_name: field_webform_footer entity_type: node bundle: webform -label: Body +label: Footer description: '' required: false translatable: true default_value: { } default_value_callback: '' settings: - display_summary: false - required_summary: false allowed_formats: - basic_html -field_type: text_with_summary +field_type: text_long diff --git a/project/config/liofa/config/field.field.node.webform.field_webform_header.yml b/project/config/liofa/config/field.field.node.webform.field_webform_header.yml new file mode 100644 index 000000000..6dd114e76 --- /dev/null +++ b/project/config/liofa/config/field.field.node.webform.field_webform_header.yml @@ -0,0 +1,29 @@ +uuid: 3ee655dd-866b-428d-b8bf-81b3bf808be7 +langcode: en-gb +status: true +dependencies: + config: + - field.storage.node.field_webform_header + - filter.format.basic_html + - node.type.webform + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: + - basic_html +id: node.webform.field_webform_header +field_name: field_webform_header +entity_type: node +bundle: webform +label: Header +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + allowed_formats: + - basic_html +field_type: text_long diff --git a/project/config/liofa/config/field.storage.node.field_webform_footer.yml b/project/config/liofa/config/field.storage.node.field_webform_footer.yml new file mode 100644 index 000000000..cc78eeee3 --- /dev/null +++ b/project/config/liofa/config/field.storage.node.field_webform_footer.yml @@ -0,0 +1,19 @@ +uuid: a2f8f2ad-51e2-4d19-8222-ca761b50c372 +langcode: und +status: true +dependencies: + module: + - node + - text +id: node.field_webform_footer +field_name: field_webform_footer +entity_type: node +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/project/config/liofa/config/field.storage.node.field_webform_header.yml b/project/config/liofa/config/field.storage.node.field_webform_header.yml new file mode 100644 index 000000000..4adeb212f --- /dev/null +++ b/project/config/liofa/config/field.storage.node.field_webform_header.yml @@ -0,0 +1,19 @@ +uuid: ebb22bc2-52fa-43c4-9bf9-a1707af2e873 +langcode: und +status: true +dependencies: + module: + - node + - text +id: node.field_webform_header +field_name: field_webform_header +entity_type: node +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/project/config/liofa/local/language/en/system.action.user_add_role_action.administrator.yml b/project/config/liofa/config/language/en/system.action.user_add_role_action.administrator.yml similarity index 100% rename from project/config/liofa/local/language/en/system.action.user_add_role_action.administrator.yml rename to project/config/liofa/config/language/en/system.action.user_add_role_action.administrator.yml diff --git a/project/config/liofa/local/language/en/system.action.user_remove_role_action.administrator.yml b/project/config/liofa/config/language/en/system.action.user_remove_role_action.administrator.yml similarity index 100% rename from project/config/liofa/local/language/en/system.action.user_remove_role_action.administrator.yml rename to project/config/liofa/config/language/en/system.action.user_remove_role_action.administrator.yml diff --git a/project/config/liofa/local/language/en/user.role.administrator.yml b/project/config/liofa/config/language/en/user.role.administrator.yml similarity index 100% rename from project/config/liofa/local/language/en/user.role.administrator.yml rename to project/config/liofa/config/language/en/user.role.administrator.yml diff --git a/project/config/liofa/config/language/ga/search.page.user_search.yml b/project/config/liofa/config/language/ga/search.page.user_search.yml new file mode 100644 index 000000000..88be60715 --- /dev/null +++ b/project/config/liofa/config/language/ga/search.page.user_search.yml @@ -0,0 +1 @@ +label: Úsádeoirí diff --git a/project/config/liofa/config/language/ga/views.view.content.yml b/project/config/liofa/config/language/ga/views.view.content.yml new file mode 100644 index 000000000..bfaf45c81 --- /dev/null +++ b/project/config/liofa/config/language/ga/views.view.content.yml @@ -0,0 +1,7 @@ +display: + default: + display_options: + filters: + langcode: + expose: + label: Teanga diff --git a/project/config/liofa/config/language/ga/views.view.files.yml b/project/config/liofa/config/language/ga/views.view.files.yml new file mode 100644 index 000000000..1efb94b44 --- /dev/null +++ b/project/config/liofa/config/language/ga/views.view.files.yml @@ -0,0 +1,6 @@ +display: + default: + display_options: + fields: + filename: + label: Ainm diff --git a/project/config/liofa/config/language/ga/views.view.media.yml b/project/config/liofa/config/language/ga/views.view.media.yml new file mode 100644 index 000000000..bfaf45c81 --- /dev/null +++ b/project/config/liofa/config/language/ga/views.view.media.yml @@ -0,0 +1,7 @@ +display: + default: + display_options: + filters: + langcode: + expose: + label: Teanga diff --git a/project/config/liofa/config/language/ga/views.view.media_library.yml b/project/config/liofa/config/language/ga/views.view.media_library.yml new file mode 100644 index 000000000..d0e564ca1 --- /dev/null +++ b/project/config/liofa/config/language/ga/views.view.media_library.yml @@ -0,0 +1,43 @@ +display: + default: + display_options: + filters: + name: + expose: + label: Ainm + langcode: + expose: + label: Teanga + default_page: + display_options: + fields: + name: + label: Ainm + edit_media: + text: 'Cuir in eagar' + filters: + name: + expose: + label: Ainm + page: + display_options: + fields: + edit_media: + text: 'Cuir in eagar' + delete_media: + text: Scrios + widget: + display_options: + filters: + name: + expose: + label: Ainm + widget_table: + display_options: + fields: + name: + label: Ainm + filters: + name: + expose: + label: Ainm diff --git a/project/config/liofa/config/language/ga/views.view.moderated_content.yml b/project/config/liofa/config/language/ga/views.view.moderated_content.yml new file mode 100644 index 000000000..bfaf45c81 --- /dev/null +++ b/project/config/liofa/config/language/ga/views.view.moderated_content.yml @@ -0,0 +1,7 @@ +display: + default: + display_options: + filters: + langcode: + expose: + label: Teanga diff --git a/project/config/liofa/config/language/ga/views.view.user_admin_people.yml b/project/config/liofa/config/language/ga/views.view.user_admin_people.yml new file mode 100644 index 000000000..a18e7584c --- /dev/null +++ b/project/config/liofa/config/language/ga/views.view.user_admin_people.yml @@ -0,0 +1,6 @@ +display: + default: + display_options: + fields: + name: + label: 'Ainm úsáideora' diff --git a/project/config/liofa/config/language/ga/webform.webform_options.languages.yml b/project/config/liofa/config/language/ga/webform.webform_options.languages.yml new file mode 100644 index 000000000..e35e1c890 --- /dev/null +++ b/project/config/liofa/config/language/ga/webform.webform_options.languages.yml @@ -0,0 +1 @@ +category: Teanga diff --git a/project/config/liofa/config/language/ga/webform.webform_options.translations.yml b/project/config/liofa/config/language/ga/webform.webform_options.translations.yml new file mode 100644 index 000000000..e35e1c890 --- /dev/null +++ b/project/config/liofa/config/language/ga/webform.webform_options.translations.yml @@ -0,0 +1 @@ +category: Teanga diff --git a/project/config/liofa/config/liofa_pledges.countsettings.yml b/project/config/liofa/config/liofa_pledges.countsettings.yml new file mode 100644 index 000000000..18d289bb4 --- /dev/null +++ b/project/config/liofa/config/liofa_pledges.countsettings.yml @@ -0,0 +1,2 @@ +pledge_count_submissions: '26356' +pledge_count_offset: '0' diff --git a/project/config/liofa/local/system.action.user_add_role_action.administrator.yml b/project/config/liofa/config/system.action.user_add_role_action.administrator.yml similarity index 100% rename from project/config/liofa/local/system.action.user_add_role_action.administrator.yml rename to project/config/liofa/config/system.action.user_add_role_action.administrator.yml diff --git a/project/config/liofa/local/system.action.user_remove_role_action.administrator.yml b/project/config/liofa/config/system.action.user_remove_role_action.administrator.yml similarity index 100% rename from project/config/liofa/local/system.action.user_remove_role_action.administrator.yml rename to project/config/liofa/config/system.action.user_remove_role_action.administrator.yml diff --git a/project/config/liofa/local/user.role.administrator.yml b/project/config/liofa/config/user.role.administrator.yml similarity index 93% rename from project/config/liofa/local/user.role.administrator.yml rename to project/config/liofa/config/user.role.administrator.yml index 8113f0a18..0c23a0966 100644 --- a/project/config/liofa/local/user.role.administrator.yml +++ b/project/config/liofa/config/user.role.administrator.yml @@ -8,7 +8,6 @@ dependencies: - block - content_translation - contextual - - devel - filter - image - language @@ -16,9 +15,9 @@ dependencies: - node - path - pathauto + - search - system - taxonomy - - views_ui _core: default_config_hash: J8rXM_vdD29ZTEwtLOs84Vsn-PTRH-ZDh_Pi610CAEI id: administrator @@ -30,7 +29,6 @@ permissions: - 'access content' - 'access content overview' - 'access contextual links' - - 'access devel information' - 'access site in maintenance mode' - 'access site reports' - 'access user profiles' @@ -44,22 +42,23 @@ permissions: - 'administer nodes' - 'administer pathauto' - 'administer permissions' + - 'administer search' - 'administer site configuration' - 'administer software updates' - 'administer taxonomy' - 'administer themes' - 'administer url aliases' - 'administer users' - - 'administer views' - 'bypass node access' - 'cancel account' - 'change own username' - 'create url aliases' - 'notify of path changes' + - 'search content' - 'select account cancellation method' - - 'switch users' - 'translate any entity' - 'translate interface' + - 'use advanced search' - 'use text format full_html' - 'view own unpublished content' - 'view the administration theme' diff --git a/project/config/liofa/config/user.role.anonymous.yml b/project/config/liofa/config/user.role.anonymous.yml index 26baabc1d..86afa4780 100644 --- a/project/config/liofa/config/user.role.anonymous.yml +++ b/project/config/liofa/config/user.role.anonymous.yml @@ -9,7 +9,7 @@ dependencies: _core: default_config_hash: am6KFAgAEMZ_pS-xuDp-YhRgpp6bh0kRRCv0RBwVr3U id: anonymous -label: 'Anonymous user' +label: 'anonymous user' weight: 0 is_admin: false permissions: diff --git a/project/config/liofa/config/user.role.authenticated.yml b/project/config/liofa/config/user.role.authenticated.yml index 305cc7d60..02d688a66 100644 --- a/project/config/liofa/config/user.role.authenticated.yml +++ b/project/config/liofa/config/user.role.authenticated.yml @@ -13,7 +13,7 @@ dependencies: _core: default_config_hash: z-UB57Tg7OS627ItYHGrWlRMLhAT7P1VO2tDm6Wty0c id: authenticated -label: 'Authenticated user' +label: 'authenticated user' weight: 1 is_admin: false permissions: diff --git a/project/config/liofa/config/user.role.supervisor_user.yml b/project/config/liofa/config/user.role.supervisor_user.yml index bbcc8478f..308f8aea7 100644 --- a/project/config/liofa/config/user.role.supervisor_user.yml +++ b/project/config/liofa/config/user.role.supervisor_user.yml @@ -47,11 +47,19 @@ permissions: - 'access toolbar' - 'add scheduled transitions node basic_page' - 'add scheduled transitions node bulk_pledges' + - 'add scheduled transitions node event' + - 'add scheduled transitions node faq' - 'add scheduled transitions node feature' + - 'add scheduled transitions node first_name' + - 'add scheduled transitions node form_page' - 'add scheduled transitions node news' + - 'add scheduled transitions node newsletter' - 'add scheduled transitions node organisation' - 'add scheduled transitions node phrase_of_the_week' - 'add scheduled transitions node podcast' + - 'add scheduled transitions node shared_heritage' + - 'add scheduled transitions node surname' + - 'add scheduled transitions node training_course' - 'administer blocks' - 'administer main menu items' - 'administer pathauto' @@ -112,11 +120,19 @@ permissions: - 'manipulate entityqueues' - 'reschedule scheduled transitions node basic_page' - 'reschedule scheduled transitions node bulk_pledges' + - 'reschedule scheduled transitions node event' + - 'reschedule scheduled transitions node faq' - 'reschedule scheduled transitions node feature' + - 'reschedule scheduled transitions node first_name' + - 'reschedule scheduled transitions node form_page' - 'reschedule scheduled transitions node news' + - 'reschedule scheduled transitions node newsletter' - 'reschedule scheduled transitions node organisation' - 'reschedule scheduled transitions node phrase_of_the_week' - 'reschedule scheduled transitions node podcast' + - 'reschedule scheduled transitions node shared_heritage' + - 'reschedule scheduled transitions node surname' + - 'reschedule scheduled transitions node training_course' - 'revert all revisions' - 'revert basic_page revisions' - 'revert bulk_pledges revisions' @@ -146,9 +162,17 @@ permissions: - 'view own unpublished media' - 'view scheduled transitions node basic_page' - 'view scheduled transitions node bulk_pledges' + - 'view scheduled transitions node event' + - 'view scheduled transitions node faq' - 'view scheduled transitions node feature' + - 'view scheduled transitions node first_name' + - 'view scheduled transitions node form_page' - 'view scheduled transitions node news' + - 'view scheduled transitions node newsletter' - 'view scheduled transitions node organisation' - 'view scheduled transitions node phrase_of_the_week' - 'view scheduled transitions node podcast' + - 'view scheduled transitions node shared_heritage' + - 'view scheduled transitions node surname' + - 'view scheduled transitions node training_course' - 'view the administration theme' diff --git a/project/config/liofa/config/views.view.bulk_pledges.yml b/project/config/liofa/config/views.view.bulk_pledges.yml index 87ef03d1a..9c2f21c6f 100644 --- a/project/config/liofa/config/views.view.bulk_pledges.yml +++ b/project/config/liofa/config/views.view.bulk_pledges.yml @@ -476,6 +476,122 @@ display: - 'config:field.storage.node.field_bulk_date' - 'config:field.storage.node.field_bulk_number' - 'config:field.storage.node.field_bulk_source' + attachment_1: + id: attachment_1 + display_title: 'Pledge count' + display_plugin: attachment + position: 2 + display_options: + fields: + field_bulk_number: + id: field_bulk_number + table: node__field_bulk_number + field: field_bulk_number + relationship: none + group_type: sum + admin_label: '' + plugin_id: field + label: Total + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: '' + field_api_classes: false + set_precision: false + precision: 0 + decimal: . + format_plural: 0 + format_plural_string: !!binary MQNAY291bnQ= + prefix: '' + suffix: '' + sorts: { } + style: + type: default + options: + row_class: '' + default_row_class: false + uses_fields: false + row: + type: fields + options: + default_field_elements: false + inline: { } + separator: '' + hide_empty: false + defaults: + group_by: false + style: false + row: false + fields: false + sorts: false + header: false + group_by: true + display_description: '' + header: { } + display_extenders: + metatag_display_extender: + metatags: { } + tokenize: false + displays: + page_1: page_1 + attachment_position: after + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: { } page_1: id: page_1 display_title: Page @@ -819,119 +935,3 @@ display: - 'config:field.storage.node.field_bulk_date' - 'config:field.storage.node.field_bulk_number' - 'config:field.storage.node.field_bulk_source' - pledge_count: - id: pledge_count - display_title: 'Pledge count' - display_plugin: attachment - position: 2 - display_options: - fields: - field_bulk_number: - id: field_bulk_number - table: node__field_bulk_number - field: field_bulk_number - relationship: none - group_type: sum - admin_label: '' - plugin_id: field - label: Total - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: number_integer - settings: - thousand_separator: '' - prefix_suffix: true - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: '' - field_api_classes: false - set_precision: false - precision: 0 - decimal: . - format_plural: 0 - format_plural_string: !!binary MQNAY291bnQ= - prefix: '' - suffix: '' - sorts: { } - style: - type: default - options: - row_class: '' - default_row_class: false - uses_fields: false - row: - type: fields - options: - default_field_elements: false - inline: { } - separator: '' - hide_empty: false - defaults: - group_by: false - style: false - row: false - fields: false - sorts: false - header: false - group_by: true - display_description: '' - header: { } - display_extenders: - metatag_display_extender: - metatags: { } - tokenize: false - displays: - page_1: page_1 - attachment_position: after - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_interface' - - 'user.node_grants:view' - - user.permissions - tags: { } diff --git a/project/config/liofa/config/views.view.sign_up_to_liofa.yml b/project/config/liofa/config/views.view.sign_up_to_liofa.yml deleted file mode 100644 index c812f3f8d..000000000 --- a/project/config/liofa/config/views.view.sign_up_to_liofa.yml +++ /dev/null @@ -1,292 +0,0 @@ -uuid: 1b30cb75-154c-4923-a25e-2742081e362f -langcode: en -status: true -dependencies: - config: - - node.type.webform - module: - - node - - user - - webform -id: sign_up_to_liofa -label: 'Sign up to liofa' -module: views -description: '' -tag: '' -base_table: node_field_data -base_field: nid -display: - default: - id: default - display_title: Default - display_plugin: default - position: 0 - display_options: - title: 'Sign up to liofa' - fields: - title: - id: title - table: node_field_data - field: title - relationship: none - group_type: group - admin_label: '' - plugin_id: field - label: '' - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: string - settings: - link_to_entity: true - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - sid: - id: sid - table: webform_submission - field: sid - relationship: webform_submission - group_type: count_distinct - admin_label: '' - entity_type: webform_submission - entity_field: sid - plugin_id: field - label: Count - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: number_integer - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - set_precision: false - precision: 0 - decimal: . - format_plural: 0 - format_plural_string: !!binary MQNAY291bnQ= - prefix: '' - suffix: '' - pager: - type: some - options: - offset: 0 - items_per_page: 5 - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - empty: { } - sorts: { } - arguments: { } - filters: - status: - id: status - table: node_field_data - field: status - entity_type: node - entity_field: status - plugin_id: boolean - value: '1' - group: 1 - expose: - operator: '' - type: - id: type - table: node_field_data - field: type - relationship: none - group_type: group - admin_label: '' - entity_type: node - entity_field: type - plugin_id: bundle - operator: in - value: - webform: webform - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - reduce: false - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - style: - type: default - row: - type: fields - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } - relationships: - webform_submission: - id: webform_submission - table: node_field_data - field: webform_submission - relationship: none - group_type: group - admin_label: nid - entity_type: node - plugin_id: standard - required: false - group_by: true - header: { } - footer: { } - display_extenders: { } - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - 'user.node_grants:view' - - user.permissions - tags: { } - block_1: - id: block_1 - display_title: Block - display_plugin: block - position: 1 - display_options: - display_extenders: - metatag_display_extender: - metatags: { } - tokenize: false - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - 'user.node_grants:view' - - user.permissions - tags: { } diff --git a/project/config/liofa/config/webform.webform.sign_up_to_liofa.yml b/project/config/liofa/config/webform.webform.sign_up.yml similarity index 79% rename from project/config/liofa/config/webform.webform.sign_up_to_liofa.yml rename to project/config/liofa/config/webform.webform.sign_up.yml index fd98aece0..286eb0cc9 100644 --- a/project/config/liofa/config/webform.webform.sign_up_to_liofa.yml +++ b/project/config/liofa/config/webform.webform.sign_up.yml @@ -1,30 +1,27 @@ -uuid: d0dea441-50ef-4e54-b3e0-8168f3f48904 +uuid: ed10eb20-ca4f-4d37-b853-94eb52cea6ac langcode: en status: open dependencies: { } weight: 0 open: null close: null -uid: 305 +uid: 295 template: false archive: false -id: sign_up_to_liofa -title: 'Sign up to Líofa' -description: '' +id: sign_up +title: 'Sign up' +description: 'Sign up webform' categories: { } elements: |- - signup_name: + name: '#type': textfield '#title': Name - '#required': true - signup_email: + email_address: '#type': email '#title': 'Email address' - '#required': true - signup_postcode: + postcode: '#type': textfield '#title': Postcode - '#pattern': '^[A-Za-z]{1,2}[0-9Rr][0-9A-Za-z]? [0-9][ABD-HJLNP-UW-Zabd-hjlnp-uw-z]{2}$' css: '' javascript: '' settings: @@ -34,7 +31,7 @@ settings: ajax_effect: '' ajax_speed: null page: true - page_submit_path: /signup + page_submit_path: '' page_confirm_path: '' page_theme_name: '' form_title: both @@ -131,8 +128,8 @@ settings: draft_pending_multiple_message: '' confirmation_type: page confirmation_url: '' - confirmation_title: Success - confirmation_message: 'Thank you for signing up to Liofa.' + confirmation_title: '' + confirmation_message: '' confirmation_attributes: { } confirmation_back: true confirmation_back_label: '' @@ -154,7 +151,7 @@ settings: entity_limit_user_interval: null purge: none purge_days: null - results_disabled: true + results_disabled: false results_disabled_ignore: false results_customize: false token_view: false @@ -208,42 +205,5 @@ access: roles: { } users: { } permissions: { } -handlers: - email: - id: email - handler_id: email - label: Email - notes: '' - status: true - conditions: { } - weight: 0 - settings: - states: - - completed - to_mail: _default - to_options: { } - bcc_mail: '' - bcc_options: { } - cc_mail: '' - cc_options: { } - from_mail: _default - from_options: { } - from_name: _default - reply_to: '' - return_path: '' - sender_mail: '' - sender_name: '' - subject: _default - body: _default - excluded_elements: { } - ignore_access: false - exclude_empty: true - exclude_empty_checkbox: false - exclude_attachments: false - html: true - attachments: false - twig: false - theme_name: '' - parameters: { } - debug: false +handlers: { } variants: { } diff --git a/project/config/liofa/local/devel.settings.yml b/project/config/liofa/local/devel.settings.yml index 2ef403cbe..976cc91f3 100644 --- a/project/config/liofa/local/devel.settings.yml +++ b/project/config/liofa/local/devel.settings.yml @@ -1,6 +1,5 @@ _core: default_config_hash: Aqx6J0yYT6mVqT0fbjeP4JkoL-700nmudVF5d6Pq2Yo -langcode: en-gb page_alter: false raw_names: false error_handlers: diff --git a/project/config/liofa/local/devel.toolbar.settings.yml b/project/config/liofa/local/devel.toolbar.settings.yml index d7deea8b5..76ada43ce 100644 --- a/project/config/liofa/local/devel.toolbar.settings.yml +++ b/project/config/liofa/local/devel.toolbar.settings.yml @@ -1,6 +1,5 @@ _core: default_config_hash: IQjf_ytthngZTAk_MU8-74VecArWD3G5g0oEH6PM6GA -langcode: en-gb toolbar_items: - devel.admin_settings_link - devel.cache_clear diff --git a/project/config/liofa/local/language/en/system.action.clone_nodes.yml b/project/config/liofa/local/language/en/system.action.clone_nodes.yml deleted file mode 100644 index b2b84ff18..000000000 --- a/project/config/liofa/local/language/en/system.action.clone_nodes.yml +++ /dev/null @@ -1 +0,0 @@ -label: 'Clone Nodes' diff --git a/project/config/liofa/local/language/en/system.menu.devel.yml b/project/config/liofa/local/language/en/system.menu.devel.yml deleted file mode 100644 index 53ac26093..000000000 --- a/project/config/liofa/local/language/en/system.menu.devel.yml +++ /dev/null @@ -1,2 +0,0 @@ -label: Development -description: 'Links related to Devel module.' diff --git a/project/config/liofa/local/migrate_drupal.settings.yml b/project/config/liofa/local/migrate_drupal.settings.yml deleted file mode 100644 index 289036ad5..000000000 --- a/project/config/liofa/local/migrate_drupal.settings.yml +++ /dev/null @@ -1,8 +0,0 @@ -_core: - default_config_hash: 1daEO2inZc1i3d0Sn-ADIq9mUIU7tSLCxn579NT6f2g -langcode: en-gb -enforce_source_module_tags: - - 'Drupal 6' - - 'Drupal 7' -follow_up_migration_tags: - - 'Follow-up migration' diff --git a/project/config/liofa/local/stage_file_proxy.settings.yml b/project/config/liofa/local/stage_file_proxy.settings.yml deleted file mode 100644 index 8024394d8..000000000 --- a/project/config/liofa/local/stage_file_proxy.settings.yml +++ /dev/null @@ -1,9 +0,0 @@ -_core: - default_config_hash: ttd8HXcqwSjGgp-fWA3gUA8q4TNvXB0a72pkFlnF56g -langcode: en-gb -hotlink: false -origin: 'https://www.liofa.eu' -origin_dir: sites/default/files -use_imagecache_root: true -verify: true -excluded_extensions: '' diff --git a/project/config/liofa/local/system.action.clone_nodes.yml b/project/config/liofa/local/system.action.clone_nodes.yml deleted file mode 100644 index 220a4c0fc..000000000 --- a/project/config/liofa/local/system.action.clone_nodes.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: ffe45d2a-61bb-48f3-8d85-a9d7746cc187 -langcode: en-gb -status: true -dependencies: - module: - - clone_nodes -_core: - default_config_hash: iWpJXsOU5S0G8yu-dV3KyAaH9Q7vK11j5HEVy18E5xk -id: clone_nodes -label: 'Clone Nodes' -type: node -plugin: clone_nodes -configuration: { } diff --git a/project/config/liofa/local/system.menu.devel.yml b/project/config/liofa/local/system.menu.devel.yml index 6f3b717a7..7871a506d 100644 --- a/project/config/liofa/local/system.menu.devel.yml +++ b/project/config/liofa/local/system.menu.devel.yml @@ -1,5 +1,5 @@ -uuid: 20e26bf0-2a20-45f8-a2a5-acde34ccd986 -langcode: und +uuid: caae7bc7-c1f4-436d-8d76-d6d470de023c +langcode: en status: true dependencies: enforced: @@ -9,5 +9,5 @@ _core: default_config_hash: 3V-l1uuTcyirYOGLPZV5HWaDfr02uEbWZJIwc8Byz-c id: devel label: Development -description: 'Development link' +description: 'Links related to Devel module.' locked: true diff --git a/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.links.menu.yml b/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.links.menu.yml index 1d8189eb6..8a3ded103 100644 --- a/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.links.menu.yml +++ b/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.links.menu.yml @@ -1,6 +1,6 @@ liofa_pledges.pledge_count: title: 'Pledge count' - route_name: liofa_pledges.online_pledge_count + route_name: liofa_pledges.liofa_pledges description: 'Configure pledge count' parent: unity.admin_config weight: 99 diff --git a/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.module b/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.module index 15e036b1a..d77bbf219 100644 --- a/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.module +++ b/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.module @@ -6,15 +6,17 @@ use Drupal\webform\WebformSubmissionInterface; * Implements hook_ENTITY_TYPE_insert() for webform_submission entities. */ function liofa_pledges_webform_submission_insert(WebformSubmissionInterface $webform_submission) { - $config = \Drupal::configFactory() - ->getEditable('online_pledge_count.countsettings'); + if ($webform_submission->getWebform()->id() == 'sign_up') { + $config = \Drupal::configFactory() + ->getEditable('liofa_pledges.countsettings'); - $onsite_pledges = intval($config->get('pledge_count_submissions')); - $onsite_pledges++; + $onsite_pledges = intval($config->get('pledge_count_submissions')); + $onsite_pledges++; - $config - ->set('pledge_count_submissions', $onsite_pledges) - ->save(); + $config + ->set('pledge_count_submissions', $onsite_pledges) + ->save(); + } } diff --git a/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.routing.yml b/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.routing.yml index 0ff23fca0..2197a19cb 100644 --- a/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.routing.yml +++ b/project/sites/liofa/modules/custom/liofa_pledges/liofa_pledges.routing.yml @@ -1,4 +1,4 @@ -liofa_pledges.online_pledge_count: +liofa_pledges.liofa_pledges: path: '/admin/config/liofa_pledges/pledge_count' defaults: _form: '\Drupal\liofa_pledges\Form\PledgeCountForm' diff --git a/project/sites/liofa/modules/custom/liofa_pledges/src/Controller/LiofaPledgesController.php b/project/sites/liofa/modules/custom/liofa_pledges/src/Controller/LiofaPledgesController.php index a78f8ff1d..8f2c6d01f 100644 --- a/project/sites/liofa/modules/custom/liofa_pledges/src/Controller/LiofaPledgesController.php +++ b/project/sites/liofa/modules/custom/liofa_pledges/src/Controller/LiofaPledgesController.php @@ -1,13 +1,58 @@ configFactory = $config_factory; + $this->entityTypeManager = $entity_type_manager; + $this->config = $this->configFactory->get('liofa_pledges.countsettings'); + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('config.factory'), + $container->get('entity_type.manager') + ); + } + /** * Returns a simple page. * @@ -15,9 +60,43 @@ class LiofaPledgesController extends ControllerBase { * A simple renderable array. */ public function pledgesSummary() { + $this->generateTotals(); + // Calculate overall total. + $total = $this->onsite_pledges + $this->bulk_pledge_count + $this->pledge_count_offset; + // Output table. + $table_html = ' + + + + + + + +
ComponentValue
Pledges submitted online' . $this->onsite_pledges . '
Bulk pledges' . $this->bulk_pledge_count . '
Pledge count offset' . $this->pledge_count_offset . '
Total' . $total . '
'; return [ - '#markup' => 'Hello, world', + '#markup' => 'The table below shows a breakdown of the pledge count value shown on the home page.' . $table_html, ]; } + protected function generateTotals() { + // Retrieve pledge count submitted online. + $this->onsite_pledges = intval($this->config->get('pledge_count_submissions')); + // Now need to get bulk pledges count. + $this->bulk_pledge_count = 0; + $result = $this->entityTypeManager->getStorage('node')->getAggregateQuery('AND') + ->accessCheck(FALSE) + ->aggregate('field_bulk_number', 'sum') + ->condition('type', 'bulk_pledges') + ->condition('status', NodeInterface::PUBLISHED) + ->execute(); + if (!empty($result) && is_array($result)) { + $this->bulk_pledge_count = $result[0]['field_bulk_number_sum']; + } + // Get pledge count offset. + $this->pledge_count_offset = intval($this->config->get('pledge_count_offset')); + if (empty($this->pledge_count_offset)) { + $this->pledge_count_offset = 0; + } + } + } diff --git a/project/sites/liofa/modules/custom/liofa_pledges/src/Form/PledgeCountForm.php b/project/sites/liofa/modules/custom/liofa_pledges/src/Form/PledgeCountForm.php index 0781e7765..416aa408c 100644 --- a/project/sites/liofa/modules/custom/liofa_pledges/src/Form/PledgeCountForm.php +++ b/project/sites/liofa/modules/custom/liofa_pledges/src/Form/PledgeCountForm.php @@ -15,7 +15,7 @@ class pledgeCountForm extends ConfigFormBase { */ protected function getEditableConfigNames() { return [ - 'online_pledge_count.countsettings', + 'liofa_pledges.countsettings', ]; } @@ -23,14 +23,14 @@ protected function getEditableConfigNames() { * {@inheritdoc} */ public function getFormId() { - return 'online_pledge_count'; + return 'liofa_pledges'; } /** * {@inheritdoc} */ public function buildForm(array $form, FormStateInterface $form_state) { - $config = $this->config('online_pledge_count.countsettings'); + $config = $this->config('liofa_pledges.countsettings'); $message_online = "For data protection reasons, pledges submitted via the website are deleted after 3 days. The website maintains"; $message_online .= "
a count of all submitted pledges, deleted and not deleted. On very rare occasions, the count might get out of sync. "; @@ -82,7 +82,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) { parent::submitForm($form, $form_state); - $this->config('online_pledge_count.countsettings') + $this->config('liofa_pledges.countsettings') ->set('pledge_count_submissions', $form_state->getValue('pledge_count_submissions')) ->set('pledge_count_offset', $form_state->getValue('pledge_count_offset')) ->save();