From b964214cffc2fd041865902d4e9590f11da4b579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 6 Aug 2019 16:00:13 -0400 Subject: [PATCH 001/865] Update README with CSS compile shortcut --- web/themes/custom/geofresco/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/themes/custom/geofresco/README.md b/web/themes/custom/geofresco/README.md index f3c4c7b..e5bbb3a 100644 --- a/web/themes/custom/geofresco/README.md +++ b/web/themes/custom/geofresco/README.md @@ -44,6 +44,10 @@ Provided by default are seven npm scripts that point to Gulp tasks. We run gulp ``` npm run compile ``` + or: + ``` + ./css + ``` 3. Watch files and run tasks when they change. ``` From 0311059ceab7859a6eee3e706940829062fa6a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 6 Aug 2019 18:57:30 -0400 Subject: [PATCH 002/865] Override entire navbar block so we can take the silly hamburger menu out and put it somewhere reasonable --- .../src/templates/layout/page.html.twig | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig index 991c9e3..ff1f747 100644 --- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig @@ -26,6 +26,13 @@ {{ page.header_user }} {% endif %} +
+ +
{% if page.header_search %}
{{ page.header_search }} @@ -34,7 +41,34 @@
{% endif %} -{{ parent() }} +{% if page.navbar_branding or page.navbar_social or page.primary_menu %} +{# Top navbar #} + +{% endif %} {% endblock navbar %} {% block header %}

{{ site_slogan }}

From 5983c606e115ff21b3c8202be9d3c3b39c78e84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 6 Aug 2019 18:59:26 -0400 Subject: [PATCH 003/865] Ensure user account menu stays on top of main nav background Also keep columns (don't stack them) on mobile but hide most of them --- web/themes/custom/geofresco/src/global/_layout.scss | 6 ++---- .../custom/geofresco/src/templates/layout/page.html.twig | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index c0021e3..74b7fd5 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -1,8 +1,6 @@ @charset "UTF-8"; // Extend or override Bulma's layouts ../../node_modules/bulma/sass/layout -/* -.hero-body { - padding: 2rem 1.5rem; +.secondary-menus { + z-index: 40; } -*/ diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig index ff1f747..9e2bafc 100644 --- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig @@ -18,9 +18,9 @@ {% block navbar %} {# Add a new region #} {% if page.header_user or page.header_search %} -
-
-
+
+
+
{% if page.header_user %} -{% endif %} +{% for item in items %} + {{ item.content }} +{% endfor %} From adcfd578a94413df911f8901a42fc5f5f8b3cef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 10:50:02 -0400 Subject: [PATCH 138/865] And add the subtitle class, which gives it the cool font --- .../src/templates/elements/field--field-subtitle.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/templates/elements/field--field-subtitle.html.twig b/web/themes/custom/geofresco/src/templates/elements/field--field-subtitle.html.twig index 9a10658..35294b2 100644 --- a/web/themes/custom/geofresco/src/templates/elements/field--field-subtitle.html.twig +++ b/web/themes/custom/geofresco/src/templates/elements/field--field-subtitle.html.twig @@ -37,5 +37,5 @@ */ #} {% for item in items %} - {{ item.content }} + {{ item.content }} {% endfor %} From 14a0d805a5a3c9a5736e65110c698a09a0931ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 11:37:21 -0400 Subject: [PATCH 139/865] Put a white screen behind text overlaying the image @TODO figure out if we can/should remove this when there is not an image. --- web/themes/custom/geofresco/src/global/_components.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index 2a6ba95..a046ded 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -69,3 +69,9 @@ text-align: right; } } + +.title span { + background-color: rgba($offwhite, 0.66); + padding: 0.2em; + border-radius: 0.3em; +} From 8a9c86a7da2a18cf3d560387451691ccd3ac5814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 11:37:39 -0400 Subject: [PATCH 140/865] Give some space above the subtitle --- web/themes/custom/geofresco/src/global/_elements.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss index 7850e82..4f6639c 100644 --- a/web/themes/custom/geofresco/src/global/_elements.scss +++ b/web/themes/custom/geofresco/src/global/_elements.scss @@ -41,3 +41,8 @@ font-size: 1.2rem; } } + +/* Give some space above the subtitle. */ +.featured-image { + margin-bottom: 0.5rem; +} From e9cd3ec8e7261514523c19e05551fea07d21c3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 11:38:10 -0400 Subject: [PATCH 141/865] Allow the primary page content to be flush with the bottom of the slogan --- web/themes/custom/geofresco/src/global/_layout.scss | 7 +++++++ .../custom/geofresco/src/templates/layout/page.html.twig | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index 35a256a..988bbbc 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -17,6 +17,13 @@ display: inline-block; } +/* Allow the primary page content to be flush with the bottom of the slogan. */ +.main-section { + padding-top: 0; + .group-header { + padding-top: 0; + } +} /* On any page except the home, drop the title over (where we want) the image (to be). */ .page-title { diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig index c6ebf04..8067182 100644 --- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig @@ -82,7 +82,7 @@ {% endblock header %} {% block main %} {# Main section #} -
+
{# link is in html.html.twig #} From 60db7c9d2f5cdf033f56d62364da93be7a3c6c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 11:39:34 -0400 Subject: [PATCH 142/865] Note why footer opacity different from title opacity --- web/themes/custom/geofresco/src/global/_components.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index a046ded..787fce8 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -54,6 +54,8 @@ /** * Give enough of a background around text in the footer that it is legible on * any part of the grassy field image used as the background. + * + * The link and changed text are not dark so we need a pretty high opacity. */ .footer .views-field { .field-content { From 9618c387c53ab179c201c44a7c267ec30bb69969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 11:40:03 -0400 Subject: [PATCH 143/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index ca97743..ebb3b6b 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -3082,6 +3082,10 @@ a.tag:hover { color: #8FB489; font-size: 1.2rem; } +/* Give some space above the subtitle. */ +.featured-image { + margin-bottom: 0.5rem; } + .input, .textarea, .select select { background-color: white; border-color: #dbdbdb; @@ -6036,6 +6040,8 @@ label.panel-block { /** * Give enough of a background around text in the footer that it is legible on * any part of the grassy field image used as the background. + * + * The link and changed text are not dark so we need a pretty high opacity. */ .footer .views-field .field-content { background-color: rgba(248, 248, 248, 0.9); @@ -6049,6 +6055,11 @@ label.panel-block { margin-bottom: 0.4rem; text-align: right; } +.title span { + background-color: rgba(248, 248, 248, 0.66); + padding: 0.2em; + border-radius: 0.3em; } + .column { display: block; -ms-flex-preferred-size: 0; @@ -8205,6 +8216,12 @@ label.panel-block { .logo > .image { display: inline-block; } +/* Allow the primary page content to be flush with the bottom of the slogan. */ +.main-section { + padding-top: 0; } + .main-section .group-header { + padding-top: 0; } + /* On any page except the home, drop the title over (where we want) the image (to be). */ .page-title { height: 0; From 844168c3c1546c0c6d9dfa971704af04c0374fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 11:42:10 -0400 Subject: [PATCH 144/865] Make background shading more specific to page title --- web/themes/custom/geofresco/src/global/_components.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index 787fce8..11a64c9 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -72,7 +72,7 @@ } } -.title span { +.page-title .title > span { background-color: rgba($offwhite, 0.66); padding: 0.2em; border-radius: 0.3em; From c8c591083bc698d6c76e0a83709af7ef4d21b348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 11:42:41 -0400 Subject: [PATCH 145/865] Tweak page title background shading padding --- web/themes/custom/geofresco/src/global/_components.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index 11a64c9..d3e61f5 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -74,6 +74,6 @@ .page-title .title > span { background-color: rgba($offwhite, 0.66); - padding: 0.2em; - border-radius: 0.3em; + padding: 0.4em 0.3em 0.3em 0.3em; + border-radius: 0.4em; } From 4ced023ac97472d09715fff841c588e01e5d7a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 11:42:48 -0400 Subject: [PATCH 146/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index ebb3b6b..bb21cfc 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -6055,10 +6055,10 @@ label.panel-block { margin-bottom: 0.4rem; text-align: right; } -.title span { +.page-title .title > span { background-color: rgba(248, 248, 248, 0.66); - padding: 0.2em; - border-radius: 0.3em; } + padding: 0.4em 0.3em 0.3em 0.3em; + border-radius: 0.4em; } .column { display: block; From a6b18d68be64fa46d8834899b6bb791d7e3f579d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 23:25:40 -0400 Subject: [PATCH 147/865] Configure home page card views for articles, blogs, collections, and gleanings Ref #24 --- ..._block__home_page_views_block_articles.yml | 36 ++ ...ews_block__home_page_views_block_blogs.yml | 36 ++ ...ock__home_page_views_block_collections.yml | 36 ++ ...block__home_page_views_block_gleanings.yml | 36 ++ config/sync/views.view.home_page_views.yml | 416 ++++++++++++++++++ 5 files changed, 560 insertions(+) create mode 100644 config/sync/block.block.views_block__home_page_views_block_articles.yml create mode 100644 config/sync/block.block.views_block__home_page_views_block_blogs.yml create mode 100644 config/sync/block.block.views_block__home_page_views_block_collections.yml create mode 100644 config/sync/block.block.views_block__home_page_views_block_gleanings.yml create mode 100644 config/sync/views.view.home_page_views.yml diff --git a/config/sync/block.block.views_block__home_page_views_block_articles.yml b/config/sync/block.block.views_block__home_page_views_block_articles.yml new file mode 100644 index 0000000..a3328ca --- /dev/null +++ b/config/sync/block.block.views_block__home_page_views_block_articles.yml @@ -0,0 +1,36 @@ +uuid: f6120e1c-309a-4395-a7ef-4b5058e328aa +langcode: en +status: true +dependencies: + config: + - views.view.home_page_views + module: + - block_visibility_groups + - system + - views + theme: + - geofresco +id: views_block__home_page_views_block_articles +theme: geofresco +region: content +weight: -7 +provider: null +plugin: 'views_block:home_page_views-block_articles' +settings: + id: 'views_block:home_page_views-block_articles' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: none +visibility: + condition_group: + id: condition_group + negate: false + block_visibility_group: '' + context_mapping: { } + request_path: + id: request_path + pages: '' + negate: false + context_mapping: { } diff --git a/config/sync/block.block.views_block__home_page_views_block_blogs.yml b/config/sync/block.block.views_block__home_page_views_block_blogs.yml new file mode 100644 index 0000000..704d7c4 --- /dev/null +++ b/config/sync/block.block.views_block__home_page_views_block_blogs.yml @@ -0,0 +1,36 @@ +uuid: 0d56df84-e499-4cdc-b987-99a668ba1557 +langcode: en +status: true +dependencies: + config: + - views.view.home_page_views + module: + - block_visibility_groups + - system + - views + theme: + - geofresco +id: views_block__home_page_views_block_blogs +theme: geofresco +region: content +weight: -6 +provider: null +plugin: 'views_block:home_page_views-block_blogs' +settings: + id: 'views_block:home_page_views-block_blogs' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: none +visibility: + condition_group: + id: condition_group + negate: false + block_visibility_group: '' + context_mapping: { } + request_path: + id: request_path + pages: '' + negate: false + context_mapping: { } diff --git a/config/sync/block.block.views_block__home_page_views_block_collections.yml b/config/sync/block.block.views_block__home_page_views_block_collections.yml new file mode 100644 index 0000000..537f485 --- /dev/null +++ b/config/sync/block.block.views_block__home_page_views_block_collections.yml @@ -0,0 +1,36 @@ +uuid: 88fd256e-0dee-4c74-8d20-0351bb6fe912 +langcode: en +status: true +dependencies: + config: + - views.view.home_page_views + module: + - block_visibility_groups + - system + - views + theme: + - geofresco +id: views_block__home_page_views_block_collections +theme: geofresco +region: content +weight: -5 +provider: null +plugin: 'views_block:home_page_views-block_collections' +settings: + id: 'views_block:home_page_views-block_collections' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: none +visibility: + condition_group: + id: condition_group + negate: false + block_visibility_group: '' + context_mapping: { } + request_path: + id: request_path + pages: '' + negate: false + context_mapping: { } diff --git a/config/sync/block.block.views_block__home_page_views_block_gleanings.yml b/config/sync/block.block.views_block__home_page_views_block_gleanings.yml new file mode 100644 index 0000000..e88c7eb --- /dev/null +++ b/config/sync/block.block.views_block__home_page_views_block_gleanings.yml @@ -0,0 +1,36 @@ +uuid: 71576977-dc89-43ad-b748-5f30ddf3e0e1 +langcode: en +status: true +dependencies: + config: + - views.view.home_page_views + module: + - block_visibility_groups + - system + - views + theme: + - geofresco +id: views_block__home_page_views_block_gleanings +theme: geofresco +region: content +weight: -4 +provider: null +plugin: 'views_block:home_page_views-block_gleanings' +settings: + id: 'views_block:home_page_views-block_gleanings' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: none +visibility: + condition_group: + id: condition_group + negate: false + block_visibility_group: '' + context_mapping: { } + request_path: + id: request_path + pages: '' + negate: false + context_mapping: { } diff --git a/config/sync/views.view.home_page_views.yml b/config/sync/views.view.home_page_views.yml new file mode 100644 index 0000000..ee818da --- /dev/null +++ b/config/sync/views.view.home_page_views.yml @@ -0,0 +1,416 @@ +uuid: 49170534-5d80-4f6c-b492-03ecb1ebaa26 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.card + - node.type.article + - node.type.blog + - node.type.collection + - node.type.gleaning + module: + - node + - user +id: home_page_views +label: 'Home page views' +module: views +description: 'Blocks with rows of cards, four each, for the home page.' +tag: '' +base_table: node_field_data +base_field: nid +core: 8.x +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: false + replica: false + query_comment: '' + query_tags: { } + 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 + pager: + type: some + options: + items_per_page: 4 + offset: 0 + style: + type: default + options: + row_class: '' + default_row_class: false + uses_fields: false + row: + type: 'entity:node' + options: + relationship: none + view_mode: card + fields: + title: + id: title + table: node_field_data + field: title + entity_type: node + entity_field: title + label: '' + alter: + alter_text: false + make_link: false + absolute: false + trim: false + word_boundary: false + ellipsis: false + strip_tags: false + html: false + hide_empty: false + empty_zero: false + settings: + link_to_entity: true + plugin_id: field + relationship: none + group_type: group + admin_label: '' + exclude: 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_alter_empty: true + click_sort_column: value + type: string + 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 + filters: + status: + value: '1' + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + group: 1 + type: + id: type + table: node_field_data + field: type + value: + article: article + entity_type: node + entity_field: type + plugin_id: bundle + sorts: + created: + id: created + table: node_field_data + field: created + order: DESC + entity_type: node + entity_field: created + plugin_id: date + relationship: none + group_type: group + admin_label: '' + exposed: false + expose: + label: '' + granularity: second + title: 'Latest articles' + header: { } + footer: { } + empty: { } + relationships: { } + arguments: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: { } + block_articles: + display_plugin: block + id: block_articles + display_title: 'Articles block' + position: 1 + display_options: + display_extenders: { } + display_description: '' + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: { } + block_blogs: + display_plugin: block + id: block_blogs + display_title: 'Blog block' + position: 1 + display_options: + display_extenders: { } + filters: + status: + value: '1' + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + group: 1 + type: + id: type + table: node_field_data + field: type + relationship: none + group_type: group + admin_label: '' + operator: in + value: + blog: blog + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + 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: { } + entity_type: node + entity_field: type + plugin_id: bundle + defaults: + filters: false + filter_groups: false + title: false + filter_groups: + operator: AND + groups: + 1: AND + title: 'Latest blogs' + display_description: '' + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: { } + block_collections: + display_plugin: block + id: block_collections + display_title: 'Collection block' + position: 1 + display_options: + display_extenders: { } + filters: + status: + value: '1' + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + group: 1 + type: + id: type + table: node_field_data + field: type + relationship: none + group_type: group + admin_label: '' + operator: in + value: + collection: collection + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + 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: { } + entity_type: node + entity_field: type + plugin_id: bundle + defaults: + filters: false + filter_groups: false + title: false + filter_groups: + operator: AND + groups: + 1: AND + title: 'Latest issues and movement pages' + display_description: '' + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: { } + block_gleanings: + display_plugin: block + id: block_gleanings + display_title: 'Gleaning block' + position: 1 + display_options: + display_extenders: { } + filters: + status: + value: '1' + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + group: 1 + type: + id: type + table: node_field_data + field: type + relationship: none + group_type: group + admin_label: '' + operator: in + value: + gleaning: gleaning + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + 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: { } + entity_type: node + entity_field: type + plugin_id: bundle + defaults: + filters: false + filter_groups: false + title: false + filter_groups: + operator: AND + groups: + 1: AND + title: 'Latest gleanings' + display_description: '' + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - 'user.node_grants:view' + - user.permissions + tags: { } From 68f58a7285130864c11cb2df55a7e746150522d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sat, 31 Aug 2019 23:27:42 -0400 Subject: [PATCH 148/865] Let other blocks adjust their weight --- config/sync/block.block.geofresco_content.yml | 2 +- config/sync/block.block.geofresco_local_actions.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/sync/block.block.geofresco_content.yml b/config/sync/block.block.geofresco_content.yml index 5e63114..3a01cd1 100644 --- a/config/sync/block.block.geofresco_content.yml +++ b/config/sync/block.block.geofresco_content.yml @@ -11,7 +11,7 @@ _core: id: geofresco_content theme: geofresco region: content -weight: 0 +weight: -8 provider: null plugin: system_main_block settings: diff --git a/config/sync/block.block.geofresco_local_actions.yml b/config/sync/block.block.geofresco_local_actions.yml index e6b6a34..cdfd955 100644 --- a/config/sync/block.block.geofresco_local_actions.yml +++ b/config/sync/block.block.geofresco_local_actions.yml @@ -9,7 +9,7 @@ _core: id: geofresco_local_actions theme: geofresco region: content -weight: -20 +weight: -9 provider: null plugin: local_actions_block settings: From 3fb94d6d4e8e19a05226812fd2f4bf35dc132b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 08:39:18 -0400 Subject: [PATCH 149/865] Make featured image class only get applied to full content ... so it stops destroying our teaser and card listings --- ...d-image.html.twig => field--node--field-image--full.html.twig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename web/themes/custom/geofresco/src/templates/elements/{field--node--field-image.html.twig => field--node--field-image--full.html.twig} (100%) diff --git a/web/themes/custom/geofresco/src/templates/elements/field--node--field-image.html.twig b/web/themes/custom/geofresco/src/templates/elements/field--node--field-image--full.html.twig similarity index 100% rename from web/themes/custom/geofresco/src/templates/elements/field--node--field-image.html.twig rename to web/themes/custom/geofresco/src/templates/elements/field--node--field-image--full.html.twig From aec7e7cbc1735ca828a96096e21115241d62d71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 08:44:16 -0400 Subject: [PATCH 150/865] Enable Twig Template Suggestions and Empty Page module so we can clean up the home page --- config/sync/core.extension.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index b9430f2..703febd 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -103,6 +103,8 @@ module: views: 10 paragraphs: 11 config_provider: 100 + twigsuggest: 100 + empty_page: 1000 minimal: 1000 theme: stable: 0 From ba46fd4d2ad003cc75f92c2d4562ee784bbf0ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 08:44:52 -0400 Subject: [PATCH 151/865] Add Empty Page module, Twig Template Suggestions, and Webform modules --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index daed21b..a608cb5 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ "drupal/convert_bundles": "^1.0@alpha", "drupal/cshs": "^1.0@beta", "drupal/drutopia_collection": "dev-8.x-1.x as 1.x-dev", + "drupal/empty_page": "^2.0", "drupal/field_token_value": "^1.0", "drupal/fixed_block_content": "^1.0", "drupal/link_attributes": "^1.9", @@ -24,6 +25,8 @@ "drupal/migrate_source_csv": "3.1", "drupal/migrate_tools": "^4.1", "drupal/migrate_upgrade": "^3", + "drupal/twigsuggest": "^1.0@alpha", + "drupal/webform": "^5.4", "drush/drush": "^9.0", "drutopia/drutopia": "^1.0-beta2" }, From fb69330cf54db865c5d35350669b44a2286aba77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 08:45:28 -0400 Subject: [PATCH 152/865] Configure Empty Page module to provide a front page path --- config/sync/empty_page.settings.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 config/sync/empty_page.settings.yml diff --git a/config/sync/empty_page.settings.yml b/config/sync/empty_page.settings.yml new file mode 100644 index 0000000..d3735b0 --- /dev/null +++ b/config/sync/empty_page.settings.yml @@ -0,0 +1,9 @@ +new_id: 2 +_core: + default_config_hash: 1qKVk03zhLAZj-W36dakmXWDO3mx28TRgx9iDzHpqMs +callback_1: + created: 1567338567 + cid: '1' + updated: 1567339101 + path: home + page_title: 'GEO Home' From e45844a05658f4bc8913e95164bab28d46793f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 08:54:27 -0400 Subject: [PATCH 153/865] Enable Mailchimp module --- config/sync/core.extension.yml | 1 + config/sync/mailchimp.settings.yml | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 config/sync/mailchimp.settings.yml diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 703febd..62de995 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -65,6 +65,7 @@ module: image: 0 layout_discovery: 0 link: 0 + mailchimp: 0 menu_block: 0 menu_ui: 0 metatag: 0 diff --git a/config/sync/mailchimp.settings.yml b/config/sync/mailchimp.settings.yml new file mode 100644 index 0000000..c25108b --- /dev/null +++ b/config/sync/mailchimp.settings.yml @@ -0,0 +1,7 @@ +api_key: '' +cron: false +batch_limit: 100 +api_classname: Mailchimp\Mailchimp +test_mode: false +_core: + default_config_hash: x8k6uOqmSHPqpp71jYGxHF3_SAs3U-Pha3YCntQIhPU From d3be422cd7300ca8cf4e412121d6fd651bfb8083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 08:55:14 -0400 Subject: [PATCH 154/865] Try out Hax module, could it replace paragraphs on short notice? --- config/sync/core.extension.yml | 1 + config/sync/hax.settings.yml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 config/sync/hax.settings.yml diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 62de995..3d0743a 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -60,6 +60,7 @@ module: gdpr: 0 geo_upgrade: 0 hal: 0 + hax: 0 help: 0 history: 0 image: 0 diff --git a/config/sync/hax.settings.yml b/config/sync/hax.settings.yml new file mode 100644 index 0000000..ed7c1d1 --- /dev/null +++ b/config/sync/hax.settings.yml @@ -0,0 +1,18 @@ +hax_autoload_element_node_view: true +hax_autoload_element_list: 'oer-schema lrn-aside grid-plate tab-list magazine-cover video-player image-compare-slider license-element self-check multiple-choice lrn-table hero-banner task-list media-image lrndesign-blockquote meme-maker a11y-gif-player paper-audio-player wikipedia-query lrn-vocab lrn-math person-testimonial citation-element code-editor place-holder stop-note q-r wave-player' +hax_project_location: 'https://webcomponents.psu.edu/cdn/' +hax_project_location_other: '' +hax_youtube_key: '' +hax_memegenerator_key: '' +hax_vimeo_key: '' +hax_giphy_key: '' +hax_unsplash_key: '' +hax_flickr_key: '' +hax_pixabay_key: '' +_core: + default_config_hash: orzciTl55yn6xL-xaWqg-lZYMYxAQaCvWOlZHGBqTBA +hax_googlepoly_key: '' +actions: null +form_build_id: form-K6VQRHzrtFHUtG1Ap_Q6iLrn-t2-bmKNXaC9MHP6z5Y +form_token: kOMJGX5wT5lgghhvLRu0o3PS3ZlV9PXqX4NgwiNChMQ +form_id: hax_settings From 7671bc2fe61a6c774fd3f2abb94b6f1102d9f809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 08:55:37 -0400 Subject: [PATCH 155/865] Add Hax and Mailchimp modules --- composer.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/composer.json b/composer.json index a608cb5..211128e 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,9 @@ "drupal/empty_page": "^2.0", "drupal/field_token_value": "^1.0", "drupal/fixed_block_content": "^1.0", + "drupal/hax": "^3.1", "drupal/link_attributes": "^1.9", + "drupal/mailchimp": "^1.10", "drupal/migrate_plus": "^4.2", "drupal/migrate_source_csv": "3.1", "drupal/migrate_tools": "^4.1", From 511f23d20b73277496a90c6361baef9bb221e8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 08:56:53 -0400 Subject: [PATCH 156/865] Configure front page to be our new 'empty page' (where all our blocks hang out) --- config/sync/system.site.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/system.site.yml b/config/sync/system.site.yml index 1359baa..00eb14e 100644 --- a/config/sync/system.site.yml +++ b/config/sync/system.site.yml @@ -5,7 +5,7 @@ slogan: 'Catalyzing worker co-ops & the solidarity economy' page: 403: '' 404: '' - front: /node + front: /home admin_compact_mode: false weight_select_max: 100 langcode: en From ce680efad71b5d035d700502bc8dfd2bd093f27e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 09:05:25 -0400 Subject: [PATCH 157/865] Limit images on teasers and cards to *just one* ... even though we migrated like a dozen into field_image in many cases. Ref #24 --- config/sync/core.entity_view_display.node.article.card.yml | 4 +++- config/sync/core.entity_view_display.node.article.teaser.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/sync/core.entity_view_display.node.article.card.yml b/config/sync/core.entity_view_display.node.article.card.yml index 35e8e37..dc6c047 100644 --- a/config/sync/core.entity_view_display.node.article.card.yml +++ b/config/sync/core.entity_view_display.node.article.card.yml @@ -97,7 +97,9 @@ content: settings: responsive_image_style: narrow image_link: content - third_party_settings: { } + third_party_settings: + ds: + ds_limit: '1' field_summary: type: text_trimmed weight: 5 diff --git a/config/sync/core.entity_view_display.node.article.teaser.yml b/config/sync/core.entity_view_display.node.article.teaser.yml index e4421c3..5a18c1b 100644 --- a/config/sync/core.entity_view_display.node.article.teaser.yml +++ b/config/sync/core.entity_view_display.node.article.teaser.yml @@ -83,7 +83,9 @@ content: settings: responsive_image_style: narrow image_link: content - third_party_settings: { } + third_party_settings: + ds: + ds_limit: '1' label: visually_hidden region: left field_summary: From b9213cde83ac774b40f1473339f0bd90525baaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 10:00:55 -0400 Subject: [PATCH 158/865] Remove Hax module it is not currently the answer to all our current prayers See https://gitlab.com/agaric/raw-notes/blob/master/content/notes/2019-08-31-hax-and-drupal.md --- composer.json | 1 - config/sync/hax.settings.yml | 18 ------------------ 2 files changed, 19 deletions(-) delete mode 100644 config/sync/hax.settings.yml diff --git a/composer.json b/composer.json index 211128e..c3173b7 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "drupal/empty_page": "^2.0", "drupal/field_token_value": "^1.0", "drupal/fixed_block_content": "^1.0", - "drupal/hax": "^3.1", "drupal/link_attributes": "^1.9", "drupal/mailchimp": "^1.10", "drupal/migrate_plus": "^4.2", diff --git a/config/sync/hax.settings.yml b/config/sync/hax.settings.yml deleted file mode 100644 index ed7c1d1..0000000 --- a/config/sync/hax.settings.yml +++ /dev/null @@ -1,18 +0,0 @@ -hax_autoload_element_node_view: true -hax_autoload_element_list: 'oer-schema lrn-aside grid-plate tab-list magazine-cover video-player image-compare-slider license-element self-check multiple-choice lrn-table hero-banner task-list media-image lrndesign-blockquote meme-maker a11y-gif-player paper-audio-player wikipedia-query lrn-vocab lrn-math person-testimonial citation-element code-editor place-holder stop-note q-r wave-player' -hax_project_location: 'https://webcomponents.psu.edu/cdn/' -hax_project_location_other: '' -hax_youtube_key: '' -hax_memegenerator_key: '' -hax_vimeo_key: '' -hax_giphy_key: '' -hax_unsplash_key: '' -hax_flickr_key: '' -hax_pixabay_key: '' -_core: - default_config_hash: orzciTl55yn6xL-xaWqg-lZYMYxAQaCvWOlZHGBqTBA -hax_googlepoly_key: '' -actions: null -form_build_id: form-K6VQRHzrtFHUtG1Ap_Q6iLrn-t2-bmKNXaC9MHP6z5Y -form_token: kOMJGX5wT5lgghhvLRu0o3PS3ZlV9PXqX4NgwiNChMQ -form_id: hax_settings From 14c634d761b9d3734d83c28a81a82d6018a0b055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 10:01:44 -0400 Subject: [PATCH 159/865] Commit composer lock file --- composer.lock | 364 ++++++++++++++++++++++++++++++++- config/sync/core.extension.yml | 1 - 2 files changed, 361 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 01208c1..e61761a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f804ec4ad073c4fec671eba27c8682ee", + "content-hash": "a0caa04b6bd10c91f7153a3c4fb0251f", "packages": [ { "name": "asm89/stack-cors", @@ -5538,6 +5538,69 @@ "irc": "irc://irc.freenode.org/drupal-contribute" } }, + { + "name": "drupal/empty_page", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/empty_page.git", + "reference": "8.x-2.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/empty_page-8.x-2.0.zip", + "reference": "8.x-2.0", + "shasum": "a506edc2e6eecce3802184fa58d8f7960b2da130" + }, + "require": { + "drupal/core": "~8.0" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + }, + "drupal": { + "version": "8.x-2.0", + "datestamp": "1520245685", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Nick Robillard", + "homepage": "https://www.drupal.org/user/176017" + }, + { + "name": "NormySan", + "homepage": "https://www.drupal.org/user/112352" + }, + { + "name": "bleen", + "homepage": "https://www.drupal.org/user/77375" + }, + { + "name": "merauluka", + "homepage": "https://www.drupal.org/user/780004" + }, + { + "name": "mukila", + "homepage": "https://www.drupal.org/user/3223526" + } + ], + "description": "A simple empty page solution. Assists in creating empty menu callbacks mostly used for pages that only consist of blocks.", + "homepage": "https://www.drupal.org/project/empty_page", + "support": { + "source": "https://git.drupalcode.org/project/empty_page" + } + }, { "name": "drupal/entity", "version": "1.0.0-rc3", @@ -5690,7 +5753,7 @@ }, "drupal": { "version": "8.x-1.8", - "datestamp": "1563997086", + "datestamp": "1563997434", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6480,6 +6543,98 @@ "source": "https://git.drupalcode.org/project/link_attributes" } }, + { + "name": "drupal/mailchimp", + "version": "1.10.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/mailchimp.git", + "reference": "8.x-1.10" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/mailchimp-8.x-1.10.zip", + "reference": "8.x-1.10", + "shasum": "7eda95ab868f02796f36d2a348979ff0c9b50871" + }, + "require": { + "drupal/core": "~8.0", + "thinkshout/mailchimp-api-php": "2.0.0" + }, + "require-dev": { + "drupal/mailchimp_lists": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.10", + "datestamp": "1564183981", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "autoload": { + "psr-0": { + "Mailchimp": "src/" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "amyvs", + "homepage": "https://www.drupal.org/user/3181721" + }, + { + "name": "gcb", + "homepage": "https://www.drupal.org/user/1682976" + }, + { + "name": "julia.leah.ford", + "homepage": "https://www.drupal.org/user/3590443" + }, + { + "name": "levelos", + "homepage": "https://www.drupal.org/user/54135" + }, + { + "name": "mshaver", + "homepage": "https://www.drupal.org/user/39079" + }, + { + "name": "nrackleff", + "homepage": "https://www.drupal.org/user/463332" + }, + { + "name": "rjacobsen0", + "homepage": "https://www.drupal.org/user/3578420" + }, + { + "name": "ruscoe", + "homepage": "https://www.drupal.org/user/2722087" + }, + { + "name": "samuel.mortenson", + "homepage": "https://www.drupal.org/user/2582268" + }, + { + "name": "tauno", + "homepage": "https://www.drupal.org/user/105595" + } + ], + "description": "Mailchimp is an integration with the Mailchimp Mass email tool.", + "homepage": "http://drupal.org/project/mailchimp", + "support": { + "source": "https://git.drupalcode.org/project/mailchimp" + } + }, { "name": "drupal/menu_block", "version": "1.5.0", @@ -7672,6 +7827,57 @@ "source": "https://git.drupalcode.org/project/token" } }, + { + "name": "drupal/twigsuggest", + "version": "1.0.0-alpha2", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/twigsuggest.git", + "reference": "8.x-1.0-alpha2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/twigsuggest-8.x-1.0-alpha2.zip", + "reference": "8.x-1.0-alpha2", + "shasum": "71f72aa4b8d0f014d0492018a3396b00ccb26598" + }, + "require": { + "drupal/core": "~8.0" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.0-alpha2", + "datestamp": "1543493580", + "security-coverage": { + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "leymannx", + "homepage": "https://www.drupal.org/user/2482808" + }, + { + "name": "mlncn", + "homepage": "https://www.drupal.org/user/64383" + } + ], + "description": "Provides template suggestions for things Drupal doesn't.", + "homepage": "https://www.drupal.org/project/twigsuggest", + "support": { + "source": "https://git.drupalcode.org/project/twigsuggest" + } + }, { "name": "drupal/video_embed_field", "version": "2.2.0", @@ -7733,6 +7939,120 @@ "source": "https://git.drupalcode.org/project/video_embed_field" } }, + { + "name": "drupal/webform", + "version": "5.4.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/webform.git", + "reference": "8.x-5.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/webform-8.x-5.4.zip", + "reference": "8.x-5.4", + "shasum": "367de6af2485d3838ec80f41c536f6ecc52a405f" + }, + "require": { + "drupal/core": "*" + }, + "require-dev": { + "drupal/address": "~1.4", + "drupal/bootstrap": "~3.0", + "drupal/captcha": "~1.0", + "drupal/chosen": "~2.6", + "drupal/devel": "*", + "drupal/entity_print": "^2.1", + "drupal/jsonapi": "~2.0 || ~8.7", + "drupal/mailsystem": "~4.0", + "drupal/select2": "~1.1", + "drupal/smtp": "~1.0", + "drupal/telephone_validation": "^2.2", + "drupal/token": "~1.3", + "drupal/webform_access": "*", + "drupal/webform_attachment": "*", + "drupal/webform_entity_print": "*", + "drupal/webform_node": "*", + "drupal/webform_scheduled_email": "*", + "drupal/webform_ui": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-5.x": "5.x-dev" + }, + "drupal": { + "version": "8.x-5.4", + "datestamp": "1566209286", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": "^9" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Jacob Rockowitz (jrockowitz)", + "homepage": "https://www.drupal.org/u/jrockowitz", + "role": "Maintainer" + }, + { + "name": "Alexander Trotsenko (bucefal91)", + "homepage": "https://www.drupal.org/u/bucefal91", + "role": "Co-maintainer" + }, + { + "name": "bucefal91", + "homepage": "https://www.drupal.org/user/504128" + }, + { + "name": "fenstrat", + "homepage": "https://www.drupal.org/user/362649" + }, + { + "name": "jrockowitz", + "homepage": "https://www.drupal.org/user/371407" + }, + { + "name": "podarok", + "homepage": "https://www.drupal.org/user/116002" + }, + { + "name": "quicksketch", + "homepage": "https://www.drupal.org/user/35821" + }, + { + "name": "sanchiz", + "homepage": "https://www.drupal.org/user/1671246" + }, + { + "name": "tedbow", + "homepage": "https://www.drupal.org/user/240860" + }, + { + "name": "torotil", + "homepage": "https://www.drupal.org/user/865256" + } + ], + "description": "Enables the creation of webforms and questionnaires.", + "homepage": "https://drupal.org/project/webform", + "support": { + "source": "http://cgit.drupalcode.org/webform", + "error": "Invalid dependency: \"telephone_validation/telephone_validation\" is an unknown drupal 8 package name", + "issues": "https://www.drupal.org/project/issues/webform?version=8.x", + "docs": "https://www.drupal.org/docs/8/modules/webform", + "forum": "https://drupal.stackexchange.com/questions/tagged/webform" + } + }, { "name": "drush/drush", "version": "9.7.1", @@ -10812,6 +11132,43 @@ "homepage": "https://symfony.com", "time": "2019-08-20T13:31:17+00:00" }, + { + "name": "thinkshout/mailchimp-api-php", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/thinkshout/mailchimp-api-php.git", + "reference": "ffa6cf96efe3a7e8e0de8309737a7dae40f51981" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thinkshout/mailchimp-api-php/zipball/ffa6cf96efe3a7e8e0de8309737a7dae40f51981", + "reference": "ffa6cf96efe3a7e8e0de8309737a7dae40f51981", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^6.2.1", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.2.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Mailchimp\\": "src/", + "Mailchimp\\http\\": "src/http/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "description": "PHP library for v3 of the MailChimp API", + "homepage": "https://github.com/thinkshout/mailchimp-api-php", + "keywords": [ + "mail", + "mailchimp" + ], + "time": "2018-02-27T17:52:03+00:00" + }, { "name": "twig/twig", "version": "v1.42.3", @@ -11292,7 +11649,8 @@ "drupal/config_actions": 20, "drupal/convert_bundles": 15, "drupal/cshs": 10, - "drupal/drutopia_collection": 20 + "drupal/drutopia_collection": 20, + "drupal/twigsuggest": 15 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 3d0743a..62de995 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -60,7 +60,6 @@ module: gdpr: 0 geo_upgrade: 0 hal: 0 - hax: 0 help: 0 history: 0 image: 0 From fcc77247d3298475412d68e63b4f950ffa55fcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 10:02:03 -0400 Subject: [PATCH 160/865] Commit config snapshots --- ...snapshot.config_sync.module.empty_page.yml | 16 +++++++++++++++ ....snapshot.config_sync.module.mailchimp.yml | 20 +++++++++++++++++++ ...napshot.config_sync.module.twigsuggest.yml | 11 ++++++++++ 3 files changed, 47 insertions(+) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.empty_page.yml create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.mailchimp.yml create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.twigsuggest.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.empty_page.yml b/config/sync/config_snapshot.snapshot.config_sync.module.empty_page.yml new file mode 100644 index 0000000..b32c06f --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.empty_page.yml @@ -0,0 +1,16 @@ +uuid: d9d25e40-2fd6-433d-8d2d-449d4813f8de +langcode: en +status: true +dependencies: + module: + - empty_page +id: config_sync.module.empty_page +snapshotSet: config_sync +extensionType: module +extensionName: empty_page +items: + - + collection: '' + name: empty_page.settings + data: + new_id: 1 diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.mailchimp.yml b/config/sync/config_snapshot.snapshot.config_sync.module.mailchimp.yml new file mode 100644 index 0000000..5d90089 --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.mailchimp.yml @@ -0,0 +1,20 @@ +uuid: 6c898862-0b78-4843-a0dc-cd1cc3fd9184 +langcode: en +status: true +dependencies: + module: + - mailchimp +id: config_sync.module.mailchimp +snapshotSet: config_sync +extensionType: module +extensionName: mailchimp +items: + - + collection: '' + name: mailchimp.settings + data: + api_key: '' + cron: false + batch_limit: 100 + api_classname: Mailchimp\Mailchimp + test_mode: false diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.twigsuggest.yml b/config/sync/config_snapshot.snapshot.config_sync.module.twigsuggest.yml new file mode 100644 index 0000000..bc91b38 --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.twigsuggest.yml @@ -0,0 +1,11 @@ +uuid: 66ed2ad1-412d-4560-89e8-a69e5bb2d759 +langcode: en +status: true +dependencies: + module: + - twigsuggest +id: config_sync.module.twigsuggest +snapshotSet: config_sync +extensionType: module +extensionName: twigsuggest +items: { } From 07861c3d9a0832904ec9a73da459c9e02e3b5c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 21:41:43 -0400 Subject: [PATCH 161/865] Add class we will have Class It Up automatically provide --- web/themes/custom/geofresco/src/global/_layout.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index 988bbbc..b8ea7f9 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -25,8 +25,8 @@ } } -/* On any page except the home, drop the title over (where we want) the image (to be). */ -.page-title { +/* On node pages, drop the title over (where we want) the image (to be). */ +.page--content-item .page-title { height: 0; position: relative; overflow: visible; From d79c0feee756afcee8e3b29376445f4fea5d0657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 21:42:19 -0400 Subject: [PATCH 162/865] Add Class It Up module --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index c3173b7..a7cdc86 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,7 @@ "cweagans/composer-patches": "^1.0", "drupal-composer/drupal-scaffold": "^2.0.0", "drupal/claro": "^1.0@alpha", + "drupal/classitup": "1.x-dev", "drupal/config_actions": "1.x-dev", "drupal/convert_bundles": "^1.0@alpha", "drupal/cshs": "^1.0@beta", From e591b6c70fe824f34c33831fbe1b380e4588ec94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:02:59 -0400 Subject: [PATCH 163/865] Bring in dev version of classitup so we can work on it --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7cdc86..2047547 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "cweagans/composer-patches": "^1.0", "drupal-composer/drupal-scaffold": "^2.0.0", "drupal/claro": "^1.0@alpha", - "drupal/classitup": "1.x-dev", + "drupal/classitup": "dev-8.x-1.x as 1.x-dev", "drupal/config_actions": "1.x-dev", "drupal/convert_bundles": "^1.0@alpha", "drupal/cshs": "^1.0@beta", @@ -44,6 +44,10 @@ "drupal/drutopia_collection": { "type": "git", "url": "git@gitlab.com:drutopia/drutopia_collection.git" + }, + "drupal/classitup": { + "type": "git", + "url": "git@git.drupal.org:project/classitup.git" } }, "scripts": { From 1fc51a1eef1d9fe32f1dcd7040493ede6989cf7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:41:29 -0400 Subject: [PATCH 164/865] Add menu link config although i don't think we'll use it Filed https://gitlab.com/agaric/sites/geo/issues/39 instead --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 2047547..545bde8 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "drupal/fixed_block_content": "^1.0", "drupal/link_attributes": "^1.9", "drupal/mailchimp": "^1.10", + "drupal/menu_link_config": "^1.0@alpha", "drupal/migrate_plus": "^4.2", "drupal/migrate_source_csv": "3.1", "drupal/migrate_tools": "^4.1", From 132bdd67585e0debb62345333ed59c46ed458546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:43:27 -0400 Subject: [PATCH 165/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index bb21cfc..35ab189 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -8222,8 +8222,8 @@ label.panel-block { .main-section .group-header { padding-top: 0; } -/* On any page except the home, drop the title over (where we want) the image (to be). */ -.page-title { +/* On node pages, drop the title over (where we want) the image (to be). */ +.page--content-item .page-title { height: 0; position: relative; overflow: visible; From e385e60da34c724551806c585933ca68a123c754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:45:51 -0400 Subject: [PATCH 166/865] Maybe we made the title fatter but we need more space --- web/themes/custom/geofresco/src/global/_layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index b8ea7f9..b0f2418 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -35,5 +35,5 @@ /* If there's no featured image, leave enough blank space for the dropping down title. */ .content.no-featured-image { - margin-top: 4rem; + margin-top: 6rem; } From d6e455fb818f602d22a424750b6447f2d81760f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:46:13 -0400 Subject: [PATCH 167/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index 35ab189..ef5ca6e 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -8231,4 +8231,4 @@ label.panel-block { /* If there's no featured image, leave enough blank space for the dropping down title. */ .content.no-featured-image { - margin-top: 4rem; } + margin-top: 6rem; } From 27c0b34a4eef9084449c560bfcfe75b8f6564e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:48:09 -0400 Subject: [PATCH 168/865] Update composer lock file --- composer.lock | 106 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index e61761a..fc240f3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a0caa04b6bd10c91f7153a3c4fb0251f", + "content-hash": "dd82fb1cdc3f56198972f9dc6c88bb45", "packages": [ { "name": "asm89/stack-cors", @@ -2531,6 +2531,33 @@ "issues": "https://www.drupal.org/project/issues/claro" } }, + { + "name": "drupal/classitup", + "version": "dev-8.x-1.x", + "source": { + "type": "git", + "url": "git@git.drupal.org:project/classitup.git", + "reference": "258efec2ad7ee2fea3ded40da5d19e5cbe2c0cc5" + }, + "type": "drupal-module", + "license": [ + "GPL-2.0+" + ], + "description": "Class it up provides classes based on information Drupal knows about.", + "homepage": "https://www.drupal.org/project/classitup", + "keywords": [ + "CSS", + "classes", + "drupal", + "styling", + "theming" + ], + "support": { + "issues": "https://www.drupal.org/project/issues/classitup", + "source": "https://git.drupalcode.org/project/classitup.git" + }, + "time": "2019-09-02T03:44:21+00:00" + }, { "name": "drupal/components", "version": "1.1.0", @@ -6698,6 +6725,65 @@ "source": "https://git.drupalcode.org/project/menu_block" } }, + { + "name": "drupal/menu_link_config", + "version": "1.0.0-alpha1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/menu_link_config.git", + "reference": "8.x-1.0-alpha1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/menu_link_config-8.x-1.0-alpha1.zip", + "reference": "8.x-1.0-alpha1", + "shasum": "700a0dcd4dc96d6600bd49c10df687ed4f49340f" + }, + "require": { + "drupal/core": "~8.0" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.0-alpha1", + "datestamp": "1495623484", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Hydra", + "homepage": "https://www.drupal.org/user/647364" + }, + { + "name": "claudiu_cristea", + "homepage": "https://www.drupal.org/user/2623935" + }, + { + "name": "dawehner", + "homepage": "https://www.drupal.org/user/99340" + }, + { + "name": "tstoeckler", + "homepage": "https://www.drupal.org/user/107158" + } + ], + "description": "muh", + "homepage": "https://www.drupal.org/project/menu_link_config", + "support": { + "source": "https://git.drupalcode.org/project/menu_link_config" + } + }, { "name": "drupal/message", "version": "1.0.0-rc2", @@ -9048,16 +9134,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.2.3", + "version": "v4.2.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "e612609022e935f3d0337c1295176505b41188c8" + "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e612609022e935f3d0337c1295176505b41188c8", - "reference": "e612609022e935f3d0337c1295176505b41188c8", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/97e59c7a16464196a8b9c77c47df68e4a39a45c4", + "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4", "shasum": "" }, "require": { @@ -9095,7 +9181,7 @@ "parser", "php" ], - "time": "2019-08-12T20:17:41+00:00" + "time": "2019-09-01T07:51:21+00:00" }, { "name": "paragonie/random_compat", @@ -11636,6 +11722,12 @@ ], "packages-dev": [], "aliases": [ + { + "alias": "1.x-dev", + "alias_normalized": "1.9999999.9999999.9999999-dev", + "version": "dev-8.x-1.x", + "package": "drupal/classitup" + }, { "alias": "1.x-dev", "alias_normalized": "1.9999999.9999999.9999999-dev", @@ -11646,10 +11738,12 @@ "minimum-stability": "dev", "stability-flags": { "drupal/claro": 15, + "drupal/classitup": 20, "drupal/config_actions": 20, "drupal/convert_bundles": 15, "drupal/cshs": 10, "drupal/drutopia_collection": 20, + "drupal/menu_link_config": 15, "drupal/twigsuggest": 15 }, "prefer-stable": true, From 3e8ad8956bdfd1a9c05b04d1789e3d4e43554d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:52:41 -0400 Subject: [PATCH 169/865] Enable class it up module --- config/sync/core.extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 62de995..fa833e1 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -10,6 +10,7 @@ module: breakpoint: 0 checklistapi: 0 ckeditor: 0 + classitup: 0 color: 0 comment: 0 components: 0 From bad1e363cad2aebd209e64853ae789ee3fc6d265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:52:56 -0400 Subject: [PATCH 170/865] Commit config snapshot --- ...snapshot.snapshot.config_sync.module.classitup.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.classitup.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.classitup.yml b/config/sync/config_snapshot.snapshot.config_sync.module.classitup.yml new file mode 100644 index 0000000..e63e46e --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.classitup.yml @@ -0,0 +1,11 @@ +uuid: 43dd3c99-9e37-4dc8-b9f5-16b8f46efe8f +langcode: en +status: true +dependencies: + module: + - classitup +id: config_sync.module.classitup +snapshotSet: config_sync +extensionType: module +extensionName: classitup +items: { } From c24294a435ed02edcb90529189ca005df44824bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 1 Sep 2019 23:55:47 -0400 Subject: [PATCH 171/865] Add permission to 'view' empty pages --- config/sync/user.role.anonymous.yml | 1 + config/sync/user.role.authenticated.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/sync/user.role.anonymous.yml b/config/sync/user.role.anonymous.yml index 0fd10e2..0e8f6e0 100644 --- a/config/sync/user.role.anonymous.yml +++ b/config/sync/user.role.anonymous.yml @@ -27,5 +27,6 @@ permissions: - 'use text format 1' - 'use text format 3' - 'view disqus comments' + - 'view empty pages' - 'view files' - 'view post access counter' diff --git a/config/sync/user.role.authenticated.yml b/config/sync/user.role.authenticated.yml index 87a9c3f..e2b9f8b 100644 --- a/config/sync/user.role.authenticated.yml +++ b/config/sync/user.role.authenticated.yml @@ -33,6 +33,7 @@ permissions: - 'use text format 1' - 'use text format 3' - 'view disqus comments' + - 'view empty pages' - 'view files' - 'view own unpublished content' - 'view post access counter' From 22a44ae069e47efda69958126a045b8b8e234952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 6 Aug 2019 16:00:13 -0400 Subject: [PATCH 172/865] Update README with CSS compile shortcut --- web/themes/custom/geofresco/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/themes/custom/geofresco/README.md b/web/themes/custom/geofresco/README.md index b23a098..9cafcd4 100644 --- a/web/themes/custom/geofresco/README.md +++ b/web/themes/custom/geofresco/README.md @@ -79,6 +79,10 @@ Provided by default are seven npm scripts that point to Gulp tasks. We run gulp ``` npm run compile ``` + or: + ``` + ./css + ``` 3. Watch files and run tasks when they change. ``` From ee2cc18629f55e231b5342b00b00be94a2f08bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 13:28:39 -0400 Subject: [PATCH 173/865] Update DDEV --- .ddev/.gitignore | 4 ++++ .ddev/config.yaml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.ddev/.gitignore b/.ddev/.gitignore index 9dc56c8..11157ae 100644 --- a/.ddev/.gitignore +++ b/.ddev/.gitignore @@ -1,6 +1,10 @@ #ddev-generated: Automatically generated ddev .gitignore. # You can remove the above line if you want to edit and maintain this file yourself. +/commands/*/*.example +/commands/*/README.txt +/homeadditions/*.example +/homeadditions/README.txt /import.yaml /docker-compose.yaml /db_snapshots diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 2f334a9..4b0ba34 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v1.10.1 +APIVersion: v1.10.2 name: geo type: drupal8 docroot: web @@ -16,8 +16,8 @@ use_dns_when_possible: true timezone: "" -# This config.yaml was created with ddev version v1.10.1 -# webimage: drud/ddev-webserver:v1.10.0 +# This config.yaml was created with ddev version v1.10.2 +# webimage: drud/ddev-webserver:v1.10.2 # dbimage: drud/ddev-dbserver:v1.10.0-10.2 # dbaimage: drud/phpmyadmin:v1.10.0 # bgsyncimage: drud/ddev-bgsync:v1.10.0 From 14df6aa0dbc5fc66f5c08884fb631c3382ad7348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 13:29:29 -0400 Subject: [PATCH 174/865] Update composer lock file with dependency updates, inc Drupal core --- composer.lock | 147 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 72 deletions(-) diff --git a/composer.lock b/composer.lock index fc240f3..f643af1 100644 --- a/composer.lock +++ b/composer.lock @@ -1049,16 +1049,16 @@ }, { "name": "consolidation/site-process", - "version": "2.0.4", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "e159f849abce696c2f5081c149a1f8ec8717dd97" + "reference": "f3211fa4c60671c6f068184221f06f932556e443" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/e159f849abce696c2f5081c149a1f8ec8717dd97", - "reference": "e159f849abce696c2f5081c149a1f8ec8717dd97", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/f3211fa4c60671c6f068184221f06f932556e443", + "reference": "f3211fa4c60671c6f068184221f06f932556e443", "shasum": "" }, "require": { @@ -1117,7 +1117,7 @@ } ], "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", - "time": "2019-08-12T23:10:26+00:00" + "time": "2019-09-10T17:56:24+00:00" }, { "name": "container-interop/container-interop", @@ -1501,16 +1501,16 @@ }, { "name": "doctrine/common", - "version": "v2.10.0", + "version": "v2.11.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "30e33f60f64deec87df728c02b107f82cdafad9d" + "reference": "b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/30e33f60f64deec87df728c02b107f82cdafad9d", - "reference": "30e33f60f64deec87df728c02b107f82cdafad9d", + "url": "https://api.github.com/repos/doctrine/common/zipball/b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff", + "reference": "b8ca1dcf6b0dc8a2af7a09baac8d0c48345df4ff", "shasum": "" }, "require": { @@ -1526,14 +1526,16 @@ }, "require-dev": { "doctrine/coding-standard": "^1.0", - "phpunit/phpunit": "^6.3", + "phpstan/phpstan": "^0.11", + "phpstan/phpstan-phpunit": "^0.11", + "phpunit/phpunit": "^7.0", "squizlabs/php_codesniffer": "^3.0", "symfony/phpunit-bridge": "^4.0.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.10.x-dev" + "dev-master": "2.11.x-dev" } }, "autoload": { @@ -1546,6 +1548,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -1554,10 +1560,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -1578,7 +1580,7 @@ "doctrine", "php" ], - "time": "2018-11-21T01:24:55+00:00" + "time": "2019-09-10T10:10:14+00:00" }, { "name": "doctrine/event-manager", @@ -2468,17 +2470,17 @@ }, { "name": "drupal/claro", - "version": "1.0.0-alpha4", + "version": "1.0.0-alpha5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/claro.git", - "reference": "8.x-1.0-alpha4" + "reference": "8.x-1.0-alpha5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/claro-8.x-1.0-alpha4.zip", - "reference": "8.x-1.0-alpha4", - "shasum": "151906eaef0fa2ade0cbffb2248565066544055a" + "url": "https://ftp.drupal.org/files/projects/claro-8.x-1.0-alpha5.zip", + "reference": "8.x-1.0-alpha5", + "shasum": "32ac74df71df9d095d3d911a19a45788ccf701ba" }, "require": { "drupal/core": "~8.0" @@ -2489,8 +2491,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0-alpha4", - "datestamp": "1564677185", + "version": "8.x-1.0-alpha5", + "datestamp": "1567786984", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3338,16 +3340,16 @@ }, { "name": "drupal/core", - "version": "8.7.6", + "version": "8.7.7", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "39164616332832e1456199d32fc3ed11562f4721" + "reference": "32e1d7a67bbc28f07dc43d9ff692c0e90a4aeb92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/39164616332832e1456199d32fc3ed11562f4721", - "reference": "39164616332832e1456199d32fc3ed11562f4721", + "url": "https://api.github.com/repos/drupal/core/zipball/32e1d7a67bbc28f07dc43d9ff692c0e90a4aeb92", + "reference": "32e1d7a67bbc28f07dc43d9ff692c0e90a4aeb92", "shasum": "" }, "require": { @@ -3397,7 +3399,8 @@ "zendframework/zend-feed": "^2.4" }, "conflict": { - "drush/drush": "<8.1.10" + "drush/drush": "<8.1.10", + "symfony/dom-crawler": ">=4" }, "replace": { "drupal/action": "self.version", @@ -3581,7 +3584,7 @@ "GPL-2.0-or-later" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2019-08-07T19:19:20+00:00" + "time": "2019-09-04T10:26:35+00:00" }, { "name": "drupal/crop", @@ -4848,22 +4851,22 @@ }, { "name": "drupal/drutopia_related_content", - "version": "1.0.0-beta2", + "version": "1.0.0-beta3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/drutopia_related_content.git", - "reference": "8.x-1.0-beta2" + "reference": "8.x-1.0-beta3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/drutopia_related_content-8.x-1.0-beta2.zip", - "reference": "8.x-1.0-beta2", - "shasum": "1c0b1870b44a026548399ca4e529acac7c995973" + "url": "https://ftp.drupal.org/files/projects/drutopia_related_content-8.x-1.0-beta3.zip", + "reference": "8.x-1.0-beta3", + "shasum": "4c73a9c3784dc06e66fc3666824d88bb4fbad981" }, "require": { "drupal/block_visibility_groups": "^1.3", "drupal/core": "*", - "drupal/drutopia_core": "^1.0-alpha5", + "drupal/drutopia_core": "^1.0-beta3", "drupal/similarterms": "^1.3" }, "type": "drupal-module", @@ -4872,17 +4875,12 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0-beta2", - "datestamp": "1559239088", + "version": "8.x-1.0-beta3", + "datestamp": "1569167886", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" } - }, - "patches": { - "drupal/similarterms": { - "PHP fatal error, SimilarTermsArgument::query() must be compatible with NumericArgument": "https://www.drupal.org/files/issues/query_4.patch" - } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -4915,7 +4913,7 @@ "homepage": "https://www.drupal.org/user/837536" } ], - "description": "Provides related content on node pages generated via similar terms.", + "description": "Shows content (articles, actions, etc.) related to the current page's content based on the taxonomy terms held in common.", "homepage": "https://gitlab.com/drutopia/drutopia_related_content", "keywords": [ "content", @@ -5780,7 +5778,7 @@ }, "drupal": { "version": "8.x-1.8", - "datestamp": "1563997434", + "datestamp": "1563997086", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6276,17 +6274,17 @@ }, { "name": "drupal/focal_point", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/focal_point.git", - "reference": "8.x-1.0" + "reference": "8.x-1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/focal_point-8.x-1.0.zip", - "reference": "8.x-1.0", - "shasum": "dec88d870aaa21e99984d6328ccf95b8120ee472" + "url": "https://ftp.drupal.org/files/projects/focal_point-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "5c48b6ebc0aeebec89af8b41a9ab2ef02a2950ed" }, "require": { "drupal/core": "*", @@ -6301,8 +6299,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0", - "datestamp": "1553270584", + "version": "8.x-1.1", + "datestamp": "1568206088", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6619,6 +6617,10 @@ "name": "amyvs", "homepage": "https://www.drupal.org/user/3181721" }, + { + "name": "aprice42", + "homepage": "https://www.drupal.org/user/369147" + }, { "name": "gcb", "homepage": "https://www.drupal.org/user/1682976" @@ -7644,17 +7646,17 @@ }, { "name": "drupal/similarterms", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/similarterms.git", - "reference": "8.x-1.3" + "reference": "8.x-1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/similarterms-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "46f2c36340e3bb2c40a250ff3a3de29947cdd609" + "url": "https://ftp.drupal.org/files/projects/similarterms-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "d821f881203a634d44a174ff7a793e408ea7890f" }, "require": { "drupal/core": "*" @@ -7665,15 +7667,12 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.3", - "datestamp": "1469824139", + "version": "8.x-1.4", + "datestamp": "1568313784", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "patches_applied": { - "PHP fatal error, SimilarTermsArgument::query() must be compatible with NumericArgument": "https://www.drupal.org/files/issues/query_4.patch" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -7681,6 +7680,10 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "ericpugh", + "homepage": "https://www.drupal.org/user/130084" + }, { "name": "rmiddle", "homepage": "https://www.drupal.org/user/192183" @@ -11299,19 +11302,19 @@ "authors": [ { "name": "Fabien Potencier", - "role": "Lead Developer", "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org" + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Twig Team", - "role": "Contributors", - "homepage": "https://twig.symfony.com/contributors" + "homepage": "https://twig.symfony.com/contributors", + "role": "Contributors" }, { "name": "Armin Ronacher", - "role": "Project Founder", - "email": "armin.ronacher@active-4.com" + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", @@ -11567,16 +11570,16 @@ }, { "name": "zendframework/zend-escaper", - "version": "2.6.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-escaper.git", - "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074" + "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074", - "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/3801caa21b0ca6aca57fa1c42b08d35c395ebd5f", + "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f", "shasum": "" }, "require": { @@ -11608,7 +11611,7 @@ "escaper", "zf" ], - "time": "2018-04-25T15:48:53+00:00" + "time": "2019-09-05T20:03:20+00:00" }, { "name": "zendframework/zend-feed", From 7d57b5686bd2a6f98e7d83a035dcb2079c92e4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 13:31:54 -0400 Subject: [PATCH 175/865] Apply safe meaningless config updates --- config/sync/block.block.articletopics.yml | 2 +- config/sync/block.block.articletype.yml | 2 +- config/sync/block.block.geofresco_content.yml | 2 +- config/sync/block.block.geofresco_local_actions.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/sync/block.block.articletopics.yml b/config/sync/block.block.articletopics.yml index b9f3d42..3070950 100644 --- a/config/sync/block.block.articletopics.yml +++ b/config/sync/block.block.articletopics.yml @@ -12,7 +12,7 @@ dependencies: id: articletopics theme: geofresco region: sidebar_first -weight: -9 +weight: -8 provider: null plugin: 'facet_block:article_topics' settings: diff --git a/config/sync/block.block.articletype.yml b/config/sync/block.block.articletype.yml index d49b797..dfbc90c 100644 --- a/config/sync/block.block.articletype.yml +++ b/config/sync/block.block.articletype.yml @@ -12,7 +12,7 @@ dependencies: id: articletype theme: geofresco region: sidebar_first -weight: -8 +weight: -7 provider: null plugin: 'facet_block:article_type' settings: diff --git a/config/sync/block.block.geofresco_content.yml b/config/sync/block.block.geofresco_content.yml index 3a01cd1..5e63114 100644 --- a/config/sync/block.block.geofresco_content.yml +++ b/config/sync/block.block.geofresco_content.yml @@ -11,7 +11,7 @@ _core: id: geofresco_content theme: geofresco region: content -weight: -8 +weight: 0 provider: null plugin: system_main_block settings: diff --git a/config/sync/block.block.geofresco_local_actions.yml b/config/sync/block.block.geofresco_local_actions.yml index cdfd955..e6b6a34 100644 --- a/config/sync/block.block.geofresco_local_actions.yml +++ b/config/sync/block.block.geofresco_local_actions.yml @@ -9,7 +9,7 @@ _core: id: geofresco_local_actions theme: geofresco region: content -weight: -9 +weight: -20 provider: null plugin: local_actions_block settings: From 0f53bc6b401683aa6fbe69aa98883a4e693786a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 15:11:52 -0400 Subject: [PATCH 176/865] Revert "Apply safe meaningless config updates" This reverts commit 7d57b5686bd2a6f98e7d83a035dcb2079c92e4a9. We don't even want this from my out-of-date local. --- config/sync/block.block.articletopics.yml | 2 +- config/sync/block.block.articletype.yml | 2 +- config/sync/block.block.geofresco_content.yml | 2 +- config/sync/block.block.geofresco_local_actions.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/sync/block.block.articletopics.yml b/config/sync/block.block.articletopics.yml index 3070950..b9f3d42 100644 --- a/config/sync/block.block.articletopics.yml +++ b/config/sync/block.block.articletopics.yml @@ -12,7 +12,7 @@ dependencies: id: articletopics theme: geofresco region: sidebar_first -weight: -8 +weight: -9 provider: null plugin: 'facet_block:article_topics' settings: diff --git a/config/sync/block.block.articletype.yml b/config/sync/block.block.articletype.yml index dfbc90c..d49b797 100644 --- a/config/sync/block.block.articletype.yml +++ b/config/sync/block.block.articletype.yml @@ -12,7 +12,7 @@ dependencies: id: articletype theme: geofresco region: sidebar_first -weight: -7 +weight: -8 provider: null plugin: 'facet_block:article_type' settings: diff --git a/config/sync/block.block.geofresco_content.yml b/config/sync/block.block.geofresco_content.yml index 5e63114..3a01cd1 100644 --- a/config/sync/block.block.geofresco_content.yml +++ b/config/sync/block.block.geofresco_content.yml @@ -11,7 +11,7 @@ _core: id: geofresco_content theme: geofresco region: content -weight: 0 +weight: -8 provider: null plugin: system_main_block settings: diff --git a/config/sync/block.block.geofresco_local_actions.yml b/config/sync/block.block.geofresco_local_actions.yml index e6b6a34..cdfd955 100644 --- a/config/sync/block.block.geofresco_local_actions.yml +++ b/config/sync/block.block.geofresco_local_actions.yml @@ -9,7 +9,7 @@ _core: id: geofresco_local_actions theme: geofresco region: content -weight: -20 +weight: -9 provider: null plugin: local_actions_block settings: From d4de6c0a3757d27122b5b523d087669bc6d96edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 18:09:27 -0400 Subject: [PATCH 177/865] Update composer lock file with Drutopia collection update --- composer.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index f643af1..d35c87d 100644 --- a/composer.lock +++ b/composer.lock @@ -4221,11 +4221,13 @@ "source": { "type": "git", "url": "git@gitlab.com:drutopia/drutopia_collection.git", - "reference": "ec9e99b42debe91d0b80dfd7d06c53f7831c1c35" + "reference": "33d2dcf652f76dda7e723815d37f67de76d14494" }, "require": { "drupal/config_actions": "^1.0", "drupal/ctools": "^3.0", + "drupal/drutopia_article": "^1.0-beta3", + "drupal/drutopia_blog": "^1.0-beta3", "drupal/drutopia_people": "^1.0-beta3", "drupal/drutopia_seo": "^1.0-beta2", "drupal/ds": "^3.1", @@ -4237,7 +4239,7 @@ ], "description": "Drutopia Collection is a feature providing the ability to create collections to bring together ordered listings of Articles, Blog posts, or other content. This is useful for magazine issues or online books (referencing each chapter) or to create a meta-resource of recommended resources and people. an article content type and related configuration.", "homepage": "https://gitlab.com/drutopia/drutopia_collection", - "time": "2019-07-29T16:18:26+00:00" + "time": "2019-09-22T21:48:12+00:00" }, { "name": "drupal/drutopia_comment", From 45ab938c9bd741749a2c75aa12d6ceb9f85f3a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 18:26:57 -0400 Subject: [PATCH 178/865] Limit to one image on blog card display --- .../sync/core.entity_view_display.node.blog.card.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/config/sync/core.entity_view_display.node.blog.card.yml b/config/sync/core.entity_view_display.node.blog.card.yml index de09aaf..1ad9f9d 100644 --- a/config/sync/core.entity_view_display.node.blog.card.yml +++ b/config/sync/core.entity_view_display.node.blog.card.yml @@ -8,11 +8,18 @@ dependencies: - field.field.node.blog.comment - field.field.node.blog.field_authors - field.field.node.blog.field_body_paragraph + - field.field.node.blog.field_economic_sectors - field.field.node.blog.field_image + - field.field.node.blog.field_institutions_structures - field.field.node.blog.field_meta_tags + - field.field.node.blog.field_movements_struggles + - field.field.node.blog.field_practices_tools_strategies + - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics + - field.field.node.blog.field_upload + - field.field.node.blog.field_visions_models - node.type.blog - responsive_image.styles.narrow module: @@ -99,7 +106,9 @@ content: settings: responsive_image_style: narrow image_link: content - third_party_settings: { } + third_party_settings: + ds: + ds_limit: '1' field_summary: type: text_default weight: 5 From 7576c2457abdcd0f3fe63ef26c30afeee104e68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 19:23:35 -0400 Subject: [PATCH 179/865] Add a background to take the place of an image if none --- .../custom/geofresco/src/global/_layout.scss | 5 ++ .../layout/ds-2col-stacked.html.twig | 75 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 web/themes/custom/geofresco/src/templates/layout/ds-2col-stacked.html.twig diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index b0f2418..5331cdd 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -37,3 +37,8 @@ .content.no-featured-image { margin-top: 6rem; } + +.background-replacement-for-no-image { + height: 12rem; + background-color: cadetblue; +} diff --git a/web/themes/custom/geofresco/src/templates/layout/ds-2col-stacked.html.twig b/web/themes/custom/geofresco/src/templates/layout/ds-2col-stacked.html.twig new file mode 100644 index 0000000..0cb5b92 --- /dev/null +++ b/web/themes/custom/geofresco/src/templates/layout/ds-2col-stacked.html.twig @@ -0,0 +1,75 @@ +{# +/** + * @file + * Display Suite 2 column stacked template. + * + * Available variables: + * - outer_wrapper: outer wrapper element + * - header_wrapper: wrapper element around header region + * - left_wrapper: wrapper element around left region + * - right_wrapper: wrapper element around right region + * - footer_wrapper: wrapper element around footer region + * - attributes: layout attributes + * - header_attributes: attributes for header region + * - left_attributes: attributes for left region + * - right_attributes: attributes for right region + * - footer_attributes: attributes for footer region + * - header: content of header region + * - left: content of left region + * - right: content of right region + * - footer: content of footer region + */ +#} +{% set attributes = attributes.addClass('columns is-multiline') %} +{% + set header_classes = [ + 'column', + 'is-12' + ] +%} +{% set header_attributes = header_attributes.addClass(header_classes) %} +{% + set left_classes = [ + 'column', + 'is-3' + ] +%} +{% set left_attributes = left_attributes.addClass(left_classes) %} +{% + set right_classes = [ + 'column', + 'is-9' + ] +%} +{% set right_attributes = right_attributes.addClass(right_classes) %} +{% + set footer_classes = [ + 'column', + 'is-12' + ] +%} +{% set footer_attributes = footer_attributes.addClass(footer_classes) %} +<{{ outer_wrapper }}{{ attributes.addClass('ds-2col-stacked', 'clearfix') }}> + + {{ title_suffix.contextual_links }} + + <{{ header_wrapper }}{{ header_attributes.addClass('group-header') }}> + {% if header.field_image|render is empty %} +
+ {% endif %} + {{ header }} + + + <{{ left_wrapper }}{{ left_attributes.addClass('group-left') }}> + {{ left }} + + + <{{ right_wrapper }}{{ right_attributes.addClass('group-right') }}> + {{ right }} + + + <{{ footer_wrapper }}{{ footer_attributes.addClass('group-footer') }}> + {{ footer }} + + + From 15527edf56218eea006adb456ab5581e479c8b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 19:23:52 -0400 Subject: [PATCH 180/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index ef5ca6e..98054f0 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -8232,3 +8232,7 @@ label.panel-block { /* If there's no featured image, leave enough blank space for the dropping down title. */ .content.no-featured-image { margin-top: 6rem; } + +.background-replacement-for-no-image { + height: 12rem; + background-color: cadetblue; } From 80f8d4366a3b58387dc2c805858fa0694a45dfd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 19:29:21 -0400 Subject: [PATCH 181/865] Add enough markup to fake being the full-width image --- .../geofresco/src/templates/layout/ds-2col-stacked.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/templates/layout/ds-2col-stacked.html.twig b/web/themes/custom/geofresco/src/templates/layout/ds-2col-stacked.html.twig index 0cb5b92..5e75a4a 100644 --- a/web/themes/custom/geofresco/src/templates/layout/ds-2col-stacked.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/ds-2col-stacked.html.twig @@ -55,7 +55,9 @@ <{{ header_wrapper }}{{ header_attributes.addClass('group-header') }}> {% if header.field_image|render is empty %} -
+
+
+
{% endif %} {{ header }} From 2760a8b937619f87b548524ecf63c8c18d9d1663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 19:37:14 -0400 Subject: [PATCH 182/865] Ditch our empty folders --- web/themes/custom/geofresco/geofresco.info.yml | 2 -- web/themes/custom/geofresco/src/components/.gitkeep | 0 web/themes/custom/geofresco/src/layout/.gitkeep | 0 3 files changed, 2 deletions(-) delete mode 100644 web/themes/custom/geofresco/src/components/.gitkeep delete mode 100644 web/themes/custom/geofresco/src/layout/.gitkeep diff --git a/web/themes/custom/geofresco/geofresco.info.yml b/web/themes/custom/geofresco/geofresco.info.yml index e633873..772dd34 100644 --- a/web/themes/custom/geofresco/geofresco.info.yml +++ b/web/themes/custom/geofresco/geofresco.info.yml @@ -42,8 +42,6 @@ libraries: component-libraries: geofresco: paths: - - src/components - - src/layout - src/templates libraries-override: diff --git a/web/themes/custom/geofresco/src/components/.gitkeep b/web/themes/custom/geofresco/src/components/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/web/themes/custom/geofresco/src/layout/.gitkeep b/web/themes/custom/geofresco/src/layout/.gitkeep deleted file mode 100644 index e69de29..0000000 From 378f833a17bc14ec8d9ddc72c907202a841a675f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 19:38:14 -0400 Subject: [PATCH 183/865] Set title lineheight so white semi-opaque backing neveroverlaps and intensifies --- web/themes/custom/geofresco/src/global/_layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index 5331cdd..5f0e532 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -31,6 +31,7 @@ position: relative; overflow: visible; z-index: 10; + line-height: 1.8; } /* If there's no featured image, leave enough blank space for the dropping down title. */ From fae37363b4179c2e944aa1295ef9aa449382e7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 19:39:56 -0400 Subject: [PATCH 184/865] Set title size smaller for mobile, tablet --- .../geofresco/src/templates/elements/page-title.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/templates/elements/page-title.html.twig b/web/themes/custom/geofresco/src/templates/elements/page-title.html.twig index 4424fd9..54b27c5 100644 --- a/web/themes/custom/geofresco/src/templates/elements/page-title.html.twig +++ b/web/themes/custom/geofresco/src/templates/elements/page-title.html.twig @@ -4,4 +4,4 @@ * Make page titles larger by adding a class (where size 1 is the largest). */ #} -{% set title_attributes = title_attributes.addClass("is-size-2") %} +{% set title_attributes = title_attributes.addClass("is-size-4 is-size-3-tablet is-size-2-desktop") %} From 6d4bb660f1dfacf9d209ec0e6f1707681743a1e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 19:40:12 -0400 Subject: [PATCH 185/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index 98054f0..86034b2 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -8227,7 +8227,8 @@ label.panel-block { height: 0; position: relative; overflow: visible; - z-index: 10; } + z-index: 10; + line-height: 1.8; } /* If there's no featured image, leave enough blank space for the dropping down title. */ .content.no-featured-image { From 18d19c86b40688316f88e1ac52ae624776172447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 19:45:05 -0400 Subject: [PATCH 186/865] Set linehight where it doesn't get superseded --- web/themes/custom/geofresco/src/global/_components.scss | 1 + web/themes/custom/geofresco/src/global/_layout.scss | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index d3e61f5..812a672 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -76,4 +76,5 @@ background-color: rgba($offwhite, 0.66); padding: 0.4em 0.3em 0.3em 0.3em; border-radius: 0.4em; + line-height: 1.8; } diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index 5f0e532..5331cdd 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -31,7 +31,6 @@ position: relative; overflow: visible; z-index: 10; - line-height: 1.8; } /* If there's no featured image, leave enough blank space for the dropping down title. */ From 545d2752bdc33d6f1a68574d3b0a6554b0899c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:06:51 -0400 Subject: [PATCH 187/865] Replace publication datetime with post date --- ....entity_view_display.node.article.full.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/config/sync/core.entity_view_display.node.article.full.yml b/config/sync/core.entity_view_display.node.article.full.yml index cf54162..68f0e41 100644 --- a/config/sync/core.entity_view_display.node.article.full.yml +++ b/config/sync/core.entity_view_display.node.article.full.yml @@ -28,7 +28,6 @@ dependencies: - responsive_image.styles.wide module: - comment - - datetime - ds - entity_reference_revisions - responsive_image @@ -58,7 +57,7 @@ third_party_settings: - field_image - field_subtitle left: - - field_publication_date + - node_post_date - field_authors right: - field_body_paragraph @@ -74,6 +73,12 @@ third_party_settings: - field_economic_sectors - field_regions - field_visions_models + fields: + node_post_date: + plugin_id: node_post_date + weight: 2 + label: hidden + formatter: ds_post_date_month_day_year _core: default_config_hash: 88P_fOnhb5d6oRPKtL8-5NspKV-UrjBqgmc1Ixtg9is id: node.article.full @@ -160,15 +165,6 @@ content: label: above settings: { } third_party_settings: { } - field_publication_date: - type: datetime_default - weight: 2 - region: left - label: visually_hidden - settings: - timezone_override: '' - format_type: medium - third_party_settings: { } field_regions: type: entity_reference_label weight: 14 @@ -217,6 +213,7 @@ content: hidden: body: true field_meta_tags: true + field_publication_date: true field_summary: true field_upload: true search_api_excerpt: true From 87216bfea54fab2e671bc91bbad394546ddcea1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:08:08 -0400 Subject: [PATCH 188/865] Switch blogs over to same 2 col display as most everything --- ...ore.entity_view_display.node.blog.full.yml | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/config/sync/core.entity_view_display.node.blog.full.yml b/config/sync/core.entity_view_display.node.blog.full.yml index dfe16da..c226307 100644 --- a/config/sync/core.entity_view_display.node.blog.full.yml +++ b/config/sync/core.entity_view_display.node.blog.full.yml @@ -9,11 +9,18 @@ dependencies: - field.field.node.blog.comment - field.field.node.blog.field_authors - field.field.node.blog.field_body_paragraph + - field.field.node.blog.field_economic_sectors - field.field.node.blog.field_image + - field.field.node.blog.field_institutions_structures - field.field.node.blog.field_meta_tags + - field.field.node.blog.field_movements_struggles + - field.field.node.blog.field_practices_tools_strategies + - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics + - field.field.node.blog.field_upload + - field.field.node.blog.field_visions_models - node.type.blog - responsive_image.styles.wide module: @@ -25,15 +32,14 @@ dependencies: third_party_settings: ds: layout: - id: ds_3col_stacked - library: ds/ds_3col_stacked + id: ds_2col_stacked + library: ds/ds_2col_stacked disable_css: true entity_classes: all_classes settings: wrappers: header: div left: div - middle: div right: div footer: div outer_wrapper: div @@ -46,25 +52,25 @@ third_party_settings: header: - field_image left: - - field_authors - middle: - node_post_date + - field_authors + right: - field_body_paragraph - field_topics - field_tags - node_links - comment fields: - node_post_date: - plugin_id: node_post_date - weight: 2 - label: hidden - formatter: ds_post_date_month_day_year node_links: plugin_id: node_links weight: 6 label: hidden formatter: default + node_post_date: + plugin_id: node_post_date + weight: 1 + label: hidden + formatter: ds_post_date_month_day_year _core: default_config_hash: eLe_jwnmC3YVxzxyG5O3Vc3cB-yoH17iuPzsEFt3TDM id: node.blog.full @@ -80,10 +86,10 @@ content: view_mode: default third_party_settings: { } type: comment_default - region: middle + region: right field_authors: type: entity_reference_label - weight: 1 + weight: 2 region: left label: visually_hidden settings: @@ -99,7 +105,7 @@ content: link: '' third_party_settings: { } type: entity_reference_revisions_entity_view - region: middle + region: right field_image: weight: 0 label: visually_hidden @@ -118,11 +124,11 @@ content: link: true third_party_settings: { } type: entity_reference_label - region: middle + region: right field_topics: type: entity_reference_label weight: 4 - region: middle + region: right label: visually_hidden settings: link: true From 39e1eeafa6d54f3e295318cf729584192ee3fbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:08:55 -0400 Subject: [PATCH 189/865] Configure person full page, again same 2 col stacked layout --- ...e.entity_view_display.node.people.full.yml | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/config/sync/core.entity_view_display.node.people.full.yml b/config/sync/core.entity_view_display.node.people.full.yml index 464a063..8f9d350 100644 --- a/config/sync/core.entity_view_display.node.people.full.yml +++ b/config/sync/core.entity_view_display.node.people.full.yml @@ -12,7 +12,7 @@ dependencies: - field.field.node.people.field_people_type - field.field.node.people.field_summary - node.type.people - - responsive_image.styles.tall + - responsive_image.styles.wide module: - ds - entity_reference_revisions @@ -21,14 +21,16 @@ dependencies: third_party_settings: ds: layout: - id: ds_2col - library: ds/ds_2col + id: ds_2col_stacked + library: ds/ds_2col_stacked disable_css: true entity_classes: all_classes settings: wrappers: + header: div left: div right: div + footer: div outer_wrapper: div attributes: '' link_attribute: '' @@ -36,12 +38,13 @@ third_party_settings: classes: layout_class: { } regions: - left: + header: - field_image - right: - - field_people_position - - field_body_paragraph + left: - field_people_type + - field_people_position + right: + - field_body_paragraph - links _core: default_config_hash: WOI8fKpLJDTEg6bXIJednEL7pAp6iAkutldE6veX2eE @@ -51,7 +54,7 @@ bundle: people mode: full content: field_body_paragraph: - weight: 2 + weight: 3 label: hidden settings: view_mode: default @@ -63,27 +66,29 @@ content: weight: 0 label: hidden settings: - responsive_image_style: tall + responsive_image_style: wide image_link: '' - third_party_settings: { } + third_party_settings: + ds: + ds_limit: '1' type: responsive_image - region: left + region: header field_people_position: type: string - weight: 1 + weight: 2 label: hidden settings: link_to_entity: false third_party_settings: { } - region: right + region: left field_people_type: - weight: 3 + weight: 1 label: hidden settings: link: true third_party_settings: { } type: entity_reference_label - region: right + region: left links: weight: 4 region: right From 09689dbab7ef9f67637b0b6dfd4568fd0dac1533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:09:32 -0400 Subject: [PATCH 190/865] Configure gleaning cards to be somewhat reasonable --- ...entity_view_display.node.gleaning.card.yml | 39 ++++++++++++++ ...ity_view_display.node.gleaning.default.yml | 2 +- ...entity_view_display.node.gleaning.full.yml | 51 +++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 config/sync/core.entity_view_display.node.gleaning.card.yml create mode 100644 config/sync/core.entity_view_display.node.gleaning.full.yml diff --git a/config/sync/core.entity_view_display.node.gleaning.card.yml b/config/sync/core.entity_view_display.node.gleaning.card.yml new file mode 100644 index 0000000..672629d --- /dev/null +++ b/config/sync/core.entity_view_display.node.gleaning.card.yml @@ -0,0 +1,39 @@ +uuid: 711db482-2ff5-48a0-8073-59d9a3e8133e +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.card + - field.field.node.gleaning.body + - field.field.node.gleaning.field_image + - field.field.node.gleaning.field_upload + - node.type.gleaning + module: + - ds + - image + - user +id: node.gleaning.card +targetEntityType: node +bundle: gleaning +mode: card +content: + field_image: + type: image + weight: 0 + region: content + label: hidden + settings: + image_style: '' + image_link: content + third_party_settings: + ds: + ds_limit: '1' + links: + weight: 1 + region: content + settings: { } + third_party_settings: { } +hidden: + body: true + field_upload: true + search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.gleaning.default.yml b/config/sync/core.entity_view_display.node.gleaning.default.yml index 7a5b3b7..b8d4485 100644 --- a/config/sync/core.entity_view_display.node.gleaning.default.yml +++ b/config/sync/core.entity_view_display.node.gleaning.default.yml @@ -43,8 +43,8 @@ content: region: content links: weight: 100 + region: content settings: { } third_party_settings: { } - region: content hidden: search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.gleaning.full.yml b/config/sync/core.entity_view_display.node.gleaning.full.yml new file mode 100644 index 0000000..924e4d8 --- /dev/null +++ b/config/sync/core.entity_view_display.node.gleaning.full.yml @@ -0,0 +1,51 @@ +uuid: 302a64ad-f345-49d1-a38d-630c3302a492 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.full + - field.field.node.gleaning.body + - field.field.node.gleaning.field_image + - field.field.node.gleaning.field_upload + - node.type.gleaning + module: + - file + - image + - text + - user +id: node.gleaning.full +targetEntityType: node +bundle: gleaning +mode: full +content: + body: + label: hidden + type: text_default + weight: 101 + settings: { } + third_party_settings: { } + region: content + field_image: + weight: 102 + label: above + settings: + image_style: '' + image_link: '' + third_party_settings: { } + type: image + region: content + field_upload: + weight: 103 + label: above + settings: + use_description_as_link_text: true + third_party_settings: { } + type: file_default + region: content + links: + weight: 100 + region: content + settings: { } + third_party_settings: { } +hidden: + search_api_excerpt: true From d788cf6ae4953967047a44e23def8b4cdb27974f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:09:46 -0400 Subject: [PATCH 191/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index 86034b2..4eb8ef4 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -6058,7 +6058,8 @@ label.panel-block { .page-title .title > span { background-color: rgba(248, 248, 248, 0.66); padding: 0.4em 0.3em 0.3em 0.3em; - border-radius: 0.4em; } + border-radius: 0.4em; + line-height: 1.8; } .column { display: block; @@ -8227,8 +8228,7 @@ label.panel-block { height: 0; position: relative; overflow: visible; - z-index: 10; - line-height: 1.8; } + z-index: 10; } /* If there's no featured image, leave enough blank space for the dropping down title. */ .content.no-featured-image { From 7edb3c53a6e611780e30ead28a864d55eb824979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:24:37 -0400 Subject: [PATCH 192/865] Place 'content by author' in only place that it seems to work Ref agaric/sites/geo#40 --- config/sync/block.block.geofresco_content.yml | 2 +- .../block.block.geofresco_local_actions.yml | 2 +- ..._block__content_by_author_block_author.yml | 39 +++++++++++++++++++ ..._block__home_page_views_block_articles.yml | 2 +- ...ews_block__home_page_views_block_blogs.yml | 2 +- ...ock__home_page_views_block_collections.yml | 2 +- ...block__home_page_views_block_gleanings.yml | 2 +- 7 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 config/sync/block.block.views_block__content_by_author_block_author.yml diff --git a/config/sync/block.block.geofresco_content.yml b/config/sync/block.block.geofresco_content.yml index 3a01cd1..32318b4 100644 --- a/config/sync/block.block.geofresco_content.yml +++ b/config/sync/block.block.geofresco_content.yml @@ -11,7 +11,7 @@ _core: id: geofresco_content theme: geofresco region: content -weight: -8 +weight: -9 provider: null plugin: system_main_block settings: diff --git a/config/sync/block.block.geofresco_local_actions.yml b/config/sync/block.block.geofresco_local_actions.yml index cdfd955..387a4f3 100644 --- a/config/sync/block.block.geofresco_local_actions.yml +++ b/config/sync/block.block.geofresco_local_actions.yml @@ -9,7 +9,7 @@ _core: id: geofresco_local_actions theme: geofresco region: content -weight: -9 +weight: -10 provider: null plugin: local_actions_block settings: diff --git a/config/sync/block.block.views_block__content_by_author_block_author.yml b/config/sync/block.block.views_block__content_by_author_block_author.yml new file mode 100644 index 0000000..be459dc --- /dev/null +++ b/config/sync/block.block.views_block__content_by_author_block_author.yml @@ -0,0 +1,39 @@ +uuid: 451af5c3-b1a7-43a9-80ce-64629a3f38db +langcode: en +status: true +dependencies: + config: + - views.view.content_by_author + module: + - block_visibility_groups + - ctools + - views + theme: + - geofresco +id: views_block__content_by_author_block_author +theme: geofresco +region: content +weight: -4 +provider: null +plugin: 'views_block:content_by_author-block_author' +settings: + id: 'views_block:content_by_author-block_author' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: '40' + context_mapping: { } +visibility: + condition_group: + id: condition_group + negate: false + block_visibility_group: '' + context_mapping: { } + 'entity_bundle:node': + id: 'entity_bundle:node' + bundles: + people: people + negate: false + context_mapping: + node: '@node.node_route_context:node' diff --git a/config/sync/block.block.views_block__home_page_views_block_articles.yml b/config/sync/block.block.views_block__home_page_views_block_articles.yml index a3328ca..910e0fe 100644 --- a/config/sync/block.block.views_block__home_page_views_block_articles.yml +++ b/config/sync/block.block.views_block__home_page_views_block_articles.yml @@ -13,7 +13,7 @@ dependencies: id: views_block__home_page_views_block_articles theme: geofresco region: content -weight: -7 +weight: -8 provider: null plugin: 'views_block:home_page_views-block_articles' settings: diff --git a/config/sync/block.block.views_block__home_page_views_block_blogs.yml b/config/sync/block.block.views_block__home_page_views_block_blogs.yml index 704d7c4..44de9c7 100644 --- a/config/sync/block.block.views_block__home_page_views_block_blogs.yml +++ b/config/sync/block.block.views_block__home_page_views_block_blogs.yml @@ -13,7 +13,7 @@ dependencies: id: views_block__home_page_views_block_blogs theme: geofresco region: content -weight: -6 +weight: -7 provider: null plugin: 'views_block:home_page_views-block_blogs' settings: diff --git a/config/sync/block.block.views_block__home_page_views_block_collections.yml b/config/sync/block.block.views_block__home_page_views_block_collections.yml index 537f485..e56d5a2 100644 --- a/config/sync/block.block.views_block__home_page_views_block_collections.yml +++ b/config/sync/block.block.views_block__home_page_views_block_collections.yml @@ -13,7 +13,7 @@ dependencies: id: views_block__home_page_views_block_collections theme: geofresco region: content -weight: -5 +weight: -6 provider: null plugin: 'views_block:home_page_views-block_collections' settings: diff --git a/config/sync/block.block.views_block__home_page_views_block_gleanings.yml b/config/sync/block.block.views_block__home_page_views_block_gleanings.yml index e88c7eb..ca3fb7f 100644 --- a/config/sync/block.block.views_block__home_page_views_block_gleanings.yml +++ b/config/sync/block.block.views_block__home_page_views_block_gleanings.yml @@ -13,7 +13,7 @@ dependencies: id: views_block__home_page_views_block_gleanings theme: geofresco region: content -weight: -4 +weight: -5 provider: null plugin: 'views_block:home_page_views-block_gleanings' settings: From 4d8d01f4f34bd518fd49fbd7ed71f86ded4fe589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:50:43 -0400 Subject: [PATCH 193/865] Add honeypot module --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 545bde8..27ae108 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,7 @@ "drupal/empty_page": "^2.0", "drupal/field_token_value": "^1.0", "drupal/fixed_block_content": "^1.0", + "drupal/honeypot": "^1.29", "drupal/link_attributes": "^1.9", "drupal/mailchimp": "^1.10", "drupal/menu_link_config": "^1.0@alpha", From bbc7002b0e9fee9dee56989162fc185cf4831a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:50:52 -0400 Subject: [PATCH 194/865] Update composer lock file --- composer.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index d35c87d..79fef15 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dd82fb1cdc3f56198972f9dc6c88bb45", + "content-hash": "0ab1b28aee11e36a202ac8a0592f5dc4", "packages": [ { "name": "asm89/stack-cors", @@ -6523,6 +6523,70 @@ "issues": "https://drupal.org/project/issues/group" } }, + { + "name": "drupal/honeypot", + "version": "1.29.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/honeypot.git", + "reference": "8.x-1.29" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/honeypot-8.x-1.29.zip", + "reference": "8.x-1.29", + "shasum": "029d9e068d8f6a5db52434c27dc71bd3f06da487" + }, + "require": { + "drupal/core": "~8.0" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.29", + "datestamp": "1536179280", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Jeff Geerling", + "homepage": "https://www.drupal.org/user/213194", + "email": "geerlingguy@mac.com" + }, + { + "name": "geerlingguy", + "homepage": "https://www.drupal.org/user/389011" + }, + { + "name": "vijaycs85", + "homepage": "https://www.drupal.org/user/93488" + } + ], + "description": "Mitigates spam form submissions using the honeypot method.", + "homepage": "https://www.drupal.org/project/honeypot", + "keywords": [ + "deterrent", + "form", + "honeypot", + "honeytrap", + "php", + "spam" + ], + "support": { + "source": "https://git.drupalcode.org/project/honeypot" + } + }, { "name": "drupal/link_attributes", "version": "1.9.0", From 87cafa92a5bef7dcf202a53df2f1449d0de5fbdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:53:44 -0400 Subject: [PATCH 195/865] Add antibot to tag team spammers with honeypot, also just added agaric/sites/geo#12 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 27ae108..9a8c0c4 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "composer/installers": "^1.0", "cweagans/composer-patches": "^1.0", "drupal-composer/drupal-scaffold": "^2.0.0", + "drupal/antibot": "^1.2", "drupal/claro": "^1.0@alpha", "drupal/classitup": "dev-8.x-1.x as 1.x-dev", "drupal/config_actions": "1.x-dev", From 06593aa36e15b081454440f1968608cc0ea46e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:53:57 -0400 Subject: [PATCH 196/865] Update composer lock file --- composer.lock | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 79fef15..3600534 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0ab1b28aee11e36a202ac8a0592f5dc4", + "content-hash": "62f78e176adf0cc8708f216bde0e28c5", "packages": [ { "name": "asm89/stack-cors", @@ -2252,6 +2252,53 @@ "issues": "https://www.drupal.org/project/issues/admin_toolbar" } }, + { + "name": "drupal/antibot", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/antibot.git", + "reference": "8.x-1.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/antibot-8.x-1.2.zip", + "reference": "8.x-1.2", + "shasum": "4cb067e77929984c8cf5b05a84734c62d6fd19b3" + }, + "require": { + "drupal/core": "~8.0" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.2", + "datestamp": "1522335671", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "mstef", + "homepage": "https://www.drupal.org/user/107190" + } + ], + "description": "Prevent forms from being submitted without JavaScript enabled", + "homepage": "https://www.drupal.org/project/antibot", + "support": { + "source": "https://git.drupalcode.org/project/antibot" + } + }, { "name": "drupal/better_normalizers", "version": "1.0.0-beta3", From cbb35dde19ac86f8168a44d4f6640919c4e43676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 20:59:23 -0400 Subject: [PATCH 197/865] Enable and configure honeypot (only add to non-privileged-accessible forms) Ref #12 --- config/sync/core.extension.yml | 1 + config/sync/honeypot.settings.yml | 26 ++++++++++++ config/sync/tour.tour.honeypot.yml | 67 ++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 config/sync/honeypot.settings.yml create mode 100644 config/sync/tour.tour.honeypot.yml diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index fa833e1..6ab2e21 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -63,6 +63,7 @@ module: hal: 0 help: 0 history: 0 + honeypot: 0 image: 0 layout_discovery: 0 link: 0 diff --git a/config/sync/honeypot.settings.yml b/config/sync/honeypot.settings.yml new file mode 100644 index 0000000..1f7178f --- /dev/null +++ b/config/sync/honeypot.settings.yml @@ -0,0 +1,26 @@ +unprotected_forms: + - user_login_form + - search_form + - search_block_form + - views_exposed_form + - honeypot_settings_form +protect_all_forms: false +log: false +element_name: site +time_limit: 6 +expire: 300 +form_settings: + user_register_form: true + user_pass: false + contact_message_feedback_form: true + contact_message_personal_form: true + node_article_form: false + node_blog_form: false + node_collection_form: false + node_gleaning_form: false + node_landing_page_form: false + node_page_form: false + node_people_form: false + comment_comment_form: true +_core: + default_config_hash: 9bVDfWSa_In6VzTXmy04jJ_3ZQobihKjO9isuuUCPaw diff --git a/config/sync/tour.tour.honeypot.yml b/config/sync/tour.tour.honeypot.yml new file mode 100644 index 0000000..4ff40d0 --- /dev/null +++ b/config/sync/tour.tour.honeypot.yml @@ -0,0 +1,67 @@ +uuid: 342c1eb0-ae5f-4e47-a29b-c50acf2ba48b +langcode: en +status: true +dependencies: + module: + - honeypot +_core: + default_config_hash: eJszwZawaWU6LHIgSykn-OsisG3smruwsKOqx44TUoA +id: honeypot +label: Honeypot +module: honeypot +routes: + - + route_name: honeypot.config +tips: + honeypot-configuration: + id: honeypot-configuration + plugin: text + label: Honeypot + weight: -10 + body: "Congratulations on installing Honeypot on your site! With just a few clicks, you can have your site well-protected against automated spam bots.\r\n\r\nClick Next to be guided through this configuration page." + location: top + protect-all-forms: + id: protect-all-forms + plugin: text + label: 'Protect all forms' + weight: -9 + attributes: + data-id: edit-protect-all-forms + body: "Protecting all the forms is the easiest way to quickly cut down on spam on your site, but doing this disables Drupal's caching for every page where a form is displayed.\r\n\r\nNote: If you have the honeypot time limit enabled, this option may cause issues with Drupal Commerce product forms or similarly-sparse forms that are able to be completed in a very short time." + location: bottom + log-blocked-form-submissions: + id: log-blocked-form-submissions + plugin: text + label: 'Log blocked form submissions' + weight: -8 + attributes: + data-id: edit-log + body: 'Check this box to log every form submission using watchdog. If you have Database Logging enabled, you can view these log entries in the Recent log messages page under Reports.' + location: bottom + honeypot-element-name: + id: honeypot-element-name + plugin: text + label: 'Honeypot Element Name' + weight: -7 + attributes: + data-id: edit-element-name + body: 'Spam bots typically fill out any field they believe will help get links back to their site, so tempting them with a field named something like ''url'', ''homepage'', or ''link'' makes it hard for them to resist filling in the field—and easy to catch them in the trap and reject their submissions!' + location: top + honeypot-time-limit: + id: honeypot-time-limit + plugin: text + label: 'Honeypot Time Limit' + weight: -6 + attributes: + data-id: edit-time-limit + body: 'If you enter a positive value, Honeypot will require that all protected forms take at least that many seconds long to fill out. Most forms take at least 5-10 seconds to complete (if you''re a human), so setting this to a value < 5 will help protect against spam bots. Set to 0 to disable.' + location: top + honeypot-form-specific-settings: + id: honeypot-form-specific-settings + plugin: text + label: 'Honeypot form-specific settings' + weight: -5 + attributes: + data-id: edit-form-settings + body: 'If you would like to choose particular forms to be protected by Honeypot, check the forms you wish to protect in this section. Most common types of forms are available for protection.' + location: top From 06ccbe184bdb506b58be185807ef2fba5fd2b27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:00:47 -0400 Subject: [PATCH 198/865] Commit config snapshot --- ...t.snapshot.config_sync.module.honeypot.yml | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.honeypot.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.honeypot.yml b/config/sync/config_snapshot.snapshot.config_sync.module.honeypot.yml new file mode 100644 index 0000000..c262e2e --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.honeypot.yml @@ -0,0 +1,95 @@ +uuid: d580896c-bb86-4366-beb9-6f12f2e9ed92 +langcode: en +status: true +dependencies: + module: + - honeypot +id: config_sync.module.honeypot +snapshotSet: config_sync +extensionType: module +extensionName: honeypot +items: + - + collection: '' + name: honeypot.settings + data: + unprotected_forms: + - user_login_form + - search_form + - search_block_form + - views_exposed_form + - honeypot_settings_form + protect_all_forms: false + log: false + element_name: url + time_limit: 5 + expire: 300 + form_settings: + user_register_form: false + user_pass: false + feedback_contact_message_form: false + _contact_message_form: false + - + collection: '' + name: tour.tour.honeypot + data: + id: honeypot + module: honeypot + label: Honeypot + langcode: en + routes: + - + route_name: honeypot.config + tips: + honeypot-configuration: + id: honeypot-configuration + plugin: text + label: Honeypot + weight: -10 + body: "Congratulations on installing Honeypot on your site! With just a few clicks, you can have your site well-protected against automated spam bots.\r\n\r\nClick Next to be guided through this configuration page." + location: top + protect-all-forms: + id: protect-all-forms + plugin: text + label: 'Protect all forms' + weight: -9 + attributes: + data-id: edit-protect-all-forms + body: "Protecting all the forms is the easiest way to quickly cut down on spam on your site, but doing this disables Drupal's caching for every page where a form is displayed.\r\n\r\nNote: If you have the honeypot time limit enabled, this option may cause issues with Drupal Commerce product forms or similarly-sparse forms that are able to be completed in a very short time." + location: bottom + log-blocked-form-submissions: + id: log-blocked-form-submissions + plugin: text + label: 'Log blocked form submissions' + weight: -8 + attributes: + data-id: edit-log + body: 'Check this box to log every form submission using watchdog. If you have Database Logging enabled, you can view these log entries in the Recent log messages page under Reports.' + location: bottom + honeypot-element-name: + id: honeypot-element-name + plugin: text + label: 'Honeypot Element Name' + weight: -7 + attributes: + data-id: edit-element-name + body: 'Spam bots typically fill out any field they believe will help get links back to their site, so tempting them with a field named something like ''url'', ''homepage'', or ''link'' makes it hard for them to resist filling in the field—and easy to catch them in the trap and reject their submissions!' + location: top + honeypot-time-limit: + id: honeypot-time-limit + plugin: text + label: 'Honeypot Time Limit' + weight: -6 + attributes: + data-id: edit-time-limit + body: 'If you enter a positive value, Honeypot will require that all protected forms take at least that many seconds long to fill out. Most forms take at least 5-10 seconds to complete (if you''re a human), so setting this to a value < 5 will help protect against spam bots. Set to 0 to disable.' + location: top + honeypot-form-specific-settings: + id: honeypot-form-specific-settings + plugin: text + label: 'Honeypot form-specific settings' + weight: -5 + attributes: + data-id: edit-form-settings + body: 'If you would like to choose particular forms to be protected by Honeypot, check the forms you wish to protect in this section. Most common types of forms are available for protection.' + location: top From 35db7dd1bc6dfb60fc0878bb386d0cd43b89fe2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:06:10 -0400 Subject: [PATCH 199/865] Add comment notify module Ref #12 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 9a8c0c4..0818c46 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "drupal/antibot": "^1.2", "drupal/claro": "^1.0@alpha", "drupal/classitup": "dev-8.x-1.x as 1.x-dev", + "drupal/comment_notify": "dev-1.x", "drupal/config_actions": "1.x-dev", "drupal/convert_bundles": "^1.0@alpha", "drupal/cshs": "^1.0@beta", From 607be4e2b14b7741d4dff5a513d558a3967a1893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:17:07 -0400 Subject: [PATCH 200/865] Add simple comment notify module Ref #12 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 0818c46..5caa9b5 100644 --- a/composer.json +++ b/composer.json @@ -31,6 +31,7 @@ "drupal/migrate_source_csv": "3.1", "drupal/migrate_tools": "^4.1", "drupal/migrate_upgrade": "^3", + "drupal/scn": "^1.1", "drupal/twigsuggest": "^1.0@alpha", "drupal/webform": "^5.4", "drush/drush": "^9.0", From f4ad763b25a8642cd978beb4e1a9b06236e841f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:23:53 -0400 Subject: [PATCH 201/865] Update composer lock file --- composer.lock | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 3600534..d5fa312 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "62f78e176adf0cc8708f216bde0e28c5", + "content-hash": "00462678dca5a564f3baf766e4247e73", "packages": [ { "name": "asm89/stack-cors", @@ -2607,6 +2607,53 @@ }, "time": "2019-09-02T03:44:21+00:00" }, + { + "name": "drupal/comment_notify", + "version": "dev-1.x", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/comment_notify.git", + "reference": "6e98e2dd7e386a56ee4a3ec71aa014926aa837bd" + }, + "require": { + "drupal/core": "*", + "drupal/token": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.0-beta6+5-dev", + "datestamp": "1555366081", + "security-coverage": { + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "gnuget", + "homepage": "https://www.drupal.org/user/992990" + }, + { + "name": "greggles", + "homepage": "https://www.drupal.org/user/36762" + } + ], + "description": "Comment follow-up e-mail notification for anonymous as well as registered users.", + "homepage": "https://www.drupal.org/project/comment_notify", + "support": { + "source": "https://git.drupalcode.org/project/comment_notify" + }, + "time": "2019-04-15T22:03:59+00:00" + }, { "name": "drupal/components", "version": "1.1.0", @@ -7635,6 +7682,53 @@ "source": "https://git.drupalcode.org/project/redirect" } }, + { + "name": "drupal/scn", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/scn.git", + "reference": "8.x-1.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/scn-8.x-1.2.zip", + "reference": "8.x-1.2", + "shasum": "18f90a86914cd04b4ed343c2ab087347d09c1153" + }, + "require": { + "drupal/core": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.2", + "datestamp": "1557493685", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "ivnish", + "homepage": "https://www.drupal.org/user/3547706" + } + ], + "description": "Notifies the site administrator by eMail on new comments.", + "homepage": "https://www.drupal.org/project/scn", + "support": { + "source": "https://git.drupalcode.org/project/scn" + } + }, { "name": "drupal/search_api", "version": "1.14.0", @@ -11855,6 +11949,7 @@ "stability-flags": { "drupal/claro": 15, "drupal/classitup": 20, + "drupal/comment_notify": 20, "drupal/config_actions": 20, "drupal/convert_bundles": 15, "drupal/cshs": 10, From c74b39133231855de980b8e6aeb5571169be8ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:31:46 -0400 Subject: [PATCH 202/865] Disable threaded comments Ref #12 --- config/sync/field.field.node.blog.comment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/field.field.node.blog.comment.yml b/config/sync/field.field.node.blog.comment.yml index e44a9e0..fa43328 100644 --- a/config/sync/field.field.node.blog.comment.yml +++ b/config/sync/field.field.node.blog.comment.yml @@ -27,7 +27,7 @@ default_value: comment_count: 0 default_value_callback: '' settings: - default_mode: 1 + default_mode: 0 per_page: 50 anonymous: 1 form_location: true From 2485830227880cdc6408e8def304e0741ee38f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:33:38 -0400 Subject: [PATCH 203/865] Enable comments on gleanings and collections Ref #12 --- ...y_form_display.node.collection.default.yml | 8 +++++ ...ity_form_display.node.gleaning.default.yml | 8 +++++ ...y_view_display.node.collection.default.yml | 12 +++++++ ...ity_view_display.node.gleaning.default.yml | 12 +++++++ .../field.field.node.collection.comment.yml | 33 +++++++++++++++++++ .../field.field.node.gleaning.comment.yml | 33 +++++++++++++++++++ 6 files changed, 106 insertions(+) create mode 100644 config/sync/field.field.node.collection.comment.yml create mode 100644 config/sync/field.field.node.gleaning.comment.yml diff --git a/config/sync/core.entity_form_display.node.collection.default.yml b/config/sync/core.entity_form_display.node.collection.default.yml index f825fa8..a63bd3d 100644 --- a/config/sync/core.entity_form_display.node.collection.default.yml +++ b/config/sync/core.entity_form_display.node.collection.default.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - field.field.node.collection.body + - field.field.node.collection.comment - field.field.node.collection.field_authors - field.field.node.collection.field_collection_items - field.field.node.collection.field_collection_type @@ -15,6 +16,7 @@ dependencies: - image.style.thumbnail - node.type.collection module: + - comment - image - metatag - path @@ -26,6 +28,12 @@ targetEntityType: node bundle: collection mode: default content: + comment: + weight: 26 + settings: { } + third_party_settings: { } + type: comment_default + region: content created: type: datetime_timestamp weight: 10 diff --git a/config/sync/core.entity_form_display.node.gleaning.default.yml b/config/sync/core.entity_form_display.node.gleaning.default.yml index fb94091..ec0daa3 100644 --- a/config/sync/core.entity_form_display.node.gleaning.default.yml +++ b/config/sync/core.entity_form_display.node.gleaning.default.yml @@ -4,11 +4,13 @@ status: true dependencies: config: - field.field.node.gleaning.body + - field.field.node.gleaning.comment - field.field.node.gleaning.field_image - field.field.node.gleaning.field_upload - image.style.thumbnail - node.type.gleaning module: + - comment - file - image - path @@ -27,6 +29,12 @@ content: placeholder: '' third_party_settings: { } region: content + comment: + weight: 124 + settings: { } + third_party_settings: { } + type: comment_default + region: content created: type: datetime_timestamp weight: 10 diff --git a/config/sync/core.entity_view_display.node.collection.default.yml b/config/sync/core.entity_view_display.node.collection.default.yml index cee26d6..b3ccce2 100644 --- a/config/sync/core.entity_view_display.node.collection.default.yml +++ b/config/sync/core.entity_view_display.node.collection.default.yml @@ -3,7 +3,9 @@ langcode: en status: true dependencies: config: + - core.entity_view_display.comment.comment.default - field.field.node.collection.body + - field.field.node.collection.comment - field.field.node.collection.field_authors - field.field.node.collection.field_collection_items - field.field.node.collection.field_collection_type @@ -14,6 +16,7 @@ dependencies: - field.field.node.collection.field_topics - node.type.collection module: + - comment - ds - image - metatag @@ -33,6 +36,15 @@ content: settings: { } third_party_settings: { } region: content + comment: + weight: 10 + label: above + settings: + view_mode: default + pager_id: 0 + third_party_settings: { } + type: comment_default + region: content field_authors: weight: 5 label: hidden diff --git a/config/sync/core.entity_view_display.node.gleaning.default.yml b/config/sync/core.entity_view_display.node.gleaning.default.yml index b8d4485..47b50c9 100644 --- a/config/sync/core.entity_view_display.node.gleaning.default.yml +++ b/config/sync/core.entity_view_display.node.gleaning.default.yml @@ -3,11 +3,14 @@ langcode: en status: true dependencies: config: + - core.entity_view_display.comment.comment.default - field.field.node.gleaning.body + - field.field.node.gleaning.comment - field.field.node.gleaning.field_image - field.field.node.gleaning.field_upload - node.type.gleaning module: + - comment - file - image - text @@ -24,6 +27,15 @@ content: settings: { } third_party_settings: { } region: content + comment: + weight: 104 + label: above + settings: + view_mode: default + pager_id: 0 + third_party_settings: { } + type: comment_default + region: content field_image: weight: 102 label: above diff --git a/config/sync/field.field.node.collection.comment.yml b/config/sync/field.field.node.collection.comment.yml new file mode 100644 index 0000000..fe28dc0 --- /dev/null +++ b/config/sync/field.field.node.collection.comment.yml @@ -0,0 +1,33 @@ +uuid: 4f16f147-43d0-4fc8-a857-d2f139cc97d3 +langcode: en +status: true +dependencies: + config: + - field.storage.node.comment + - node.type.collection + module: + - comment +id: node.collection.comment +field_name: comment +entity_type: node +bundle: collection +label: Comments +description: '' +required: false +translatable: true +default_value: + - + status: 2 + cid: 0 + last_comment_timestamp: 0 + last_comment_name: null + last_comment_uid: 0 + comment_count: 0 +default_value_callback: '' +settings: + default_mode: 0 + per_page: 50 + anonymous: 0 + form_location: true + preview: 0 +field_type: comment diff --git a/config/sync/field.field.node.gleaning.comment.yml b/config/sync/field.field.node.gleaning.comment.yml new file mode 100644 index 0000000..48df688 --- /dev/null +++ b/config/sync/field.field.node.gleaning.comment.yml @@ -0,0 +1,33 @@ +uuid: 22e997d2-daae-49ef-9172-93c364d69c28 +langcode: en +status: true +dependencies: + config: + - field.storage.node.comment + - node.type.gleaning + module: + - comment +id: node.gleaning.comment +field_name: comment +entity_type: node +bundle: gleaning +label: Comments +description: '' +required: false +translatable: true +default_value: + - + status: 2 + cid: 0 + last_comment_timestamp: 0 + last_comment_name: null + last_comment_uid: 0 + comment_count: 0 +default_value_callback: '' +settings: + default_mode: 0 + per_page: 50 + anonymous: 0 + form_location: true + preview: 0 +field_type: comment From cf5207e35289607553c6e5348a798dd6ef9939e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:34:20 -0400 Subject: [PATCH 204/865] Disable threading on articles too, as on all content here --- config/sync/field.field.node.article.comment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/field.field.node.article.comment.yml b/config/sync/field.field.node.article.comment.yml index b4353db..f17c484 100644 --- a/config/sync/field.field.node.article.comment.yml +++ b/config/sync/field.field.node.article.comment.yml @@ -27,7 +27,7 @@ default_value: comment_count: 0 default_value_callback: '' settings: - default_mode: 1 + default_mode: 0 per_page: 50 anonymous: 1 form_location: true From cf8c86804e5005647735a1421246d3dd33a276ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:36:05 -0400 Subject: [PATCH 205/865] Enable and do initial configuration of comment notify modules Send a simple link to all managers And we'll try to send authors and commenters notice of new comments by default. Ref #12 --- config/sync/comment_notify.settings.yml | 19 +++++++++++++++++++ config/sync/core.extension.yml | 2 ++ config/sync/scn.settings.yml | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 config/sync/comment_notify.settings.yml create mode 100644 config/sync/scn.settings.yml diff --git a/config/sync/comment_notify.settings.yml b/config/sync/comment_notify.settings.yml new file mode 100644 index 0000000..ba92381 --- /dev/null +++ b/config/sync/comment_notify.settings.yml @@ -0,0 +1,19 @@ +bundle_types: + - node--article--comment +available_alerts: + 1: true + 2: true +enable_default: + watcher: none + entity_author: false +mail_templates: + watcher: + node: + subject: '[site:name] :: new comment on [node:title]' + body: "Hi [comment-subscribed:author],\n\n[comment:author] has commented on: \"[node:title]\"\n\n----\n[comment:title]\n[comment:body]\n----\n\nYou can view the comment at the following url\n[comment:url]\n\nYou can stop receiving emails when someone replies to this post,\nby going to [comment-subscribed:unsubscribe-url]\n\nYou can set up auto-following feature for all future posts\nby creating your own user with a few clicks here [site:login-url]\n\n-- [site:name] team\n[site:url]\n" + entity_author: + node: + subject: '[site:name] :: new comment for your post' + body: "Hi [node:author],\n\nYou have received a comment on: \"[node:title]\"\n\n----\n[comment:title]\n[comment:body]\n----\n\nYou can view the comment at the following url\n[comment:url]\n\nYou will receive emails like this for all replies to your posts. You can\ndisable this by logging in and changing the settings on your user account at\n[node:author:edit-url].\n\n-- [site:name] team\n[site:url]\n" +_core: + default_config_hash: y7oCzsZ-B0R-nyeSFO1f2h9BEChUQGSZT-3cqXd-sLE diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 6ab2e21..9db74d0 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -84,6 +84,7 @@ module: rdf: 0 redirect: 0 responsive_image: 0 + scn: 0 search_api: 0 search_api_db: 0 serialization: 0 @@ -103,6 +104,7 @@ module: ds: 1 menu_link_content: 1 pathauto: 1 + comment_notify: 10 views: 10 paragraphs: 11 config_provider: 100 diff --git a/config/sync/scn.settings.yml b/config/sync/scn.settings.yml new file mode 100644 index 0000000..fb69ca8 --- /dev/null +++ b/config/sync/scn.settings.yml @@ -0,0 +1,18 @@ +scn_admin: 0 +scn_roles: + manager: manager + administrator: 0 + authenticated: 0 + content_administrator: 0 + invited_blogger: 0 + proofreader: 0 + contributor: 0 + editor: 0 +scn_maillist: '' +scn_telegram: 0 +scn_telegram_bottoken: '' +scn_telegram_chatids: '' +scn_telegram_proxy: 0 +scn_telegram_proxy_server: '' +scn_telegram_proxy_login: '' +scn_telegram_proxy_password: '' From c75f5eff1cf891d0d5ad050ea2083e8d2ec09d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:36:14 -0400 Subject: [PATCH 206/865] Commit config snapshots --- ...shot.config_sync.module.comment_notify.yml | 32 +++++++++++++++++++ ...apshot.snapshot.config_sync.module.scn.yml | 11 +++++++ 2 files changed, 43 insertions(+) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.comment_notify.yml create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.scn.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.comment_notify.yml b/config/sync/config_snapshot.snapshot.config_sync.module.comment_notify.yml new file mode 100644 index 0000000..6677635 --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.comment_notify.yml @@ -0,0 +1,32 @@ +uuid: e68916b8-97c0-4f81-841c-dac5cf05141a +langcode: en +status: true +dependencies: + module: + - comment_notify +id: config_sync.module.comment_notify +snapshotSet: config_sync +extensionType: module +extensionName: comment_notify +items: + - + collection: '' + name: comment_notify.settings + data: + bundle_types: + - node--article--comment + available_alerts: + 1: true + 2: true + enable_default: + watcher: none + entity_author: false + mail_templates: + watcher: + node: + subject: '[site:name] :: new comment on [node:title]' + body: "Hi [comment-subscribed:author],\n\n[comment:author] has commented on: \"[node:title]\"\n\n----\n[comment:title]\n[comment:body]\n----\n\nYou can view the comment at the following url\n[comment:url]\n\nYou can stop receiving emails when someone replies to this post,\nby going to [comment-subscribed:unsubscribe-url]\n\nYou can set up auto-following feature for all future posts\nby creating your own user with a few clicks here [site:login-url]\n\n-- [site:name] team\n[site:url]\n" + entity_author: + node: + subject: '[site:name] :: new comment for your post' + body: "Hi [node:author],\n\nYou have received a comment on: \"[node:title]\"\n\n----\n[comment:title]\n[comment:body]\n----\n\nYou can view the comment at the following url\n[comment:url]\n\nYou will receive emails like this for all replies to your posts. You can\ndisable this by logging in and changing the settings on your user account at\n[node:author:edit-url].\n\n-- [site:name] team\n[site:url]\n" diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.scn.yml b/config/sync/config_snapshot.snapshot.config_sync.module.scn.yml new file mode 100644 index 0000000..2f5244f --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.scn.yml @@ -0,0 +1,11 @@ +uuid: 72dd1f0f-cc86-46e5-95e7-192e4a7deaca +langcode: en +status: true +dependencies: + module: + - scn +id: config_sync.module.scn +snapshotSet: config_sync +extensionType: module +extensionName: scn +items: { } From 1ebe94868bb120e7b7159b2007a164317ee6110a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 21:43:25 -0400 Subject: [PATCH 207/865] Update comment notify settings * For all content types with comments * No 'replies only' because we don't do threaded comments * configured to alert the people who posted the content (article, gleaning, etc) when a comment is left against it, * and to give commenters the option of being notified of follow-up comments. Ref #12 --- config/sync/comment_notify.settings.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/config/sync/comment_notify.settings.yml b/config/sync/comment_notify.settings.yml index ba92381..3b60022 100644 --- a/config/sync/comment_notify.settings.yml +++ b/config/sync/comment_notify.settings.yml @@ -1,19 +1,22 @@ bundle_types: - node--article--comment + - node--blog--comment + - node--collection--comment + - node--gleaning--comment available_alerts: 1: true - 2: true + 2: false enable_default: - watcher: none - entity_author: false + watcher: '1' + entity_author: true mail_templates: watcher: node: subject: '[site:name] :: new comment on [node:title]' - body: "Hi [comment-subscribed:author],\n\n[comment:author] has commented on: \"[node:title]\"\n\n----\n[comment:title]\n[comment:body]\n----\n\nYou can view the comment at the following url\n[comment:url]\n\nYou can stop receiving emails when someone replies to this post,\nby going to [comment-subscribed:unsubscribe-url]\n\nYou can set up auto-following feature for all future posts\nby creating your own user with a few clicks here [site:login-url]\n\n-- [site:name] team\n[site:url]\n" + body: "Hi [comment-subscribed:author],\r\n\r\n[comment:author] has commented on: \"[node:title]\"\r\n\r\n----\r\n[comment:title]\r\n[comment:body]\r\n----\r\n\r\nYou can view the comment at the following url\r\n[comment:url]\r\n\r\nYou can stop receiving emails when someone replies to this post,\r\nby going to [comment-subscribed:unsubscribe-url]\r\n\r\nYou can set up auto-following feature for all future posts\r\nby creating your own user with a few clicks here [site:login-url]\r\n\r\n-- [site:name] team\r\n[site:url]\r\n" entity_author: node: subject: '[site:name] :: new comment for your post' - body: "Hi [node:author],\n\nYou have received a comment on: \"[node:title]\"\n\n----\n[comment:title]\n[comment:body]\n----\n\nYou can view the comment at the following url\n[comment:url]\n\nYou will receive emails like this for all replies to your posts. You can\ndisable this by logging in and changing the settings on your user account at\n[node:author:edit-url].\n\n-- [site:name] team\n[site:url]\n" + body: "Hi [node:author],\r\n\r\nYou have received a comment on: \"[node:title]\"\r\n\r\n----\r\n[comment:title]\r\n[comment:body]\r\n----\r\n\r\nYou can view the comment at the following url\r\n[comment:url]\r\n\r\nYou will receive emails like this for all replies to your posts. You can\r\ndisable this by logging in and changing the settings on your user account at\r\n[node:author:edit-url].\r\n\r\n-- [site:name] team\r\n[site:url]\r\n" _core: default_config_hash: y7oCzsZ-B0R-nyeSFO1f2h9BEChUQGSZT-3cqXd-sLE From ba35d8c75b92ba85b4a082e7e1cb11bcde90bf18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 22:16:56 -0400 Subject: [PATCH 208/865] Commit updates from Drutopia Collection While preserving our comment-related changes Ref #12 --- ...y_form_display.node.collection.default.yml | 38 +++++++++++++------ ...y_view_display.node.collection.default.yml | 2 + ...tity_view_display.node.collection.full.yml | 20 +++++++--- ...ty_view_display.node.collection.teaser.yml | 2 + 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/config/sync/core.entity_form_display.node.collection.default.yml b/config/sync/core.entity_form_display.node.collection.default.yml index a63bd3d..a99f12f 100644 --- a/config/sync/core.entity_form_display.node.collection.default.yml +++ b/config/sync/core.entity_form_display.node.collection.default.yml @@ -6,6 +6,7 @@ dependencies: - field.field.node.collection.body - field.field.node.collection.comment - field.field.node.collection.field_authors + - field.field.node.collection.field_body_paragraph - field.field.node.collection.field_collection_items - field.field.node.collection.field_collection_type - field.field.node.collection.field_image @@ -19,6 +20,7 @@ dependencies: - comment - image - metatag + - paragraphs - path - text _core: @@ -36,12 +38,12 @@ content: region: content created: type: datetime_timestamp - weight: 10 + weight: 13 region: content settings: { } third_party_settings: { } field_authors: - weight: 4 + weight: 2 settings: match_operator: CONTAINS size: 60 @@ -49,6 +51,18 @@ content: third_party_settings: { } type: entity_reference_autocomplete region: content + field_body_paragraph: + type: entity_reference_paragraphs + weight: 6 + region: content + settings: + title: Paragraph + title_plural: Paragraphs + edit_mode: open + add_mode: dropdown + form_display_mode: default + default_paragraph_type: _none + third_party_settings: { } field_collection_items: weight: 5 settings: @@ -73,13 +87,13 @@ content: type: image_image region: content field_meta_tags: - weight: 7 + weight: 10 settings: { } third_party_settings: { } type: metatag_firehose region: content field_summary: - weight: 2 + weight: 4 settings: rows: 5 placeholder: '' @@ -87,7 +101,7 @@ content: type: text_textarea region: content field_tags: - weight: 15 + weight: 8 settings: match_operator: CONTAINS size: 60 @@ -96,7 +110,7 @@ content: type: entity_reference_autocomplete region: content field_topics: - weight: 14 + weight: 7 settings: match_operator: CONTAINS size: 60 @@ -106,7 +120,7 @@ content: region: content path: type: path - weight: 8 + weight: 11 region: content settings: { } third_party_settings: { } @@ -114,21 +128,21 @@ content: type: boolean_checkbox settings: display_label: true - weight: 12 + weight: 15 region: content third_party_settings: { } status: type: boolean_checkbox settings: display_label: true - weight: 13 + weight: 16 region: content third_party_settings: { } sticky: type: boolean_checkbox settings: display_label: true - weight: 11 + weight: 14 region: content third_party_settings: { } title: @@ -141,7 +155,7 @@ content: third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 6 + weight: 9 settings: match_operator: CONTAINS size: 60 @@ -149,7 +163,7 @@ content: region: content third_party_settings: { } url_redirects: - weight: 9 + weight: 12 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_view_display.node.collection.default.yml b/config/sync/core.entity_view_display.node.collection.default.yml index b3ccce2..87bf07a 100644 --- a/config/sync/core.entity_view_display.node.collection.default.yml +++ b/config/sync/core.entity_view_display.node.collection.default.yml @@ -7,6 +7,7 @@ dependencies: - field.field.node.collection.body - field.field.node.collection.comment - field.field.node.collection.field_authors + - field.field.node.collection.field_body_paragraph - field.field.node.collection.field_collection_items - field.field.node.collection.field_collection_type - field.field.node.collection.field_image @@ -117,4 +118,5 @@ content: settings: { } third_party_settings: { } hidden: + field_body_paragraph: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.collection.full.yml b/config/sync/core.entity_view_display.node.collection.full.yml index 11d142d..d91d4b6 100644 --- a/config/sync/core.entity_view_display.node.collection.full.yml +++ b/config/sync/core.entity_view_display.node.collection.full.yml @@ -6,6 +6,7 @@ dependencies: - core.entity_view_mode.node.full - field.field.node.collection.body - field.field.node.collection.field_authors + - field.field.node.collection.field_body_paragraph - field.field.node.collection.field_collection_items - field.field.node.collection.field_collection_type - field.field.node.collection.field_image @@ -17,6 +18,7 @@ dependencies: module: - ds - image + - paragraphs - text - user third_party_settings: @@ -45,6 +47,7 @@ third_party_settings: - node_post_date - field_authors - field_collection_type + - field_body_paragraph - field_topics - field_tags right: @@ -71,8 +74,15 @@ content: third_party_settings: { } type: entity_reference_label region: left + field_body_paragraph: + type: paragraph_summary + weight: 4 + region: left + label: hidden + settings: { } + third_party_settings: { } field_collection_items: - weight: 7 + weight: 8 label: hidden settings: view_mode: teaser @@ -100,7 +110,7 @@ content: type: image region: header field_summary: - weight: 6 + weight: 7 label: hidden settings: { } third_party_settings: { } @@ -108,15 +118,15 @@ content: region: right field_tags: type: entity_reference_label - weight: 5 + weight: 6 region: left - label: hidden + label: visually_hidden settings: link: true third_party_settings: { } field_topics: type: entity_reference_label - weight: 4 + weight: 5 region: left label: visually_hidden settings: diff --git a/config/sync/core.entity_view_display.node.collection.teaser.yml b/config/sync/core.entity_view_display.node.collection.teaser.yml index 9e0c58c..fe41c00 100644 --- a/config/sync/core.entity_view_display.node.collection.teaser.yml +++ b/config/sync/core.entity_view_display.node.collection.teaser.yml @@ -6,6 +6,7 @@ dependencies: - core.entity_view_mode.node.teaser - field.field.node.collection.body - field.field.node.collection.field_authors + - field.field.node.collection.field_body_paragraph - field.field.node.collection.field_collection_items - field.field.node.collection.field_collection_type - field.field.node.collection.field_image @@ -39,6 +40,7 @@ content: region: content hidden: field_authors: true + field_body_paragraph: true field_collection_items: true field_collection_type: true field_image: true From 32dd464ae8bde1e45e2300c34497ddab0c1e2c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 22:18:16 -0400 Subject: [PATCH 209/865] And the straightforward new configuration for collection paragraph --- ....paragraph.drutopia_collection.default.yml | 23 ++++++++ ....paragraph.drutopia_collection.default.yml | 21 +++++++ ...d.node.collection.field_body_paragraph.yml | 55 +++++++++++++++++++ ...agraph.drutopia_collection.field_items.yml | 32 +++++++++++ .../field.storage.paragraph.field_items.yml | 19 +++++++ ...hs.paragraphs_type.drutopia_collection.yml | 8 +++ 6 files changed, 158 insertions(+) create mode 100644 config/sync/core.entity_form_display.paragraph.drutopia_collection.default.yml create mode 100644 config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml create mode 100644 config/sync/field.field.node.collection.field_body_paragraph.yml create mode 100644 config/sync/field.field.paragraph.drutopia_collection.field_items.yml create mode 100644 config/sync/field.storage.paragraph.field_items.yml create mode 100644 config/sync/paragraphs.paragraphs_type.drutopia_collection.yml diff --git a/config/sync/core.entity_form_display.paragraph.drutopia_collection.default.yml b/config/sync/core.entity_form_display.paragraph.drutopia_collection.default.yml new file mode 100644 index 0000000..3cd4290 --- /dev/null +++ b/config/sync/core.entity_form_display.paragraph.drutopia_collection.default.yml @@ -0,0 +1,23 @@ +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.drutopia_collection.field_items + - paragraphs.paragraphs_type.drutopia_collection +id: paragraph.drutopia_collection.default +targetEntityType: paragraph +bundle: drutopia_collection +mode: default +content: + field_items: + weight: 0 + settings: + match_operator: CONTAINS + size: 60 + placeholder: '' + third_party_settings: { } + type: entity_reference_autocomplete + region: content +hidden: + created: true + status: true diff --git a/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml b/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml new file mode 100644 index 0000000..be96d04 --- /dev/null +++ b/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml @@ -0,0 +1,21 @@ +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.drutopia_collection.field_items + - paragraphs.paragraphs_type.drutopia_collection +id: paragraph.drutopia_collection.default +targetEntityType: paragraph +bundle: drutopia_collection +mode: default +content: + field_items: + weight: 0 + label: above + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: content +hidden: + search_api_excerpt: true diff --git a/config/sync/field.field.node.collection.field_body_paragraph.yml b/config/sync/field.field.node.collection.field_body_paragraph.yml new file mode 100644 index 0000000..b674ae7 --- /dev/null +++ b/config/sync/field.field.node.collection.field_body_paragraph.yml @@ -0,0 +1,55 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_body_paragraph + - node.type.collection + - paragraphs.paragraphs_type.drutopia_collection + - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.text + module: + - entity_reference_revisions +id: node.collection.field_body_paragraph +field_name: field_body_paragraph +entity_type: node +bundle: collection +label: 'Body paragraph' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:paragraph' + handler_settings: + negate: 0 + target_bundles: + drutopia_collection: drutopia_collection + image: image + text: text + target_bundles_drag_drop: + drutopia_collection: + enabled: true + weight: 9 + faq: + weight: 10 + enabled: false + file: + weight: 11 + enabled: false + image: + enabled: true + weight: 12 + slide: + weight: 13 + enabled: false + text: + enabled: true + weight: 14 + update: + weight: 15 + enabled: false + video: + weight: 16 + enabled: false +field_type: entity_reference_revisions diff --git a/config/sync/field.field.paragraph.drutopia_collection.field_items.yml b/config/sync/field.field.paragraph.drutopia_collection.field_items.yml new file mode 100644 index 0000000..963f152 --- /dev/null +++ b/config/sync/field.field.paragraph.drutopia_collection.field_items.yml @@ -0,0 +1,32 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_items + - node.type.article + - node.type.blog + - node.type.people + - paragraphs.paragraphs_type.drutopia_collection +id: paragraph.drutopia_collection.field_items +field_name: field_items +entity_type: paragraph +bundle: drutopia_collection +label: Items +description: 'Select any other content on the site to display as a list of teasers by typing words from the title and looking for the autocompletion of the content you want in the collection. You can change the order after adding each item.' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:node' + handler_settings: + target_bundles: + article: article + blog: blog + people: people + sort: + field: changed + direction: DESC + auto_create: false + auto_create_bundle: article +field_type: entity_reference diff --git a/config/sync/field.storage.paragraph.field_items.yml b/config/sync/field.storage.paragraph.field_items.yml new file mode 100644 index 0000000..9864e2f --- /dev/null +++ b/config/sync/field.storage.paragraph.field_items.yml @@ -0,0 +1,19 @@ +langcode: en +status: true +dependencies: + module: + - node + - paragraphs +id: paragraph.field_items +field_name: field_items +entity_type: paragraph +type: entity_reference +settings: + target_type: node +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/paragraphs.paragraphs_type.drutopia_collection.yml b/config/sync/paragraphs.paragraphs_type.drutopia_collection.yml new file mode 100644 index 0000000..de20906 --- /dev/null +++ b/config/sync/paragraphs.paragraphs_type.drutopia_collection.yml @@ -0,0 +1,8 @@ +langcode: en +status: true +dependencies: { } +id: drutopia_collection +label: Collection +icon_uuid: null +description: 'Allows grouping referenced content together. For instance, an Issue collection could use collection paragraphs to group articles into three themes within that issue.' +behavior_plugins: { } From 7d3fb59c4ec02af21c7daa5b8ce8c8a9f04d8bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 22:19:25 -0400 Subject: [PATCH 210/865] Re-export config with UUIDs, auto-updates based on local config --- ...entity_form_display.paragraph.drutopia_collection.default.yml | 1 + config/sync/core.entity_view_display.node.collection.full.yml | 1 + config/sync/core.entity_view_display.node.collection.teaser.yml | 1 + ...entity_view_display.paragraph.drutopia_collection.default.yml | 1 + config/sync/field.field.node.collection.field_body_paragraph.yml | 1 + .../field.field.paragraph.drutopia_collection.field_items.yml | 1 + config/sync/field.storage.paragraph.field_items.yml | 1 + config/sync/paragraphs.paragraphs_type.drutopia_collection.yml | 1 + 8 files changed, 8 insertions(+) diff --git a/config/sync/core.entity_form_display.paragraph.drutopia_collection.default.yml b/config/sync/core.entity_form_display.paragraph.drutopia_collection.default.yml index 3cd4290..5b6d88c 100644 --- a/config/sync/core.entity_form_display.paragraph.drutopia_collection.default.yml +++ b/config/sync/core.entity_form_display.paragraph.drutopia_collection.default.yml @@ -1,3 +1,4 @@ +uuid: ef91aa1b-8215-4118-9e9d-cc99b1d9b039 langcode: en status: true dependencies: diff --git a/config/sync/core.entity_view_display.node.collection.full.yml b/config/sync/core.entity_view_display.node.collection.full.yml index d91d4b6..e03d9fc 100644 --- a/config/sync/core.entity_view_display.node.collection.full.yml +++ b/config/sync/core.entity_view_display.node.collection.full.yml @@ -134,6 +134,7 @@ content: third_party_settings: { } hidden: body: true + comment: true field_meta_tags: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.collection.teaser.yml b/config/sync/core.entity_view_display.node.collection.teaser.yml index fe41c00..c57a50c 100644 --- a/config/sync/core.entity_view_display.node.collection.teaser.yml +++ b/config/sync/core.entity_view_display.node.collection.teaser.yml @@ -39,6 +39,7 @@ content: third_party_settings: { } region: content hidden: + comment: true field_authors: true field_body_paragraph: true field_collection_items: true diff --git a/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml b/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml index be96d04..e02949c 100644 --- a/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml +++ b/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml @@ -1,3 +1,4 @@ +uuid: fc7d50ef-86fa-4b81-ab81-92b9976a2612 langcode: en status: true dependencies: diff --git a/config/sync/field.field.node.collection.field_body_paragraph.yml b/config/sync/field.field.node.collection.field_body_paragraph.yml index b674ae7..977cedc 100644 --- a/config/sync/field.field.node.collection.field_body_paragraph.yml +++ b/config/sync/field.field.node.collection.field_body_paragraph.yml @@ -1,3 +1,4 @@ +uuid: ef2c1d71-cd1f-4e62-a008-625a74b90d93 langcode: en status: true dependencies: diff --git a/config/sync/field.field.paragraph.drutopia_collection.field_items.yml b/config/sync/field.field.paragraph.drutopia_collection.field_items.yml index 963f152..12371f2 100644 --- a/config/sync/field.field.paragraph.drutopia_collection.field_items.yml +++ b/config/sync/field.field.paragraph.drutopia_collection.field_items.yml @@ -1,3 +1,4 @@ +uuid: 0fa4a677-0a71-4143-a2a0-b2844925a60b langcode: en status: true dependencies: diff --git a/config/sync/field.storage.paragraph.field_items.yml b/config/sync/field.storage.paragraph.field_items.yml index 9864e2f..18ef9a2 100644 --- a/config/sync/field.storage.paragraph.field_items.yml +++ b/config/sync/field.storage.paragraph.field_items.yml @@ -1,3 +1,4 @@ +uuid: dee62ea0-4eb5-4223-beb6-8061d6a8a7b1 langcode: en status: true dependencies: diff --git a/config/sync/paragraphs.paragraphs_type.drutopia_collection.yml b/config/sync/paragraphs.paragraphs_type.drutopia_collection.yml index de20906..67bbd86 100644 --- a/config/sync/paragraphs.paragraphs_type.drutopia_collection.yml +++ b/config/sync/paragraphs.paragraphs_type.drutopia_collection.yml @@ -1,3 +1,4 @@ +uuid: aa44324b-593d-407b-8ed4-0f66c4cb87b0 langcode: en status: true dependencies: { } From 135a2a371f924766fcfe2d855a3ba2095ae07b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 23:17:02 -0400 Subject: [PATCH 211/865] Set a maximum height for image we worked so hard to let it break all bounds --- web/themes/custom/geofresco/src/global/_components.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index 812a672..8dadcca 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -26,6 +26,8 @@ right: 50%; margin-left: -50vw; margin-right: -50vw; + max-height: 27rem; + overflow-y: hidden; img { width: 100%; } From dea557d1a16c3525a1bdff5d49823894ac38f435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 22 Sep 2019 23:18:11 -0400 Subject: [PATCH 212/865] Allow sidebar to show on listing pages so facets can be seen & used Ref #15 --- .../custom/geofresco/src/templates/layout/page.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig index 8067182..4803ca0 100644 --- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig @@ -106,8 +106,8 @@ {% endblock main_content %} {% block sidebar_first %} {# Sidebar first #} - {% if page.sidebar_first and not is_front and (node and node.bundle == 'page') %} - {# Set attributes for content. #} + {% if page.sidebar_first and not is_front and (not node or (node and node.bundle == 'page')) %} + {# Set attributes for content. #} {% if not page.sidebar_first_attributes %} {% set page = page|merge({ From eeafcbfba2fddd7ddcaf0ea904a3e3072df8058e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 07:18:30 -0400 Subject: [PATCH 213/865] Configure client-side hierarchical select on articles --- .../core.entity_form_display.node.article.default.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/sync/core.entity_form_display.node.article.default.yml b/config/sync/core.entity_form_display.node.article.default.yml index fafc5e6..952650f 100644 --- a/config/sync/core.entity_form_display.node.article.default.yml +++ b/config/sync/core.entity_form_display.node.article.default.yml @@ -26,6 +26,7 @@ dependencies: - node.type.article module: - comment + - cshs - datetime - file - focal_point @@ -173,9 +174,12 @@ content: region: content field_topics: weight: 7 - settings: { } + settings: + force_deepest: '1' + parent: '0' + level_labels: '' third_party_settings: { } - type: options_select + type: cshs region: content field_upload: weight: 18 From 62dc4757bd417544eb6e92b2348227179e4ef3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 07:20:12 -0400 Subject: [PATCH 214/865] Configure gleaning display; remove comment field from teasers etc. --- ...ity_view_display.node.gleaning.default.yml | 20 ++++------------ ...entity_view_display.node.gleaning.full.yml | 23 +++++++++++-------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/config/sync/core.entity_view_display.node.gleaning.default.yml b/config/sync/core.entity_view_display.node.gleaning.default.yml index 47b50c9..c2f673e 100644 --- a/config/sync/core.entity_view_display.node.gleaning.default.yml +++ b/config/sync/core.entity_view_display.node.gleaning.default.yml @@ -3,14 +3,12 @@ langcode: en status: true dependencies: config: - - core.entity_view_display.comment.comment.default - field.field.node.gleaning.body - field.field.node.gleaning.comment - field.field.node.gleaning.field_image - field.field.node.gleaning.field_upload - node.type.gleaning module: - - comment - file - image - text @@ -23,21 +21,12 @@ content: body: label: hidden type: text_default - weight: 101 + weight: 1 settings: { } third_party_settings: { } region: content - comment: - weight: 104 - label: above - settings: - view_mode: default - pager_id: 0 - third_party_settings: { } - type: comment_default - region: content field_image: - weight: 102 + weight: 2 label: above settings: image_style: '' @@ -46,7 +35,7 @@ content: type: image region: content field_upload: - weight: 103 + weight: 3 label: above settings: use_description_as_link_text: true @@ -54,9 +43,10 @@ content: type: file_default region: content links: - weight: 100 + weight: 0 region: content settings: { } third_party_settings: { } hidden: + comment: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.gleaning.full.yml b/config/sync/core.entity_view_display.node.gleaning.full.yml index 924e4d8..40202b7 100644 --- a/config/sync/core.entity_view_display.node.gleaning.full.yml +++ b/config/sync/core.entity_view_display.node.gleaning.full.yml @@ -3,14 +3,16 @@ langcode: en status: true dependencies: config: + - core.entity_view_display.comment.comment.default - core.entity_view_mode.node.full - field.field.node.gleaning.body + - field.field.node.gleaning.comment - field.field.node.gleaning.field_image - field.field.node.gleaning.field_upload - node.type.gleaning module: + - comment - file - - image - text - user id: node.gleaning.full @@ -21,21 +23,21 @@ content: body: label: hidden type: text_default - weight: 101 + weight: 1 settings: { } third_party_settings: { } region: content - field_image: - weight: 102 + comment: + type: comment_default + weight: 3 + region: content label: above settings: - image_style: '' - image_link: '' + view_mode: default + pager_id: 0 third_party_settings: { } - type: image - region: content field_upload: - weight: 103 + weight: 2 label: above settings: use_description_as_link_text: true @@ -43,9 +45,10 @@ content: type: file_default region: content links: - weight: 100 + weight: 0 region: content settings: { } third_party_settings: { } hidden: + field_image: true search_api_excerpt: true From 397748d38f669d8fa838d53a3ea41e037e0e6fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 08:07:23 -0400 Subject: [PATCH 215/865] Don't drop title down at all for non-fancy content types And we display a solid color instead of an image where we *do* expect an image but there isn't one, so no need for the no-featured-image class or extra margin in that case. Ref #28 Ref #32 Ref #26 Ref #27 Ref #29 --- .../custom/geofresco/src/global/_layout.scss | 23 ++++++++++--------- .../src/templates/layout/node.html.twig | 1 - 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index 5331cdd..45c4cf9 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -25,17 +25,18 @@ } } -/* On node pages, drop the title over (where we want) the image (to be). */ -.page--content-item .page-title { - height: 0; - position: relative; - overflow: visible; - z-index: 10; -} - -/* If there's no featured image, leave enough blank space for the dropping down title. */ -.content.no-featured-image { - margin-top: 6rem; +/* On certain node pages, drop the title over (where we want) the image (to be). */ +.page--content-item--article, +.page--content-item--blog, +.page--content-item--collection, +.page--content-item--people + { + .page-title { + height: 0; + position: relative; + overflow: visible; + z-index: 10; + } } .background-replacement-for-no-image { diff --git a/web/themes/custom/geofresco/src/templates/layout/node.html.twig b/web/themes/custom/geofresco/src/templates/layout/node.html.twig index 46e7cfb..84b06b2 100644 --- a/web/themes/custom/geofresco/src/templates/layout/node.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/node.html.twig @@ -80,7 +80,6 @@ node.isSticky() ? 'is-sticky', not node.isPublished() ? 'is-unpublished', view_mode ? view_mode|clean_class, 'clearfix', -content.field_image|render is empty ? 'no-featured-image', ] %} From 543a7571be57f5127d63ebed189bbefbbe732f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 08:07:39 -0400 Subject: [PATCH 216/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index 4eb8ef4..7ad68e5 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -6016,7 +6016,9 @@ label.panel-block { left: 50%; right: 50%; margin-left: -50vw; - margin-right: -50vw; } + margin-right: -50vw; + max-height: 27rem; + overflow-y: hidden; } .featured-image figure.image img { width: 100%; } @@ -8223,17 +8225,16 @@ label.panel-block { .main-section .group-header { padding-top: 0; } -/* On node pages, drop the title over (where we want) the image (to be). */ -.page--content-item .page-title { +/* On certain node pages, drop the title over (where we want) the image (to be). */ +.page--content-item--article .page-title, +.page--content-item--blog .page-title, +.page--content-item--collection .page-title, +.page--content-item--people .page-title { height: 0; position: relative; overflow: visible; z-index: 10; } -/* If there's no featured image, leave enough blank space for the dropping down title. */ -.content.no-featured-image { - margin-top: 6rem; } - .background-replacement-for-no-image { height: 12rem; background-color: cadetblue; } From ed116c56cc19f280e21ec609eb19e5b9b992ecef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 08:08:00 -0400 Subject: [PATCH 217/865] Limit images shown for article cards to 1 --- ...entity_view_display.node.article.simple_card.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/config/sync/core.entity_view_display.node.article.simple_card.yml b/config/sync/core.entity_view_display.node.article.simple_card.yml index d360c76..7501837 100644 --- a/config/sync/core.entity_view_display.node.article.simple_card.yml +++ b/config/sync/core.entity_view_display.node.article.simple_card.yml @@ -9,11 +9,20 @@ dependencies: - field.field.node.article.field_article_type - field.field.node.article.field_authors - field.field.node.article.field_body_paragraph + - field.field.node.article.field_economic_sectors - field.field.node.article.field_image + - field.field.node.article.field_institutions_structures - field.field.node.article.field_meta_tags + - field.field.node.article.field_movements_struggles + - field.field.node.article.field_practices_tools_strategies + - field.field.node.article.field_publication_date + - field.field.node.article.field_regions + - field.field.node.article.field_subtitle - field.field.node.article.field_summary - field.field.node.article.field_tags - field.field.node.article.field_topics + - field.field.node.article.field_upload + - field.field.node.article.field_visions_models - node.type.article - responsive_image.styles.narrow module: @@ -93,7 +102,9 @@ content: settings: responsive_image_style: narrow image_link: content - third_party_settings: { } + third_party_settings: + ds: + ds_limit: '1' hidden: body: true comment: true From 1a2b7a8b6b3f14a0841fc126641fcc50d727e2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 08:32:59 -0400 Subject: [PATCH 218/865] Add background color for title of gleaning nodes Ref #28 --- web/themes/custom/geofresco/src/global/_layout.scss | 6 ++++++ web/themes/custom/geofresco/src/global/global.scss | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index 45c4cf9..cca6db6 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -43,3 +43,9 @@ height: 12rem; background-color: cadetblue; } + +// Gleanings don't have the same faux-image structure (because they'll never +// have a featured image) but we still want the title to look about the same. +.page--content-item--gleaning .page-title { + background-color: $gleaning; +} diff --git a/web/themes/custom/geofresco/src/global/global.scss b/web/themes/custom/geofresco/src/global/global.scss index 46f45d7..5454f6a 100644 --- a/web/themes/custom/geofresco/src/global/global.scss +++ b/web/themes/custom/geofresco/src/global/global.scss @@ -8,6 +8,14 @@ $green: #478D00; $green-gray: #8FB489; $offwhite: #F8F8F8; +// No idea where this yellow came from, apparently Bulma, but we never set it +// yet it is the right color. Anyway i'm past trying to figure things out. +// Re-setting it here, just so that we can assign it to Gleanings, below. +$yellow: #ffdd57; + +// A color for each content type +$gleaning: $yellow; + // Update Bulma's global variables. $primary: $green; From 6132f58ced019148c5a1d4a4319da92bc99e5513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 09:40:38 -0400 Subject: [PATCH 219/865] Set margin on embedded inline images ref #27 --- web/themes/custom/geofresco/src/global/_elements.scss | 7 +++++++ web/themes/custom/geofresco/src/global/global.scss | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss index 4f6639c..9155b90 100644 --- a/web/themes/custom/geofresco/src/global/_elements.scss +++ b/web/themes/custom/geofresco/src/global/_elements.scss @@ -46,3 +46,10 @@ .featured-image { margin-bottom: 0.5rem; } + +// TODO consider if this would look better with margin only on the content side +// so somehow removing left margin if the inline style has float: left applied. +// Also to consider decreasing the margin on mobile sizes. +.image-inline { + margin: 1em; +} diff --git a/web/themes/custom/geofresco/src/global/global.scss b/web/themes/custom/geofresco/src/global/global.scss index 5454f6a..fadd35c 100644 --- a/web/themes/custom/geofresco/src/global/global.scss +++ b/web/themes/custom/geofresco/src/global/global.scss @@ -8,12 +8,16 @@ $green: #478D00; $green-gray: #8FB489; $offwhite: #F8F8F8; +$brown: #AD7442; // No idea where this yellow came from, apparently Bulma, but we never set it // yet it is the right color. Anyway i'm past trying to figure things out. // Re-setting it here, just so that we can assign it to Gleanings, below. $yellow: #ffdd57; // A color for each content type +$article: $green; +$blog: $blue; +$collection: $brown; $gleaning: $yellow; // Update Bulma's global variables. From b916f5f29879116978bd2441bdca56cca77a811d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:06:27 -0400 Subject: [PATCH 220/865] Add different background colors for each content type for non-image content --- web/themes/custom/geofresco/src/global/_layout.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index cca6db6..426e4b8 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -49,3 +49,15 @@ .page--content-item--gleaning .page-title { background-color: $gleaning; } + +.page--content-item--article .background-replacement-for-no-image { + background-color: $article; +} + +.page--content-item--blog .background-replacement-for-no-image { + background-color: $blog; +} + +.page--content-item--collection .background-replacement-for-no-image { + background-color: $collection; +} From 9e62ee36c9ef9c6745f539d3cb47cc80d4021648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:07:12 -0400 Subject: [PATCH 221/865] Commit compiled CSS --- .../custom/geofresco/dist/css/global.css | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index 7ad68e5..439335b 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -1933,7 +1933,7 @@ a.box:active { border-color: transparent; color: rgba(0, 0, 0, 0.7); } .button.is-warning:hover, .button.is-warning.is-hovered { - background-color: #ffdb4a; + background-color: #ffda4a; border-color: transparent; color: rgba(0, 0, 0, 0.7); } .button.is-warning:focus, .button.is-warning.is-focused { @@ -1943,7 +1943,7 @@ a.box:active { -webkit-box-shadow: 0 0 0 0.125em rgba(255, 221, 87, 0.25); box-shadow: 0 0 0 0.125em rgba(255, 221, 87, 0.25); } .button.is-warning:active, .button.is-warning.is-active { - background-color: #ffd83d; + background-color: #ffd83e; border-color: transparent; color: rgba(0, 0, 0, 0.7); } .button.is-warning[disabled], @@ -3086,6 +3086,9 @@ a.tag:hover { .featured-image { margin-bottom: 0.5rem; } +.image-inline { + margin: 1em; } + .input, .textarea, .select select { background-color: white; border-color: #dbdbdb; @@ -3368,7 +3371,7 @@ a.tag:hover { .select.is-warning select { border-color: #ffdd57; } .select.is-warning select:hover, .select.is-warning select.is-hovered { - border-color: #ffd83d; } + border-color: #ffd83e; } .select.is-warning select:focus, .select.is-warning select.is-focused, .select.is-warning select:active, .select.is-warning select.is-active { -webkit-box-shadow: 0 0 0 0.125em rgba(255, 221, 87, 0.25); box-shadow: 0 0 0 0.125em rgba(255, 221, 87, 0.25); } @@ -3561,7 +3564,7 @@ a.tag:hover { border-color: transparent; color: rgba(0, 0, 0, 0.7); } .file.is-warning:hover .file-cta, .file.is-warning.is-hovered .file-cta { - background-color: #ffdb4a; + background-color: #ffda4a; border-color: transparent; color: rgba(0, 0, 0, 0.7); } .file.is-warning:focus .file-cta, .file.is-warning.is-focused .file-cta { @@ -3570,7 +3573,7 @@ a.tag:hover { box-shadow: 0 0 0.5em rgba(255, 221, 87, 0.25); color: rgba(0, 0, 0, 0.7); } .file.is-warning:active .file-cta, .file.is-warning.is-active .file-cta { - background-color: #ffd83d; + background-color: #ffd83e; border-color: transparent; color: rgba(0, 0, 0, 0.7); } .file.is-danger .file-cta { @@ -4556,7 +4559,7 @@ a.list-item { color: rgba(0, 0, 0, 0.7); } .message.is-warning .message-body { border-color: #ffdd57; - color: #3b3108; } + color: #3c3108; } .message.is-danger { background-color: #fef5f7; } .message.is-danger .message-header { @@ -5090,7 +5093,7 @@ a.list-item { .navbar.is-warning .navbar-brand .navbar-link:focus, .navbar.is-warning .navbar-brand .navbar-link:hover, .navbar.is-warning .navbar-brand .navbar-link.is-active { - background-color: #ffd83d; + background-color: #ffd83e; color: rgba(0, 0, 0, 0.7); } .navbar.is-warning .navbar-brand .navbar-link::after { border-color: rgba(0, 0, 0, 0.7); } @@ -5112,7 +5115,7 @@ a.list-item { .navbar.is-warning .navbar-end .navbar-link:focus, .navbar.is-warning .navbar-end .navbar-link:hover, .navbar.is-warning .navbar-end .navbar-link.is-active { - background-color: #ffd83d; + background-color: #ffd83e; color: rgba(0, 0, 0, 0.7); } .navbar.is-warning .navbar-start .navbar-link::after, .navbar.is-warning .navbar-end .navbar-link::after { @@ -5120,7 +5123,7 @@ a.list-item { .navbar.is-warning .navbar-item.has-dropdown:focus .navbar-link, .navbar.is-warning .navbar-item.has-dropdown:hover .navbar-link, .navbar.is-warning .navbar-item.has-dropdown.is-active .navbar-link { - background-color: #ffd83d; + background-color: #ffd83e; color: rgba(0, 0, 0, 0.7); } .navbar.is-warning .navbar-dropdown a.navbar-item.is-active { background-color: #ffdd57; @@ -8043,7 +8046,7 @@ label.panel-block { .hero.is-warning a.navbar-item:hover, .hero.is-warning a.navbar-item.is-active, .hero.is-warning .navbar-link:hover, .hero.is-warning .navbar-link.is-active { - background-color: #ffd83d; + background-color: #ffd83e; color: rgba(0, 0, 0, 0.7); } .hero.is-warning .tabs a { color: rgba(0, 0, 0, 0.7); @@ -8061,12 +8064,12 @@ label.panel-block { border-color: rgba(0, 0, 0, 0.7); color: #ffdd57; } .hero.is-warning.is-bold { - background-image: -o-linear-gradient(309deg, #ffaf24 0%, #ffdd57 71%, #fffa70 100%); - background-image: linear-gradient(141deg, #ffaf24 0%, #ffdd57 71%, #fffa70 100%); } + background-image: -o-linear-gradient(309deg, #ffae24 0%, #ffdd57 71%, #fffa71 100%); + background-image: linear-gradient(141deg, #ffae24 0%, #ffdd57 71%, #fffa71 100%); } @media screen and (max-width: 768px) { .hero.is-warning.is-bold .navbar-menu { - background-image: -o-linear-gradient(309deg, #ffaf24 0%, #ffdd57 71%, #fffa70 100%); - background-image: linear-gradient(141deg, #ffaf24 0%, #ffdd57 71%, #fffa70 100%); } } + background-image: -o-linear-gradient(309deg, #ffae24 0%, #ffdd57 71%, #fffa71 100%); + background-image: linear-gradient(141deg, #ffae24 0%, #ffdd57 71%, #fffa71 100%); } } .hero.is-danger { background-color: #a70c20; color: #fff; } @@ -8238,3 +8241,15 @@ label.panel-block { .background-replacement-for-no-image { height: 12rem; background-color: cadetblue; } + +.page--content-item--gleaning .page-title { + background-color: #ffdd57; } + +.page--content-item--article .background-replacement-for-no-image { + background-color: #478D00; } + +.page--content-item--blog .background-replacement-for-no-image { + background-color: #4391E0; } + +.page--content-item--collection .background-replacement-for-no-image { + background-color: #AD7442; } From 01ae2c69137e43724de5b9b29f2a00ff860fd517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:25:16 -0400 Subject: [PATCH 222/865] Remove fields duplicating Topics from blogs --- ....entity_form_display.node.blog.default.yml | 50 ------------------- ...ore.entity_view_display.node.blog.card.yml | 10 ---- ....entity_view_display.node.blog.default.yml | 45 ----------------- ...ore.entity_view_display.node.blog.full.yml | 10 ---- ...field.node.blog.field_economic_sectors.yml | 29 ----------- ...ode.blog.field_institutions_structures.yml | 29 ----------- ...ld.node.blog.field_movements_struggles.yml | 29 ----------- ....blog.field_practices_tools_strategies.yml | 29 ----------- ...d.field.node.blog.field_visions_models.yml | 29 ----------- 9 files changed, 260 deletions(-) delete mode 100644 config/sync/field.field.node.blog.field_economic_sectors.yml delete mode 100644 config/sync/field.field.node.blog.field_institutions_structures.yml delete mode 100644 config/sync/field.field.node.blog.field_movements_struggles.yml delete mode 100644 config/sync/field.field.node.blog.field_practices_tools_strategies.yml delete mode 100644 config/sync/field.field.node.blog.field_visions_models.yml diff --git a/config/sync/core.entity_form_display.node.blog.default.yml b/config/sync/core.entity_form_display.node.blog.default.yml index 119e391..f5fde0b 100644 --- a/config/sync/core.entity_form_display.node.blog.default.yml +++ b/config/sync/core.entity_form_display.node.blog.default.yml @@ -7,18 +7,13 @@ dependencies: - field.field.node.blog.comment - field.field.node.blog.field_authors - field.field.node.blog.field_body_paragraph - - field.field.node.blog.field_economic_sectors - field.field.node.blog.field_image - - field.field.node.blog.field_institutions_structures - field.field.node.blog.field_meta_tags - - field.field.node.blog.field_movements_struggles - - field.field.node.blog.field_practices_tools_strategies - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics - field.field.node.blog.field_upload - - field.field.node.blog.field_visions_models - image.style.thumbnail - node.type.blog module: @@ -69,15 +64,6 @@ content: third_party_settings: { } type: entity_reference_paragraphs region: content - field_economic_sectors: - weight: 52 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_image: weight: 2 settings: @@ -88,39 +74,12 @@ content: third_party_settings: { } type: image_focal_point region: content - field_institutions_structures: - weight: 53 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_meta_tags: weight: 13 settings: { } third_party_settings: { } type: metatag_firehose region: content - field_movements_struggles: - weight: 54 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content - field_practices_tools_strategies: - weight: 55 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_regions: weight: 56 settings: @@ -160,15 +119,6 @@ content: third_party_settings: { } type: file_generic region: content - field_visions_models: - weight: 57 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content path: type: path weight: 11 diff --git a/config/sync/core.entity_view_display.node.blog.card.yml b/config/sync/core.entity_view_display.node.blog.card.yml index 1ad9f9d..706e204 100644 --- a/config/sync/core.entity_view_display.node.blog.card.yml +++ b/config/sync/core.entity_view_display.node.blog.card.yml @@ -8,18 +8,13 @@ dependencies: - field.field.node.blog.comment - field.field.node.blog.field_authors - field.field.node.blog.field_body_paragraph - - field.field.node.blog.field_economic_sectors - field.field.node.blog.field_image - - field.field.node.blog.field_institutions_structures - field.field.node.blog.field_meta_tags - - field.field.node.blog.field_movements_struggles - - field.field.node.blog.field_practices_tools_strategies - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics - field.field.node.blog.field_upload - - field.field.node.blog.field_visions_models - node.type.blog - responsive_image.styles.narrow module: @@ -128,14 +123,9 @@ hidden: body: true comment: true field_body_paragraph: true - field_economic_sectors: true - field_institutions_structures: true field_meta_tags: true - field_movements_struggles: true - field_practices_tools_strategies: true field_regions: true field_tags: true field_upload: true - field_visions_models: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.blog.default.yml b/config/sync/core.entity_view_display.node.blog.default.yml index 656a797..38c5438 100644 --- a/config/sync/core.entity_view_display.node.blog.default.yml +++ b/config/sync/core.entity_view_display.node.blog.default.yml @@ -7,18 +7,13 @@ dependencies: - field.field.node.blog.comment - field.field.node.blog.field_authors - field.field.node.blog.field_body_paragraph - - field.field.node.blog.field_economic_sectors - field.field.node.blog.field_image - - field.field.node.blog.field_institutions_structures - field.field.node.blog.field_meta_tags - - field.field.node.blog.field_movements_struggles - - field.field.node.blog.field_practices_tools_strategies - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics - field.field.node.blog.field_upload - - field.field.node.blog.field_visions_models - node.type.blog module: - ds @@ -48,38 +43,6 @@ targetEntityType: node bundle: blog mode: default content: - field_economic_sectors: - weight: 2 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content - field_institutions_structures: - weight: 3 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content - field_movements_struggles: - weight: 4 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content - field_practices_tools_strategies: - weight: 5 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content field_regions: weight: 6 label: above @@ -96,14 +59,6 @@ content: third_party_settings: { } type: file_default region: content - field_visions_models: - weight: 7 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content hidden: body: true comment: true diff --git a/config/sync/core.entity_view_display.node.blog.full.yml b/config/sync/core.entity_view_display.node.blog.full.yml index c226307..8ae2df7 100644 --- a/config/sync/core.entity_view_display.node.blog.full.yml +++ b/config/sync/core.entity_view_display.node.blog.full.yml @@ -9,18 +9,13 @@ dependencies: - field.field.node.blog.comment - field.field.node.blog.field_authors - field.field.node.blog.field_body_paragraph - - field.field.node.blog.field_economic_sectors - field.field.node.blog.field_image - - field.field.node.blog.field_institutions_structures - field.field.node.blog.field_meta_tags - - field.field.node.blog.field_movements_struggles - - field.field.node.blog.field_practices_tools_strategies - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics - field.field.node.blog.field_upload - - field.field.node.blog.field_visions_models - node.type.blog - responsive_image.styles.wide module: @@ -135,14 +130,9 @@ content: third_party_settings: { } hidden: body: true - field_economic_sectors: true - field_institutions_structures: true field_meta_tags: true - field_movements_struggles: true - field_practices_tools_strategies: true field_regions: true field_summary: true field_upload: true - field_visions_models: true links: true search_api_excerpt: true diff --git a/config/sync/field.field.node.blog.field_economic_sectors.yml b/config/sync/field.field.node.blog.field_economic_sectors.yml deleted file mode 100644 index 072978b..0000000 --- a/config/sync/field.field.node.blog.field_economic_sectors.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: a325c3c8-333c-465b-bde7-06d302c53336 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_economic_sectors - - node.type.blog - - taxonomy.vocabulary.topics -id: node.blog.field_economic_sectors -field_name: field_economic_sectors -entity_type: node -bundle: blog -label: 'Economic Sectors' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.blog.field_institutions_structures.yml b/config/sync/field.field.node.blog.field_institutions_structures.yml deleted file mode 100644 index d21a211..0000000 --- a/config/sync/field.field.node.blog.field_institutions_structures.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 46cda4e7-c112-49aa-a1df-87fe7a82b3fb -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_institutions_structures - - node.type.blog - - taxonomy.vocabulary.topics -id: node.blog.field_institutions_structures -field_name: field_institutions_structures -entity_type: node -bundle: blog -label: 'Institutions & Structures' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.blog.field_movements_struggles.yml b/config/sync/field.field.node.blog.field_movements_struggles.yml deleted file mode 100644 index fb2aba3..0000000 --- a/config/sync/field.field.node.blog.field_movements_struggles.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 532eff75-9cab-4956-9168-10095064f1d7 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_movements_struggles - - node.type.blog - - taxonomy.vocabulary.topics -id: node.blog.field_movements_struggles -field_name: field_movements_struggles -entity_type: node -bundle: blog -label: 'Movements & Struggles' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.blog.field_practices_tools_strategies.yml b/config/sync/field.field.node.blog.field_practices_tools_strategies.yml deleted file mode 100644 index e2d2e82..0000000 --- a/config/sync/field.field.node.blog.field_practices_tools_strategies.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 63d8f2cd-976b-48fc-80bf-5a6cd134ece9 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_practices_tools_strategies - - node.type.blog - - taxonomy.vocabulary.topics -id: node.blog.field_practices_tools_strategies -field_name: field_practices_tools_strategies -entity_type: node -bundle: blog -label: 'Practices, Tools & Strategies' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.blog.field_visions_models.yml b/config/sync/field.field.node.blog.field_visions_models.yml deleted file mode 100644 index 474fba3..0000000 --- a/config/sync/field.field.node.blog.field_visions_models.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 3d832fcf-e6b9-4fbb-8cc8-d8ea6600e8e1 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_visions_models - - node.type.blog - - taxonomy.vocabulary.topics -id: node.blog.field_visions_models -field_name: field_visions_models -entity_type: node -bundle: blog -label: 'Visions & Models' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference From a1a9c235e3229333dcfd4b9d53488061f207d859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:33:50 -0400 Subject: [PATCH 223/865] Let featured images get taller on the widest screens --- web/themes/custom/geofresco/src/global/_components.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index 8dadcca..ad2b7e4 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -31,6 +31,9 @@ img { width: 100%; } + @include from($widescreen) { + max-height: 36rem; + } } /* Hero image in hero block */ From 20cb60a414e1768a84964c7490f1397f29f1f766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:34:56 -0400 Subject: [PATCH 224/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index 439335b..961aae0 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -6024,6 +6024,9 @@ label.panel-block { overflow-y: hidden; } .featured-image figure.image img { width: 100%; } + @media screen and (min-width: 1216px) { + .featured-image figure.image { + max-height: 36rem; } } /* Hero image in hero block */ .has-background-image.hero { From 3de2cf05e0819b00830e510619ab2c1d462cbc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:45:07 -0400 Subject: [PATCH 225/865] Remove summary & topics from blog & article 'card' display Ref #33 --- ....entity_view_display.node.article.card.yml | 45 +++++++++---------- ...ore.entity_view_display.node.blog.card.yml | 22 +-------- 2 files changed, 23 insertions(+), 44 deletions(-) diff --git a/config/sync/core.entity_view_display.node.article.card.yml b/config/sync/core.entity_view_display.node.article.card.yml index dc6c047..31a9c71 100644 --- a/config/sync/core.entity_view_display.node.article.card.yml +++ b/config/sync/core.entity_view_display.node.article.card.yml @@ -9,18 +9,26 @@ dependencies: - field.field.node.article.field_article_type - field.field.node.article.field_authors - field.field.node.article.field_body_paragraph + - field.field.node.article.field_economic_sectors - field.field.node.article.field_image + - field.field.node.article.field_institutions_structures - field.field.node.article.field_meta_tags + - field.field.node.article.field_movements_struggles + - field.field.node.article.field_practices_tools_strategies + - field.field.node.article.field_publication_date + - field.field.node.article.field_regions + - field.field.node.article.field_subtitle - field.field.node.article.field_summary - field.field.node.article.field_tags - field.field.node.article.field_topics + - field.field.node.article.field_upload + - field.field.node.article.field_visions_models - node.type.article - responsive_image.styles.narrow module: - ds - field_group - responsive_image - - text - user third_party_settings: ds: @@ -44,8 +52,7 @@ third_party_settings: - group_card_content - node_post_date - node_title - - field_summary - - field_topics + - field_authors fields: node_post_date: plugin_id: node_post_date @@ -66,8 +73,7 @@ third_party_settings: children: - node_post_date - node_title - - field_summary - - field_topics + - field_authors parent_name: '' weight: 1 format_type: html_element @@ -89,6 +95,14 @@ targetEntityType: node bundle: article mode: card content: + field_authors: + type: entity_reference_label + weight: 5 + region: ds_content + label: hidden + settings: + link: false + third_party_settings: { } field_image: type: responsive_image weight: 0 @@ -100,29 +114,10 @@ content: third_party_settings: ds: ds_limit: '1' - field_summary: - type: text_trimmed - weight: 5 - region: ds_content - label: visually_hidden - settings: - trim_length: 180 - third_party_settings: { } - field_topics: - type: entity_reference_label - weight: 6 - region: ds_content - label: visually_hidden - settings: - link: true - third_party_settings: - ds: - ds_limit: '' hidden: body: true comment: true field_article_type: true - field_authors: true field_body_paragraph: true field_economic_sectors: true field_institutions_structures: true @@ -132,7 +127,9 @@ hidden: field_publication_date: true field_regions: true field_subtitle: true + field_summary: true field_tags: true + field_topics: true field_upload: true field_visions_models: true links: true diff --git a/config/sync/core.entity_view_display.node.blog.card.yml b/config/sync/core.entity_view_display.node.blog.card.yml index 706e204..e3175b0 100644 --- a/config/sync/core.entity_view_display.node.blog.card.yml +++ b/config/sync/core.entity_view_display.node.blog.card.yml @@ -21,7 +21,6 @@ dependencies: - ds - field_group - responsive_image - - text - user third_party_settings: ds: @@ -45,8 +44,6 @@ third_party_settings: - group_card_content - node_title - field_authors - - field_summary - - field_topics fields: node_title: plugin_id: node_title @@ -62,8 +59,6 @@ third_party_settings: children: - node_title - field_authors - - field_summary - - field_topics parent_name: '' weight: 1 format_type: html_element @@ -104,28 +99,15 @@ content: third_party_settings: ds: ds_limit: '1' - field_summary: - type: text_default - weight: 5 - region: ds_content - label: visually_hidden - settings: { } - third_party_settings: { } - field_topics: - type: entity_reference_label - weight: 6 - region: ds_content - label: visually_hidden - settings: - link: true - third_party_settings: { } hidden: body: true comment: true field_body_paragraph: true field_meta_tags: true field_regions: true + field_summary: true field_tags: true + field_topics: true field_upload: true links: true search_api_excerpt: true From 296592a48cf259aa78db1ccbb3c48f93b97afefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:47:59 -0400 Subject: [PATCH 226/865] Update composer lock file to get our local changes to classitup --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index d5fa312..b81977d 100644 --- a/composer.lock +++ b/composer.lock @@ -2586,7 +2586,7 @@ "source": { "type": "git", "url": "git@git.drupal.org:project/classitup.git", - "reference": "258efec2ad7ee2fea3ded40da5d19e5cbe2c0cc5" + "reference": "848cb9f1e4812714dab6253c7b754f0f92f2e634" }, "type": "drupal-module", "license": [ @@ -2605,7 +2605,7 @@ "issues": "https://www.drupal.org/project/issues/classitup", "source": "https://git.drupalcode.org/project/classitup.git" }, - "time": "2019-09-02T03:44:21+00:00" + "time": "2019-09-23T11:40:32+00:00" }, { "name": "drupal/comment_notify", From 1c8e4b6b3be25a8739c5a7cdfbf785e0a9eeb13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:51:25 -0400 Subject: [PATCH 227/865] Remove duplicate fields for topic from Article --- ...tity_form_display.node.article.default.yml | 60 ------------------- ....entity_view_display.node.article.card.yml | 12 ---- ...tity_view_display.node.article.default.yml | 54 ----------------- ....entity_view_display.node.article.full.yml | 55 ----------------- ..._view_display.node.article.simple_card.yml | 12 ---- ...ld.node.article.field_economic_sectors.yml | 29 --------- ....article.field_institutions_structures.yml | 29 --------- ...node.article.field_movements_struggles.yml | 29 --------- ...ticle.field_practices_tools_strategies.yml | 29 --------- ...field.field.node.article.field_regions.yml | 29 --------- ...ield.node.article.field_visions_models.yml | 29 --------- ...ld.storage.node.field_economic_sectors.yml | 20 ------- ...age.node.field_institutions_structures.yml | 20 ------- ...storage.node.field_movements_struggles.yml | 20 ------- ....node.field_practices_tools_strategies.yml | 20 ------- ...ield.storage.node.field_visions_models.yml | 20 ------- 16 files changed, 467 deletions(-) delete mode 100644 config/sync/field.field.node.article.field_economic_sectors.yml delete mode 100644 config/sync/field.field.node.article.field_institutions_structures.yml delete mode 100644 config/sync/field.field.node.article.field_movements_struggles.yml delete mode 100644 config/sync/field.field.node.article.field_practices_tools_strategies.yml delete mode 100644 config/sync/field.field.node.article.field_regions.yml delete mode 100644 config/sync/field.field.node.article.field_visions_models.yml delete mode 100644 config/sync/field.storage.node.field_economic_sectors.yml delete mode 100644 config/sync/field.storage.node.field_institutions_structures.yml delete mode 100644 config/sync/field.storage.node.field_movements_struggles.yml delete mode 100644 config/sync/field.storage.node.field_practices_tools_strategies.yml delete mode 100644 config/sync/field.storage.node.field_visions_models.yml diff --git a/config/sync/core.entity_form_display.node.article.default.yml b/config/sync/core.entity_form_display.node.article.default.yml index 952650f..3abef42 100644 --- a/config/sync/core.entity_form_display.node.article.default.yml +++ b/config/sync/core.entity_form_display.node.article.default.yml @@ -8,20 +8,14 @@ dependencies: - field.field.node.article.field_article_type - field.field.node.article.field_authors - field.field.node.article.field_body_paragraph - - field.field.node.article.field_economic_sectors - field.field.node.article.field_image - - field.field.node.article.field_institutions_structures - field.field.node.article.field_meta_tags - - field.field.node.article.field_movements_struggles - - field.field.node.article.field_practices_tools_strategies - field.field.node.article.field_publication_date - - field.field.node.article.field_regions - field.field.node.article.field_subtitle - field.field.node.article.field_summary - field.field.node.article.field_tags - field.field.node.article.field_topics - field.field.node.article.field_upload - - field.field.node.article.field_visions_models - image.style.thumbnail - node.type.article module: @@ -80,15 +74,6 @@ content: third_party_settings: { } type: entity_reference_paragraphs region: content - field_economic_sectors: - weight: 19 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_image: type: image_focal_point weight: 4 @@ -99,54 +84,18 @@ content: offsets: '50,50' third_party_settings: { } region: content - field_institutions_structures: - weight: 20 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_meta_tags: weight: 15 settings: { } third_party_settings: { } type: metatag_firehose region: content - field_movements_struggles: - weight: 21 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content - field_practices_tools_strategies: - weight: 22 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_publication_date: weight: 25 settings: { } third_party_settings: { } type: datetime_default region: content - field_regions: - weight: 24 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_subtitle: weight: 1 settings: @@ -188,15 +137,6 @@ content: third_party_settings: { } type: file_generic region: content - field_visions_models: - weight: 23 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content path: type: path weight: 14 diff --git a/config/sync/core.entity_view_display.node.article.card.yml b/config/sync/core.entity_view_display.node.article.card.yml index 31a9c71..2341f8b 100644 --- a/config/sync/core.entity_view_display.node.article.card.yml +++ b/config/sync/core.entity_view_display.node.article.card.yml @@ -9,20 +9,14 @@ dependencies: - field.field.node.article.field_article_type - field.field.node.article.field_authors - field.field.node.article.field_body_paragraph - - field.field.node.article.field_economic_sectors - field.field.node.article.field_image - - field.field.node.article.field_institutions_structures - field.field.node.article.field_meta_tags - - field.field.node.article.field_movements_struggles - - field.field.node.article.field_practices_tools_strategies - field.field.node.article.field_publication_date - - field.field.node.article.field_regions - field.field.node.article.field_subtitle - field.field.node.article.field_summary - field.field.node.article.field_tags - field.field.node.article.field_topics - field.field.node.article.field_upload - - field.field.node.article.field_visions_models - node.type.article - responsive_image.styles.narrow module: @@ -119,18 +113,12 @@ hidden: comment: true field_article_type: true field_body_paragraph: true - field_economic_sectors: true - field_institutions_structures: true field_meta_tags: true - field_movements_struggles: true - field_practices_tools_strategies: true field_publication_date: true - field_regions: true field_subtitle: true field_summary: true field_tags: true field_topics: true field_upload: true - field_visions_models: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.article.default.yml b/config/sync/core.entity_view_display.node.article.default.yml index 34d5b53..4fea98f 100644 --- a/config/sync/core.entity_view_display.node.article.default.yml +++ b/config/sync/core.entity_view_display.node.article.default.yml @@ -8,20 +8,14 @@ dependencies: - field.field.node.article.field_article_type - field.field.node.article.field_authors - field.field.node.article.field_body_paragraph - - field.field.node.article.field_economic_sectors - field.field.node.article.field_image - - field.field.node.article.field_institutions_structures - field.field.node.article.field_meta_tags - - field.field.node.article.field_movements_struggles - - field.field.node.article.field_practices_tools_strategies - field.field.node.article.field_publication_date - - field.field.node.article.field_regions - field.field.node.article.field_subtitle - field.field.node.article.field_summary - field.field.node.article.field_tags - field.field.node.article.field_topics - field.field.node.article.field_upload - - field.field.node.article.field_visions_models - node.type.article module: - datetime @@ -34,38 +28,6 @@ targetEntityType: node bundle: article mode: default content: - field_economic_sectors: - weight: 2 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content - field_institutions_structures: - weight: 3 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content - field_movements_struggles: - weight: 4 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content - field_practices_tools_strategies: - weight: 5 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content field_publication_date: weight: 8 label: above @@ -75,14 +37,6 @@ content: third_party_settings: { } type: datetime_default region: content - field_regions: - weight: 7 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content field_subtitle: weight: 9 label: above @@ -99,14 +53,6 @@ content: third_party_settings: { } type: file_default region: content - field_visions_models: - weight: 6 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content hidden: body: true comment: true diff --git a/config/sync/core.entity_view_display.node.article.full.yml b/config/sync/core.entity_view_display.node.article.full.yml index 68f0e41..d2235aa 100644 --- a/config/sync/core.entity_view_display.node.article.full.yml +++ b/config/sync/core.entity_view_display.node.article.full.yml @@ -10,20 +10,14 @@ dependencies: - field.field.node.article.field_article_type - field.field.node.article.field_authors - field.field.node.article.field_body_paragraph - - field.field.node.article.field_economic_sectors - field.field.node.article.field_image - - field.field.node.article.field_institutions_structures - field.field.node.article.field_meta_tags - - field.field.node.article.field_movements_struggles - - field.field.node.article.field_practices_tools_strategies - field.field.node.article.field_publication_date - - field.field.node.article.field_regions - field.field.node.article.field_subtitle - field.field.node.article.field_summary - field.field.node.article.field_tags - field.field.node.article.field_topics - field.field.node.article.field_upload - - field.field.node.article.field_visions_models - node.type.article - responsive_image.styles.wide module: @@ -31,7 +25,6 @@ dependencies: - ds - entity_reference_revisions - responsive_image - - taxonomy - user third_party_settings: ds: @@ -122,14 +115,6 @@ content: third_party_settings: { } type: entity_reference_revisions_entity_view region: right - field_economic_sectors: - type: entity_reference_label - weight: 13 - region: footer - label: above - settings: - link: true - third_party_settings: { } field_image: type: responsive_image weight: 0 @@ -141,38 +126,6 @@ content: ds_limit: '1' label: hidden region: header - field_institutions_structures: - type: entity_reference_label - weight: 12 - region: footer - label: above - settings: - link: true - third_party_settings: { } - field_movements_struggles: - type: entity_reference_entity_view - weight: 11 - region: footer - label: above - settings: - view_mode: default - link: false - third_party_settings: { } - field_practices_tools_strategies: - type: entity_reference_rss_category - weight: 10 - region: footer - label: above - settings: { } - third_party_settings: { } - field_regions: - type: entity_reference_label - weight: 14 - region: footer - label: above - settings: - link: true - third_party_settings: { } field_subtitle: type: string weight: 1 @@ -197,14 +150,6 @@ content: settings: link: true third_party_settings: { } - field_visions_models: - type: entity_reference_label - weight: 15 - region: footer - label: above - settings: - link: true - third_party_settings: { } links: weight: 9 region: right diff --git a/config/sync/core.entity_view_display.node.article.simple_card.yml b/config/sync/core.entity_view_display.node.article.simple_card.yml index 7501837..0b7c0d7 100644 --- a/config/sync/core.entity_view_display.node.article.simple_card.yml +++ b/config/sync/core.entity_view_display.node.article.simple_card.yml @@ -9,20 +9,14 @@ dependencies: - field.field.node.article.field_article_type - field.field.node.article.field_authors - field.field.node.article.field_body_paragraph - - field.field.node.article.field_economic_sectors - field.field.node.article.field_image - - field.field.node.article.field_institutions_structures - field.field.node.article.field_meta_tags - - field.field.node.article.field_movements_struggles - - field.field.node.article.field_practices_tools_strategies - field.field.node.article.field_publication_date - - field.field.node.article.field_regions - field.field.node.article.field_subtitle - field.field.node.article.field_summary - field.field.node.article.field_tags - field.field.node.article.field_topics - field.field.node.article.field_upload - - field.field.node.article.field_visions_models - node.type.article - responsive_image.styles.narrow module: @@ -111,18 +105,12 @@ hidden: field_article_type: true field_authors: true field_body_paragraph: true - field_economic_sectors: true - field_institutions_structures: true field_meta_tags: true - field_movements_struggles: true - field_practices_tools_strategies: true field_publication_date: true - field_regions: true field_subtitle: true field_summary: true field_tags: true field_topics: true field_upload: true - field_visions_models: true links: true search_api_excerpt: true diff --git a/config/sync/field.field.node.article.field_economic_sectors.yml b/config/sync/field.field.node.article.field_economic_sectors.yml deleted file mode 100644 index f708424..0000000 --- a/config/sync/field.field.node.article.field_economic_sectors.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: c68d6715-4d99-402d-a935-1486722936a5 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_economic_sectors - - node.type.article - - taxonomy.vocabulary.topics -id: node.article.field_economic_sectors -field_name: field_economic_sectors -entity_type: node -bundle: article -label: 'Economic Sectors' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.article.field_institutions_structures.yml b/config/sync/field.field.node.article.field_institutions_structures.yml deleted file mode 100644 index 58b60f2..0000000 --- a/config/sync/field.field.node.article.field_institutions_structures.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 38df8317-53f6-4f0b-8095-0fa03ab95315 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_institutions_structures - - node.type.article - - taxonomy.vocabulary.topics -id: node.article.field_institutions_structures -field_name: field_institutions_structures -entity_type: node -bundle: article -label: 'Institutions & Structures' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.article.field_movements_struggles.yml b/config/sync/field.field.node.article.field_movements_struggles.yml deleted file mode 100644 index 28cb11a..0000000 --- a/config/sync/field.field.node.article.field_movements_struggles.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: d34ca2ca-f8ab-4a6c-a69c-78bf9ea3f394 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_movements_struggles - - node.type.article - - taxonomy.vocabulary.topics -id: node.article.field_movements_struggles -field_name: field_movements_struggles -entity_type: node -bundle: article -label: 'Movements & Struggles' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.article.field_practices_tools_strategies.yml b/config/sync/field.field.node.article.field_practices_tools_strategies.yml deleted file mode 100644 index dc65f39..0000000 --- a/config/sync/field.field.node.article.field_practices_tools_strategies.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: b36ccc7a-936b-4816-bde2-857576b121b1 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_practices_tools_strategies - - node.type.article - - taxonomy.vocabulary.topics -id: node.article.field_practices_tools_strategies -field_name: field_practices_tools_strategies -entity_type: node -bundle: article -label: 'Practices, Tools & Strategies' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.article.field_regions.yml b/config/sync/field.field.node.article.field_regions.yml deleted file mode 100644 index 4d8dd3b..0000000 --- a/config/sync/field.field.node.article.field_regions.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: a85b27f4-d6e1-40f0-98b4-a42f0343e330 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_regions - - node.type.article - - taxonomy.vocabulary.topics -id: node.article.field_regions -field_name: field_regions -entity_type: node -bundle: article -label: Regions -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.node.article.field_visions_models.yml b/config/sync/field.field.node.article.field_visions_models.yml deleted file mode 100644 index be059be..0000000 --- a/config/sync/field.field.node.article.field_visions_models.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: bb2042ea-502b-4d06-bd63-81568fb108c7 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_visions_models - - node.type.article - - taxonomy.vocabulary.topics -id: node.article.field_visions_models -field_name: field_visions_models -entity_type: node -bundle: article -label: 'Visions & Models' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.storage.node.field_economic_sectors.yml b/config/sync/field.storage.node.field_economic_sectors.yml deleted file mode 100644 index 8d8c7c8..0000000 --- a/config/sync/field.storage.node.field_economic_sectors.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 8d50a687-339a-4bef-ac55-747ed1ea5c51 -langcode: en -status: true -dependencies: - module: - - node - - taxonomy -id: node.field_economic_sectors -field_name: field_economic_sectors -entity_type: node -type: entity_reference -settings: - target_type: taxonomy_term -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.node.field_institutions_structures.yml b/config/sync/field.storage.node.field_institutions_structures.yml deleted file mode 100644 index e787797..0000000 --- a/config/sync/field.storage.node.field_institutions_structures.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: ed649d42-92e6-433e-a21d-deec7bea7ce5 -langcode: en -status: true -dependencies: - module: - - node - - taxonomy -id: node.field_institutions_structures -field_name: field_institutions_structures -entity_type: node -type: entity_reference -settings: - target_type: taxonomy_term -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.node.field_movements_struggles.yml b/config/sync/field.storage.node.field_movements_struggles.yml deleted file mode 100644 index f00a7e1..0000000 --- a/config/sync/field.storage.node.field_movements_struggles.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: fd1a1984-011f-4088-89e6-4ae5b0518811 -langcode: en -status: true -dependencies: - module: - - node - - taxonomy -id: node.field_movements_struggles -field_name: field_movements_struggles -entity_type: node -type: entity_reference -settings: - target_type: taxonomy_term -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.node.field_practices_tools_strategies.yml b/config/sync/field.storage.node.field_practices_tools_strategies.yml deleted file mode 100644 index d999a9b..0000000 --- a/config/sync/field.storage.node.field_practices_tools_strategies.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: c6f5f0f2-200f-4ae4-b78b-b830e09b2d32 -langcode: en -status: true -dependencies: - module: - - node - - taxonomy -id: node.field_practices_tools_strategies -field_name: field_practices_tools_strategies -entity_type: node -type: entity_reference -settings: - target_type: taxonomy_term -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.node.field_visions_models.yml b/config/sync/field.storage.node.field_visions_models.yml deleted file mode 100644 index ada09e8..0000000 --- a/config/sync/field.storage.node.field_visions_models.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 0d3a6c61-120c-433a-b326-671a7243921e -langcode: en -status: true -dependencies: - module: - - node - - taxonomy -id: node.field_visions_models -field_name: field_visions_models -entity_type: node -type: entity_reference -settings: - target_type: taxonomy_term -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false From d2d30c79599a9bcc61b35249aa4779cf311caea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:52:06 -0400 Subject: [PATCH 228/865] Delete region from blogs (the secret topic duplicate) --- ....entity_form_display.node.blog.default.yml | 10 ------- ...ore.entity_view_display.node.blog.card.yml | 2 -- ....entity_view_display.node.blog.default.yml | 9 ------ ...ore.entity_view_display.node.blog.full.yml | 2 -- .../field.field.node.blog.field_regions.yml | 29 ------------------- .../sync/field.storage.node.field_regions.yml | 20 ------------- 6 files changed, 72 deletions(-) delete mode 100644 config/sync/field.field.node.blog.field_regions.yml delete mode 100644 config/sync/field.storage.node.field_regions.yml diff --git a/config/sync/core.entity_form_display.node.blog.default.yml b/config/sync/core.entity_form_display.node.blog.default.yml index f5fde0b..6d4eb64 100644 --- a/config/sync/core.entity_form_display.node.blog.default.yml +++ b/config/sync/core.entity_form_display.node.blog.default.yml @@ -9,7 +9,6 @@ dependencies: - field.field.node.blog.field_body_paragraph - field.field.node.blog.field_image - field.field.node.blog.field_meta_tags - - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics @@ -80,15 +79,6 @@ content: third_party_settings: { } type: metatag_firehose region: content - field_regions: - weight: 56 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_summary: weight: 3 settings: diff --git a/config/sync/core.entity_view_display.node.blog.card.yml b/config/sync/core.entity_view_display.node.blog.card.yml index e3175b0..9739d48 100644 --- a/config/sync/core.entity_view_display.node.blog.card.yml +++ b/config/sync/core.entity_view_display.node.blog.card.yml @@ -10,7 +10,6 @@ dependencies: - field.field.node.blog.field_body_paragraph - field.field.node.blog.field_image - field.field.node.blog.field_meta_tags - - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics @@ -104,7 +103,6 @@ hidden: comment: true field_body_paragraph: true field_meta_tags: true - field_regions: true field_summary: true field_tags: true field_topics: true diff --git a/config/sync/core.entity_view_display.node.blog.default.yml b/config/sync/core.entity_view_display.node.blog.default.yml index 38c5438..2de2bde 100644 --- a/config/sync/core.entity_view_display.node.blog.default.yml +++ b/config/sync/core.entity_view_display.node.blog.default.yml @@ -9,7 +9,6 @@ dependencies: - field.field.node.blog.field_body_paragraph - field.field.node.blog.field_image - field.field.node.blog.field_meta_tags - - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics @@ -43,14 +42,6 @@ targetEntityType: node bundle: blog mode: default content: - field_regions: - weight: 6 - label: above - settings: - link: true - third_party_settings: { } - type: entity_reference_label - region: content field_upload: weight: 1 label: above diff --git a/config/sync/core.entity_view_display.node.blog.full.yml b/config/sync/core.entity_view_display.node.blog.full.yml index 8ae2df7..6ed26ad 100644 --- a/config/sync/core.entity_view_display.node.blog.full.yml +++ b/config/sync/core.entity_view_display.node.blog.full.yml @@ -11,7 +11,6 @@ dependencies: - field.field.node.blog.field_body_paragraph - field.field.node.blog.field_image - field.field.node.blog.field_meta_tags - - field.field.node.blog.field_regions - field.field.node.blog.field_summary - field.field.node.blog.field_tags - field.field.node.blog.field_topics @@ -131,7 +130,6 @@ content: hidden: body: true field_meta_tags: true - field_regions: true field_summary: true field_upload: true links: true diff --git a/config/sync/field.field.node.blog.field_regions.yml b/config/sync/field.field.node.blog.field_regions.yml deleted file mode 100644 index 9ef6fd3..0000000 --- a/config/sync/field.field.node.blog.field_regions.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 1914fa94-ac77-4628-a5fb-a84a315085da -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_regions - - node.type.blog - - taxonomy.vocabulary.topics -id: node.blog.field_regions -field_name: field_regions -entity_type: node -bundle: blog -label: Regions -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - topics: topics - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.storage.node.field_regions.yml b/config/sync/field.storage.node.field_regions.yml deleted file mode 100644 index cf5231b..0000000 --- a/config/sync/field.storage.node.field_regions.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 5c89c96a-f3f8-48b9-8120-616cbd71fe54 -langcode: en -status: true -dependencies: - module: - - node - - taxonomy -id: node.field_regions -field_name: field_regions -entity_type: node -type: entity_reference -settings: - target_type: taxonomy_term -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false From ab688b995c98a91289e43e87770db57d2daddbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:56:34 -0400 Subject: [PATCH 229/865] Configure client-side hierarchical select for blogs --- .../core.entity_form_display.node.blog.default.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/config/sync/core.entity_form_display.node.blog.default.yml b/config/sync/core.entity_form_display.node.blog.default.yml index 6d4eb64..5b3150c 100644 --- a/config/sync/core.entity_form_display.node.blog.default.yml +++ b/config/sync/core.entity_form_display.node.blog.default.yml @@ -17,6 +17,7 @@ dependencies: - node.type.blog module: - comment + - cshs - file - focal_point - metatag @@ -98,9 +99,12 @@ content: region: content field_topics: weight: 5 - settings: { } + settings: + force_deepest: '1' + parent: '0' + level_labels: '' third_party_settings: { } - type: options_select + type: cshs region: content field_upload: weight: 51 @@ -155,8 +159,8 @@ content: region: content url_redirects: weight: 50 + region: content settings: { } third_party_settings: { } - region: content hidden: body: true From 0d1fe7d6137d01c5d151d7007b32051ec5ee8807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 23 Sep 2019 10:59:18 -0400 Subject: [PATCH 230/865] Configure CSHS for collections --- .../core.entity_form_display.node.collection.default.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/sync/core.entity_form_display.node.collection.default.yml b/config/sync/core.entity_form_display.node.collection.default.yml index a99f12f..fe385f4 100644 --- a/config/sync/core.entity_form_display.node.collection.default.yml +++ b/config/sync/core.entity_form_display.node.collection.default.yml @@ -18,6 +18,7 @@ dependencies: - node.type.collection module: - comment + - cshs - image - metatag - paragraphs @@ -112,11 +113,11 @@ content: field_topics: weight: 7 settings: - match_operator: CONTAINS - size: 60 - placeholder: '' + force_deepest: '1' + parent: '0' + level_labels: '' third_party_settings: { } - type: entity_reference_autocomplete + type: cshs region: content path: type: path From b5b339f64d553584d6bdf450857167f06d6c0f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 24 Sep 2019 07:43:28 -0400 Subject: [PATCH 231/865] Hide title on home page hero block (because that's its title) --- config/sync/block.block.homepagehero.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/block.block.homepagehero.yml b/config/sync/block.block.homepagehero.yml index 5c41ed7..5d36a0b 100644 --- a/config/sync/block.block.homepagehero.yml +++ b/config/sync/block.block.homepagehero.yml @@ -20,7 +20,7 @@ settings: id: 'fixed_block_content:home_page_hero' label: 'Home page hero' provider: fixed_block_content - label_display: visible + label_display: '0' view_mode: default visibility: condition_group: From bff23f4b7af3c594c4dc95e56392217d167e07b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 24 Sep 2019 08:01:51 -0400 Subject: [PATCH 232/865] Apply self-updates of gleaning knowing about the comment field --- .../core.entity_form_display.comment.comment.default.yml | 5 +++++ config/sync/core.entity_form_display.user.user.default.yml | 5 +++++ config/sync/core.entity_view_display.node.gleaning.card.yml | 1 + .../sync/core.entity_view_display.node.gleaning.teaser.yml | 1 + 4 files changed, 12 insertions(+) diff --git a/config/sync/core.entity_form_display.comment.comment.default.yml b/config/sync/core.entity_form_display.comment.comment.default.yml index 03267ae..09ec55c 100644 --- a/config/sync/core.entity_form_display.comment.comment.default.yml +++ b/config/sync/core.entity_form_display.comment.comment.default.yml @@ -27,5 +27,10 @@ content: placeholder: '' third_party_settings: { } region: content + comment_notify_settings: + weight: 1 + settings: { } + third_party_settings: { } + region: content hidden: subject: true diff --git a/config/sync/core.entity_form_display.user.user.default.yml b/config/sync/core.entity_form_display.user.user.default.yml index 32d4189..ff126ed 100644 --- a/config/sync/core.entity_form_display.user.user.default.yml +++ b/config/sync/core.entity_form_display.user.user.default.yml @@ -18,6 +18,11 @@ content: settings: { } third_party_settings: { } region: content + comment_notify_settings: + weight: 4 + settings: { } + third_party_settings: { } + region: content contact: weight: 5 settings: { } diff --git a/config/sync/core.entity_view_display.node.gleaning.card.yml b/config/sync/core.entity_view_display.node.gleaning.card.yml index 672629d..966d060 100644 --- a/config/sync/core.entity_view_display.node.gleaning.card.yml +++ b/config/sync/core.entity_view_display.node.gleaning.card.yml @@ -35,5 +35,6 @@ content: third_party_settings: { } hidden: body: true + comment: true field_upload: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.gleaning.teaser.yml b/config/sync/core.entity_view_display.node.gleaning.teaser.yml index 3bc0ae6..3779a92 100644 --- a/config/sync/core.entity_view_display.node.gleaning.teaser.yml +++ b/config/sync/core.entity_view_display.node.gleaning.teaser.yml @@ -28,6 +28,7 @@ content: third_party_settings: { } region: content hidden: + comment: true field_image: true field_upload: true search_api_excerpt: true From 0ec54ac7fe4f658a44b7c99ffc34ff7441a2cb08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 24 Sep 2019 08:47:31 -0400 Subject: [PATCH 233/865] Update authenticated, contributor permissions --- config/sync/user.role.anonymous.yml | 1 + config/sync/user.role.authenticated.yml | 1 + config/sync/user.role.contributor.yml | 8 ++------ config/sync/user.role.editor.yml | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/config/sync/user.role.anonymous.yml b/config/sync/user.role.anonymous.yml index 0e8f6e0..65f30de 100644 --- a/config/sync/user.role.anonymous.yml +++ b/config/sync/user.role.anonymous.yml @@ -23,6 +23,7 @@ permissions: - 'post comments' - 'search Google CSE' - 'search content' + - 'skip comment approval' - 'use exclude node title' - 'use text format 1' - 'use text format 3' diff --git a/config/sync/user.role.authenticated.yml b/config/sync/user.role.authenticated.yml index e2b9f8b..ef562b6 100644 --- a/config/sync/user.role.authenticated.yml +++ b/config/sync/user.role.authenticated.yml @@ -29,6 +29,7 @@ permissions: - 'edit own weblinks' - 'post comments' - 'search content' + - 'skip comment approval' - 'use exclude node title' - 'use text format 1' - 'use text format 3' diff --git a/config/sync/user.role.contributor.yml b/config/sync/user.role.contributor.yml index 4fcdbce..012c0c2 100644 --- a/config/sync/user.role.contributor.yml +++ b/config/sync/user.role.contributor.yml @@ -9,16 +9,12 @@ label: Contributor weight: 2 is_admin: null permissions: + - 'access content overview' - 'access contextual links' - 'access in-place editing' - 'create article content' - 'create blog content' - - 'create page content' - 'create people content' - - 'delete own article content' - - 'delete own blog content' - - 'delete own page content' - - 'delete own people content' - 'edit own article content' - 'edit own blog content' - 'edit own comments' @@ -26,5 +22,5 @@ permissions: - 'edit own people content' - 'edit terms in tags' - 'skip comment approval' - - 'use exclude node title' + - 'use text format full_html' - 'view the administration theme' diff --git a/config/sync/user.role.editor.yml b/config/sync/user.role.editor.yml index 721b46e..5ccf896 100644 --- a/config/sync/user.role.editor.yml +++ b/config/sync/user.role.editor.yml @@ -30,8 +30,7 @@ permissions: - 'delete all revisions' - 'revert all revisions' - 'skip comment approval' - - 'use exclude node title' - - 'use text format restricted_html' + - 'use text format full_html' - 'view all revisions' - 'view own unpublished content' - 'view the administration theme' From d06c13e351162f4161db4beed5de2096804bc27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 24 Sep 2019 08:49:14 -0400 Subject: [PATCH 234/865] drop permissions from roles to-be-dropped --- config/sync/user.role.content_administrator.yml | 11 ----------- config/sync/user.role.invited_blogger.yml | 1 - config/sync/user.role.proofreader.yml | 4 ---- 3 files changed, 16 deletions(-) diff --git a/config/sync/user.role.content_administrator.yml b/config/sync/user.role.content_administrator.yml index 62bab2b..3abef09 100644 --- a/config/sync/user.role.content_administrator.yml +++ b/config/sync/user.role.content_administrator.yml @@ -12,7 +12,6 @@ permissions: - 'access all panels' - 'access comments' - 'access content' - - 'access content overview' - 'access contextual links' - 'access forward' - 'access library reports' @@ -26,39 +25,30 @@ permissions: - 'access textimages' - 'access tinymce' - 'access toolbar' - - 'administer blocks' - 'administer boxes' - 'administer comments' - 'administer custom content' - 'administer disqus' - 'administer forums' - 'administer menu' - - 'administer nodes' - 'administer pathauto' - 'administer statistics' - 'administer taxonomy' - - 'administer url aliases' - - 'bypass node access' - 'change own username' - - 'create blog content' - 'create blog entries' - 'create content_document content' - 'create content_event content' - 'create forum content' - 'create forum content' - 'create link content' - - 'create page content' - 'create pages' - 'create stories' - 'create story content' - - 'create url aliases' - 'create weblinks' - - 'delete any blog content' - 'delete any content_document content' - 'delete any content_event content' - 'delete any forum content' - 'delete any link content' - - 'delete any page content' - 'delete any story content' - 'delete own blog content' - 'delete own content_document content' @@ -141,7 +131,6 @@ permissions: - 'unflag slider' - 'upload files' - 'use advanced search' - - 'use exclude node title' - 'use text format 3' - 'view files' - 'view revisions' diff --git a/config/sync/user.role.invited_blogger.yml b/config/sync/user.role.invited_blogger.yml index 09de64e..c6ba79c 100644 --- a/config/sync/user.role.invited_blogger.yml +++ b/config/sync/user.role.invited_blogger.yml @@ -39,7 +39,6 @@ permissions: - 'toggle disqus comments' - 'translate interface' - 'upload files' - - 'use exclude node title' - 'use text format 3' - 'view files' - 'view own unpublished content' diff --git a/config/sync/user.role.proofreader.yml b/config/sync/user.role.proofreader.yml index 5e3989a..aefb6b3 100644 --- a/config/sync/user.role.proofreader.yml +++ b/config/sync/user.role.proofreader.yml @@ -8,15 +8,12 @@ weight: 0 is_admin: null permissions: - 'access administration pages' - - 'access content overview' - 'access contextual links' - 'access overlay' - 'access site-wide contact form' - 'access toolbar' - 'administer menu' - - 'administer nodes' - 'administer statistics' - - 'bypass node access' - 'edit any blog content' - 'edit any content_document content' - 'edit any content_event content' @@ -37,7 +34,6 @@ permissions: - 'toggle disqus comments' - 'translate interface' - 'use advanced search' - - 'use exclude node title' - 'use text format 3' - 'view files' - 'view revisions' From adbcac20abd4fc3aebceaf701eea29d733c90467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 24 Sep 2019 08:52:18 -0400 Subject: [PATCH 235/865] Update text format access. Try to just give everyone who edits content full html --- config/sync/user.role.manager.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/sync/user.role.manager.yml b/config/sync/user.role.manager.yml index 6dd35a9..07441e6 100644 --- a/config/sync/user.role.manager.yml +++ b/config/sync/user.role.manager.yml @@ -41,8 +41,7 @@ permissions: - 'edit gdpr_checklist checklistapi checklist' - 'revert all revisions' - 'skip comment approval' - - 'use exclude node title' - - 'use text format restricted_html' + - 'use text format full_html' - 'view all revisions' - 'view own unpublished content' - 'view the administration theme' From ce446778ad369fd67091eb4506e86802be7945f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Tue, 24 Sep 2019 09:57:26 -0400 Subject: [PATCH 236/865] Update collection display todo bring this in at drutopia/drutopia_collection#1 --- ...tity_view_display.node.collection.full.yml | 23 +++++++++++-------- ....paragraph.drutopia_collection.default.yml | 13 +++++++---- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/config/sync/core.entity_view_display.node.collection.full.yml b/config/sync/core.entity_view_display.node.collection.full.yml index e03d9fc..899c37e 100644 --- a/config/sync/core.entity_view_display.node.collection.full.yml +++ b/config/sync/core.entity_view_display.node.collection.full.yml @@ -5,6 +5,7 @@ dependencies: config: - core.entity_view_mode.node.full - field.field.node.collection.body + - field.field.node.collection.comment - field.field.node.collection.field_authors - field.field.node.collection.field_body_paragraph - field.field.node.collection.field_collection_items @@ -17,8 +18,8 @@ dependencies: - node.type.collection module: - ds + - entity_reference_revisions - image - - paragraphs - text - user third_party_settings: @@ -47,12 +48,12 @@ third_party_settings: - node_post_date - field_authors - field_collection_type - - field_body_paragraph - field_topics - field_tags right: - field_summary - field_collection_items + - field_body_paragraph fields: node_post_date: plugin_id: node_post_date @@ -75,14 +76,16 @@ content: type: entity_reference_label region: left field_body_paragraph: - type: paragraph_summary - weight: 4 - region: left + type: entity_reference_revisions_entity_view + weight: 8 + region: right label: hidden - settings: { } + settings: + view_mode: default + link: '' third_party_settings: { } field_collection_items: - weight: 8 + weight: 7 label: hidden settings: view_mode: teaser @@ -110,7 +113,7 @@ content: type: image region: header field_summary: - weight: 7 + weight: 6 label: hidden settings: { } third_party_settings: { } @@ -118,7 +121,7 @@ content: region: right field_tags: type: entity_reference_label - weight: 6 + weight: 5 region: left label: visually_hidden settings: @@ -126,7 +129,7 @@ content: third_party_settings: { } field_topics: type: entity_reference_label - weight: 5 + weight: 4 region: left label: visually_hidden settings: diff --git a/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml b/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml index e02949c..bd0efe9 100644 --- a/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml +++ b/config/sync/core.entity_view_display.paragraph.drutopia_collection.default.yml @@ -5,6 +5,8 @@ dependencies: config: - field.field.paragraph.drutopia_collection.field_items - paragraphs.paragraphs_type.drutopia_collection + module: + - ds id: paragraph.drutopia_collection.default targetEntityType: paragraph bundle: drutopia_collection @@ -12,11 +14,14 @@ mode: default content: field_items: weight: 0 - label: above + label: hidden settings: - link: true - third_party_settings: { } - type: entity_reference_label + view_mode: card + link: false + third_party_settings: + ds: + ds_limit: '' + type: entity_reference_entity_view region: content hidden: search_api_excerpt: true From cd41f613ab25e2758ffe1b02169cf9cf5d46132e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 28 Sep 2019 10:46:27 -0400 Subject: [PATCH 237/865] No migrating permissions period ever good lord are you trying to drive me insane @gnuget?? :-P --- .../migrations/upgrade_d7_user_role.yml | 54 ------------------- 1 file changed, 54 deletions(-) delete mode 100644 web/modules/custom/geo_upgrade/migrations/upgrade_d7_user_role.yml diff --git a/web/modules/custom/geo_upgrade/migrations/upgrade_d7_user_role.yml b/web/modules/custom/geo_upgrade/migrations/upgrade_d7_user_role.yml deleted file mode 100644 index a7076f7..0000000 --- a/web/modules/custom/geo_upgrade/migrations/upgrade_d7_user_role.yml +++ /dev/null @@ -1,54 +0,0 @@ -langcode: en -status: true -dependencies: { } -id: upgrade_d7_user_role -class: Drupal\migrate\Plugin\Migration -field_plugin_method: null -cck_plugin_method: null -migration_tags: - - 'Drupal 7' - - Configuration -migration_group: migrate_drupal_7_geo -label: 'User roles' -source: - plugin: d7_user_role -process: - id: - - - plugin: machine_name - source: name - - - plugin: user_update_8002 - label: - - - plugin: get - source: name - permissions: - - - plugin: static_map - source: permissions - bypass: true - map: - 'use PHP for block visibility': 'use PHP for settings' - 'administer site-wide contact form': 'administer contact forms' - 'post comments without approval': 'skip comment approval' - 'edit own blog entries': 'edit own blog content' - 'edit any blog entry': 'edit any blog content' - 'delete own blog entries': 'delete own blog content' - 'delete any blog entry': 'delete any blog content' - 'create forum topics': 'create forum content' - 'delete any forum topic': 'delete any forum content' - 'delete own forum topics': 'delete own forum content' - 'edit any forum topic': 'edit any forum content' - 'edit own forum topics': 'edit own forum content' - - - plugin: flatten - weight: - - - plugin: get - source: weight -destination: - plugin: 'entity:user_role' -migration_dependencies: - optional: { } - required: { } From fdc2a0900fef2a0f7ec4464b8f52f7e16bdb5573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 28 Sep 2019 16:13:22 -0400 Subject: [PATCH 238/865] Start a custom citations module Looked into using bibcite - https://www.drupal.org/project/bibcite but it a) wasn't designed for citing originally published articles and b) did not document it's alleged API at all. If it's not documented, it's not an API, sorry. --- web/modules/custom/geo_citation/geo_citation.info.yml | 7 +++++++ web/modules/custom/geo_citation/geo_citation.module | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 web/modules/custom/geo_citation/geo_citation.info.yml create mode 100644 web/modules/custom/geo_citation/geo_citation.module diff --git a/web/modules/custom/geo_citation/geo_citation.info.yml b/web/modules/custom/geo_citation/geo_citation.info.yml new file mode 100644 index 0000000..c39639d --- /dev/null +++ b/web/modules/custom/geo_citation/geo_citation.info.yml @@ -0,0 +1,7 @@ +name: "GEO Citations" +description: "Formatted credit line for Grassroots Economic Organizing collective's original articles." +type: module +core: 8.x +dependencies: + - drutopia_article +package: Custom diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module new file mode 100644 index 0000000..50cce95 --- /dev/null +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -0,0 +1,3 @@ + Date: Sat, 28 Sep 2019 18:32:05 -0400 Subject: [PATCH 239/865] Caught between saving data and doing this on view, leaning toward on view --- .../custom/geo_citation/geo_citation.module | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index 50cce95..cda6778 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -1,3 +1,33 @@ field_article_type->getValue(); + // If it's not a GEO Original article, there's nothing for us to do. + if (!$article_type == 6) { + return; + } +} +/** + * Implements hook_entity_extra_field_info(). + */ +function geo_citation_entity_extra_field_info() { + $extra = []; + $extra['node']['article']['display']['geo_citation'] = [ + 'label' => t('GEO Citation'), + 'description' => t('Re-presents title, author, date and other information in a standard citeable format.'), + 'weight' => 90, + ]; + return $extra; +} + +/** + * Implements hook_ENTITY_TYPE_view() for Drutopia articles. + */ +function geo_citation_article_view(array &$build, \Drupal\Core\Entity\EntityInterface $entity, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display, $view_mode) { + +} From c7b0b011b1a64245c3a7f3eb7f38a6d65ca70fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 28 Sep 2019 18:32:24 -0400 Subject: [PATCH 240/865] Allow DDEV to work without internet --- .ddev/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 4b0ba34..067991c 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -12,7 +12,7 @@ additional_fqdns: [] mariadb_version: "10.2" nfs_mount_enabled: false provider: default -use_dns_when_possible: true +use_dns_when_possible: false timezone: "" From ec351cb728ea08929859e6a72729d6d6a5216955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 28 Sep 2019 20:52:06 -0400 Subject: [PATCH 241/865] Add xdebug configuration for PHPSTORM --- .ddev/config.yaml | 2 +- .ddev/php/xdebug.ini | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .ddev/php/xdebug.ini diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 067991c..6027b76 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -6,7 +6,7 @@ php_version: "7.2" webserver_type: nginx-fpm router_http_port: "80" router_https_port: "443" -xdebug_enabled: false +xdebug_enabled: true additional_hostnames: [] additional_fqdns: [] mariadb_version: "10.2" diff --git a/.ddev/php/xdebug.ini b/.ddev/php/xdebug.ini new file mode 100644 index 0000000..700931f --- /dev/null +++ b/.ddev/php/xdebug.ini @@ -0,0 +1,2 @@ +[XDebug] +xdebug.idekey = PHPSTORM From 1ea467041075d0820e43584802becd07ba80edb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 28 Sep 2019 22:58:55 -0400 Subject: [PATCH 242/865] Get a pretty good draft of our citation section --- .../custom/geo_citation/geo_citation.module | 68 ++++++++++++++++++- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index cda6778..ec35b2d 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -26,8 +26,72 @@ function geo_citation_entity_extra_field_info() { } /** - * Implements hook_ENTITY_TYPE_view() for Drutopia articles. + * Implements hook_ENTITY_TYPE_view() for nodes. */ -function geo_citation_article_view(array &$build, \Drupal\Core\Entity\EntityInterface $entity, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display, $view_mode) { +function geo_citation_node_view(array &$build, \Drupal\Core\Entity\EntityInterface $entity, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display, $view_mode) { + // This will only exist for the Drutopia article content type but don't think we need to check first. + if ($display->getComponent('geo_citation')) { + $build['geo_citation'] = [ + '#markup' => geo_citation_pseudo_field($entity), + '#theme' => 'geo_citation_field', + ]; + } } + +/** + * Implements hook_theme(). + * + * We intentionally choose to do the citation in one big lump, because our + * expectation for making this more flexible would be to plug into bibcite or + * other citation API, rather than making it easy to re-theme this custom data. + * +function geo_citation_theme($existing, $type, $theme, $path) { + return [ + 'geo_citation_field' => [ + 'variables' => [ + 'citation' => '', + ] + ] + ] +} + * ...and it turns out giving theming capability to our pseudofield is optional. + */ + +/** + * Assemble and return our citation as already-marked-up HTML. + */ +function geo_citation_pseudo_field($entity) { + $markup = ''; + $article_type = $entity->field_article_type->getValue(); + // If it's not a GEO Original article, there's nothing for us to do. + if (!isset($article_type[0]) || $article_type[0]['target_id'] != '303') { + return $markup; + } + + $authors = $entity->field_authors->getValue(); + $date = $entity->field_publication_date->value; + $year = substr($date, 0, 4); + $title = $entity->title->value; + $subtitle = $entity->field_subtitle->value; + $url = $entity->toUrl()->setAbsolute()->toString(); + + $markup .= '
'; + + $tooltip = t("When citing this article, please use the following format:") + $markup .= '

' . t("Citations") . '

'; + + $markup .= '

'; + $markup .= "$authors ($year).  $title"; + if ($subtitle) { + $markup .= ":  $subtitle"; + } + $markup .= ".  "; + $markup .= t("Grassroots Economic Organizing (GEO)."); + $markup .= "  $url"; + $markup .= '

'; + + $markup .= '
'; + + return $markup; +} From 1d142d8437a77edfcf43ea8ab8cc694eed02dcf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 28 Sep 2019 23:36:42 -0400 Subject: [PATCH 243/865] Re-position editor's content edit tabs .. to where it should always have been, and should not require ID-targeting to put it back, ugh. --- web/themes/custom/geofresco/src/global/overrides.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/overrides.scss b/web/themes/custom/geofresco/src/global/overrides.scss index 874304f..7abc1c2 100644 --- a/web/themes/custom/geofresco/src/global/overrides.scss +++ b/web/themes/custom/geofresco/src/global/overrides.scss @@ -20,6 +20,11 @@ } */ +#block-geofresco-local-tasks { + position: relative; + top: -1.5rem; +} + .footer { background-image: url('/themes/custom/geofresco/images/grassland-wark-forest.jpg'); background-position: center; From a984702fc09c21a3c2a624cdf9a3ea27e81a79d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 28 Sep 2019 23:37:00 -0400 Subject: [PATCH 244/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/overrides.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/themes/custom/geofresco/dist/css/overrides.css b/web/themes/custom/geofresco/dist/css/overrides.css index 9cfef7f..5ede7ee 100644 --- a/web/themes/custom/geofresco/dist/css/overrides.css +++ b/web/themes/custom/geofresco/dist/css/overrides.css @@ -12,6 +12,10 @@ padding-top: 1.5rem; } */ +#block-geofresco-local-tasks { + position: relative; + top: -1.5rem; } + .footer { background-image: url("/themes/custom/geofresco/images/grassland-wark-forest.jpg"); background-position: center; From d3d09f56ca6b7b469336da7a8006f74b73050d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 10:19:41 -0400 Subject: [PATCH 245/865] Document corrected (not assuming a single value field) check for GEO Original term Ref #10 --- web/modules/custom/geo_citation/geo_citation.module | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index ec35b2d..3125819 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -63,9 +63,15 @@ function geo_citation_theme($existing, $type, $theme, $path) { */ function geo_citation_pseudo_field($entity) { $markup = ''; - $article_type = $entity->field_article_type->getValue(); - // If it's not a GEO Original article, there's nothing for us to do. - if (!isset($article_type[0]) || $article_type[0]['target_id'] != '303') { + + // This returns a numerically-indexed array of arrays with little in them + // except the taxonomy term 'target_id' as a stringified number. + $article_types = $entity->field_article_type->getValue(); + // This looks for the index matching 'GEO Original' (term ID 303), which will + // often be zero when it's the only selected article type, so we must be sure + // to test for a false identity and not accidentally reject zero. + if (array_search('303', array_column($article_types, 'target_id')) === FALSE) { + // If it's not a GEO Original article, we do not add a citation. return $markup; } From c58fa4b7a8e2b70411069e4a639bcc60ade90870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 10:20:35 -0400 Subject: [PATCH 246/865] Give citation title classes, have URL link, and get spacing just perfect Ref #10 --- web/modules/custom/geo_citation/geo_citation.module | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index 3125819..8d9f971 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -84,17 +84,17 @@ function geo_citation_pseudo_field($entity) { $markup .= '
'; - $tooltip = t("When citing this article, please use the following format:") - $markup .= '

' . t("Citations") . '

'; + $tooltip = t("When citing this article, please use the following format:"); + $markup .= '

' . t("Citations") . '

'; $markup .= '

'; - $markup .= "$authors ($year).  $title"; + $markup .= "$authors ($year).  $title"; if ($subtitle) { - $markup .= ":  $subtitle"; + $markup .= ":  $subtitle"; } - $markup .= ".  "; + $markup .= ".  "; $markup .= t("Grassroots Economic Organizing (GEO)."); - $markup .= "  $url"; + $markup .= "  $url'"; $markup .= '

'; $markup .= '
'; From 4ddfa5fc7c81ac6b9572409d9d78609fc8bed5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 10:21:38 -0400 Subject: [PATCH 247/865] Comment out unused theme function suggestion --- web/modules/custom/geo_citation/geo_citation.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index 8d9f971..3cfad5c 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -33,7 +33,7 @@ function geo_citation_node_view(array &$build, \Drupal\Core\Entity\EntityInterfa if ($display->getComponent('geo_citation')) { $build['geo_citation'] = [ '#markup' => geo_citation_pseudo_field($entity), - '#theme' => 'geo_citation_field', +// '#theme' => 'geo_citation_field', ]; } From c584a088fb840f8fdd8c641fcd6c9d73306cef26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:20:57 -0400 Subject: [PATCH 248/865] Correctly get the author, at least when only one --- web/modules/custom/geo_citation/geo_citation.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index 3cfad5c..7dbd575 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -75,7 +75,7 @@ function geo_citation_pseudo_field($entity) { return $markup; } - $authors = $entity->field_authors->getValue(); + $authors = $entity->field_authors->entity->title->value; $date = $entity->field_publication_date->value; $year = substr($date, 0, 4); $title = $entity->title->value; From a21b35e850bd69e16d95cb5215b9fde8d3b3b5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:21:30 -0400 Subject: [PATCH 249/865] Add generic term for one part of a column, to use in styling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'The term ‘drum’ is used to describe the individual circular sections places, one on top of another, to construct the shaft of the column.' --- web/modules/custom/geo_citation/geo_citation.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index 7dbd575..945507d 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -82,7 +82,7 @@ function geo_citation_pseudo_field($entity) { $subtitle = $entity->field_subtitle->value; $url = $entity->toUrl()->setAbsolute()->toString(); - $markup .= '
'; + $markup .= '
'; $tooltip = t("When citing this article, please use the following format:"); $markup .= '

' . t("Citations") . '

'; From 56f26ddc22cd0f91109902e357dd3cb4e575c46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:22:00 -0400 Subject: [PATCH 250/865] Fix IDE-caused typo of extra quotation mark --- web/modules/custom/geo_citation/geo_citation.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index 945507d..f3399c3 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -94,7 +94,7 @@ function geo_citation_pseudo_field($entity) { } $markup .= ".  "; $markup .= t("Grassroots Economic Organizing (GEO)."); - $markup .= "  $url'"; + $markup .= "  $url"; $markup .= '

'; $markup .= '
'; From 2b7d77800446ba95a60f3e0fb650131126ca09cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:23:17 -0400 Subject: [PATCH 251/865] Start giving extra spacing below 'drums', sections of columns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The term ‘drum’ is used to describe the individual circular sections places, one on top of another, to construct the shaft of the column. --- web/themes/custom/geofresco/src/global/_elements.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss index 9155b90..7def15e 100644 --- a/web/themes/custom/geofresco/src/global/_elements.scss +++ b/web/themes/custom/geofresco/src/global/_elements.scss @@ -53,3 +53,8 @@ .image-inline { margin: 1em; } + + +.drum { + margin-bottom: 1.2rem; +} From 661127438152509406ab5ece03d1794a6f5951f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:44:07 -0400 Subject: [PATCH 252/865] Try to get damn Bulma to stop screwing with title margin bottoms --- web/themes/custom/geofresco/src/global/overrides.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/overrides.scss b/web/themes/custom/geofresco/src/global/overrides.scss index 7abc1c2..9916ab0 100644 --- a/web/themes/custom/geofresco/src/global/overrides.scss +++ b/web/themes/custom/geofresco/src/global/overrides.scss @@ -31,3 +31,7 @@ height: 40rem; background-size: cover; } + +.title:not(:last-child) { + margin-bottom: inherit; +} From 852a7c5644da05d45e47c0f99553d79fc42dc937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:44:32 -0400 Subject: [PATCH 253/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 3 +++ web/themes/custom/geofresco/dist/css/overrides.css | 3 +++ 2 files changed, 6 insertions(+) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index 961aae0..ce12fff 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -3089,6 +3089,9 @@ a.tag:hover { .image-inline { margin: 1em; } +.drum { + margin-bottom: 1.2rem; } + .input, .textarea, .select select { background-color: white; border-color: #dbdbdb; diff --git a/web/themes/custom/geofresco/dist/css/overrides.css b/web/themes/custom/geofresco/dist/css/overrides.css index 5ede7ee..94eb9c2 100644 --- a/web/themes/custom/geofresco/dist/css/overrides.css +++ b/web/themes/custom/geofresco/dist/css/overrides.css @@ -21,3 +21,6 @@ background-position: center; height: 40rem; background-size: cover; } + +.title:not(:last-child) { + margin-bottom: inherit; } From bd26b9abc32fbc97098b12cb6564046efb935545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:48:07 -0400 Subject: [PATCH 254/865] Try again in a way that sort of works, but not really --- web/themes/custom/geofresco/src/global/overrides.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/global/overrides.scss b/web/themes/custom/geofresco/src/global/overrides.scss index 9916ab0..b4a037c 100644 --- a/web/themes/custom/geofresco/src/global/overrides.scss +++ b/web/themes/custom/geofresco/src/global/overrides.scss @@ -33,5 +33,5 @@ } .title:not(:last-child) { - margin-bottom: inherit; + margin-bottom: initial; } From 135bea54dcbebcb6be8556fa895b991bebdae98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:50:06 -0400 Subject: [PATCH 255/865] Take control of title class bottom margin --- web/themes/custom/geofresco/src/global/overrides.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/global/overrides.scss b/web/themes/custom/geofresco/src/global/overrides.scss index b4a037c..a70e8a5 100644 --- a/web/themes/custom/geofresco/src/global/overrides.scss +++ b/web/themes/custom/geofresco/src/global/overrides.scss @@ -32,6 +32,9 @@ background-size: cover; } +/* The not last child stuff is needed to prevent some crazy Bulma rule that + sets a margin of 1.5rem on bloody everything not last child. */ +.title, .title:not(:last-child) { - margin-bottom: initial; + margin-bottom: 0.5em; } From ab29670bb263d1abbb8d42d9b38e5045e410172d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 12:50:22 -0400 Subject: [PATCH 256/865] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/overrides.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/dist/css/overrides.css b/web/themes/custom/geofresco/dist/css/overrides.css index 94eb9c2..a9d8448 100644 --- a/web/themes/custom/geofresco/dist/css/overrides.css +++ b/web/themes/custom/geofresco/dist/css/overrides.css @@ -22,5 +22,8 @@ height: 40rem; background-size: cover; } +/* The not last child stuff is needed to prevent some crazy Bulma rule that + sets a margin of 1.5rem on bloody everything not last child. */ +.title, .title:not(:last-child) { - margin-bottom: inherit; } + margin-bottom: 0.5em; } From 724e4c6d3f2855fd1f8c2ce58d28146b1b45fc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 13:37:15 -0400 Subject: [PATCH 257/865] Unrequire and remove non-paragraph item listing from collection Ref #43 --- ...y_form_display.node.collection.default.yml | 34 +++++++------------ ...node.collection.field_collection_items.yml | 2 +- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/config/sync/core.entity_form_display.node.collection.default.yml b/config/sync/core.entity_form_display.node.collection.default.yml index fe385f4..c7fb5c1 100644 --- a/config/sync/core.entity_form_display.node.collection.default.yml +++ b/config/sync/core.entity_form_display.node.collection.default.yml @@ -32,14 +32,14 @@ bundle: collection mode: default content: comment: - weight: 26 + weight: 16 settings: { } third_party_settings: { } type: comment_default region: content created: type: datetime_timestamp - weight: 13 + weight: 12 region: content settings: { } third_party_settings: { } @@ -54,7 +54,7 @@ content: region: content field_body_paragraph: type: entity_reference_paragraphs - weight: 6 + weight: 5 region: content settings: title: Paragraph @@ -64,15 +64,6 @@ content: form_display_mode: default default_paragraph_type: _none third_party_settings: { } - field_collection_items: - weight: 5 - settings: - match_operator: CONTAINS - size: 60 - placeholder: '' - third_party_settings: { } - type: entity_reference_autocomplete - region: content field_collection_type: weight: 1 settings: { } @@ -88,7 +79,7 @@ content: type: image_image region: content field_meta_tags: - weight: 10 + weight: 9 settings: { } third_party_settings: { } type: metatag_firehose @@ -102,7 +93,7 @@ content: type: text_textarea region: content field_tags: - weight: 8 + weight: 7 settings: match_operator: CONTAINS size: 60 @@ -111,7 +102,7 @@ content: type: entity_reference_autocomplete region: content field_topics: - weight: 7 + weight: 6 settings: force_deepest: '1' parent: '0' @@ -121,7 +112,7 @@ content: region: content path: type: path - weight: 11 + weight: 10 region: content settings: { } third_party_settings: { } @@ -129,21 +120,21 @@ content: type: boolean_checkbox settings: display_label: true - weight: 15 + weight: 14 region: content third_party_settings: { } status: type: boolean_checkbox settings: display_label: true - weight: 16 + weight: 15 region: content third_party_settings: { } sticky: type: boolean_checkbox settings: display_label: true - weight: 14 + weight: 13 region: content third_party_settings: { } title: @@ -156,7 +147,7 @@ content: third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 9 + weight: 8 settings: match_operator: CONTAINS size: 60 @@ -164,9 +155,10 @@ content: region: content third_party_settings: { } url_redirects: - weight: 12 + weight: 11 region: content settings: { } third_party_settings: { } hidden: body: true + field_collection_items: true diff --git a/config/sync/field.field.node.collection.field_collection_items.yml b/config/sync/field.field.node.collection.field_collection_items.yml index 3fda3fe..3ed9585 100644 --- a/config/sync/field.field.node.collection.field_collection_items.yml +++ b/config/sync/field.field.node.collection.field_collection_items.yml @@ -13,7 +13,7 @@ entity_type: node bundle: collection label: Items description: 'Select any other content on the site to display as a list of teasers by typing words from the title and looking for the autocompletion of the content you want in the collection. You can change the order after adding each item.' -required: true +required: false translatable: false default_value: { } default_value_callback: '' From d6673f81ba484a4b752998c4682155551e0a7ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 13:39:49 -0400 Subject: [PATCH 258/865] Enable GEO citation custom module & configure pseudofield display ... also drop all the deleted separate topic fields from footer display config --- ...re.entity_view_display.node.article.full.yml | 17 ++++++++--------- config/sync/core.extension.yml | 1 + 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/sync/core.entity_view_display.node.article.full.yml b/config/sync/core.entity_view_display.node.article.full.yml index d2235aa..7200614 100644 --- a/config/sync/core.entity_view_display.node.article.full.yml +++ b/config/sync/core.entity_view_display.node.article.full.yml @@ -57,15 +57,9 @@ third_party_settings: - field_article_type - field_topics - field_tags + - geo_citation - comment - links - footer: - - field_practices_tools_strategies - - field_movements_struggles - - field_institutions_structures - - field_economic_sectors - - field_regions - - field_visions_models fields: node_post_date: plugin_id: node_post_date @@ -82,7 +76,7 @@ content: comment: label: above type: comment_default - weight: 8 + weight: 9 settings: pager_id: 0 view_mode: default @@ -150,8 +144,13 @@ content: settings: link: true third_party_settings: { } + geo_citation: + weight: 8 + region: right + settings: { } + third_party_settings: { } links: - weight: 9 + weight: 10 region: right settings: { } third_party_settings: { } diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 9db74d0..197b066 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -59,6 +59,7 @@ module: fixed_block_content: 0 focal_point: 0 gdpr: 0 + geo_citation: 0 geo_upgrade: 0 hal: 0 help: 0 From 88cf38a9902c1b6d5803f25ff09a84db5529d0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 13:40:16 -0400 Subject: [PATCH 259/865] Commit config sync --- ...config_sync.module.drutopia_collection.yml | 182 ++++++++++++++++++ ...apshot.config_sync.module.geo_citation.yml | 11 ++ 2 files changed, 193 insertions(+) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.geo_citation.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.drutopia_collection.yml b/config/sync/config_snapshot.snapshot.config_sync.module.drutopia_collection.yml index f0419fd..5d3a4e7 100644 --- a/config/sync/config_snapshot.snapshot.config_sync.module.drutopia_collection.yml +++ b/config/sync/config_snapshot.snapshot.config_sync.module.drutopia_collection.yml @@ -159,6 +159,33 @@ items: third_party_settings: { } hidden: body: true + - + collection: '' + name: core.entity_form_display.paragraph.drutopia_collection.default + data: + langcode: en + status: true + dependencies: + config: + - field.field.paragraph.drutopia_collection.field_items + - paragraphs.paragraphs_type.drutopia_collection + id: paragraph.drutopia_collection.default + targetEntityType: paragraph + bundle: drutopia_collection + mode: default + content: + field_items: + weight: 0 + settings: + match_operator: CONTAINS + size: 60 + placeholder: '' + third_party_settings: { } + type: entity_reference_autocomplete + region: content + hidden: + created: true + status: true - collection: '' name: core.entity_view_display.node.collection.default @@ -432,6 +459,31 @@ items: region: content hidden: search_api_excerpt: true + - + collection: '' + name: core.entity_view_display.paragraph.drutopia_collection.default + data: + langcode: en + status: true + dependencies: + config: + - field.field.paragraph.drutopia_collection.field_items + - paragraphs.paragraphs_type.drutopia_collection + id: paragraph.drutopia_collection.default + targetEntityType: paragraph + bundle: drutopia_collection + mode: default + content: + field_items: + weight: 0 + label: above + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: content + hidden: + search_api_excerpt: true - collection: '' name: field.field.node.collection.body @@ -489,6 +541,65 @@ items: auto_create: false auto_create_bundle: '' field_type: entity_reference + - + collection: '' + name: field.field.node.collection.field_body_paragraph + data: + langcode: en + status: true + dependencies: + config: + - field.storage.node.field_body_paragraph + - node.type.collection + - paragraphs.paragraphs_type.drutopia_collection + - paragraphs.paragraphs_type.image + - paragraphs.paragraphs_type.text + module: + - entity_reference_revisions + id: node.collection.field_body_paragraph + field_name: field_body_paragraph + entity_type: node + bundle: collection + label: 'Body paragraph' + description: '' + required: false + translatable: true + default_value: { } + default_value_callback: '' + settings: + handler: 'default:paragraph' + handler_settings: + negate: 0 + target_bundles: + drutopia_collection: drutopia_collection + image: image + text: text + target_bundles_drag_drop: + drutopia_collection: + enabled: true + weight: 9 + faq: + weight: 10 + enabled: false + file: + weight: 11 + enabled: false + image: + enabled: true + weight: 12 + slide: + weight: 13 + enabled: false + text: + enabled: true + weight: 14 + update: + weight: 15 + enabled: false + video: + weight: 16 + enabled: false + field_type: entity_reference_revisions - collection: '' name: field.field.node.collection.field_collection_items @@ -702,6 +813,42 @@ items: auto_create: false auto_create_bundle: '' field_type: entity_reference + - + collection: '' + name: field.field.paragraph.drutopia_collection.field_items + data: + langcode: en + status: true + dependencies: + config: + - field.storage.paragraph.field_items + - node.type.article + - node.type.blog + - node.type.people + - paragraphs.paragraphs_type.drutopia_collection + id: paragraph.drutopia_collection.field_items + field_name: field_items + entity_type: paragraph + bundle: drutopia_collection + label: Items + description: 'Select any other content on the site to display as a list of teasers by typing words from the title and looking for the autocompletion of the content you want in the collection. You can change the order after adding each item.' + required: true + translatable: false + default_value: { } + default_value_callback: '' + settings: + handler: 'default:node' + handler_settings: + target_bundles: + article: article + blog: blog + people: people + sort: + field: changed + direction: DESC + auto_create: false + auto_create_bundle: article + field_type: entity_reference - collection: '' name: field.storage.node.field_collection_items @@ -747,6 +894,29 @@ items: indexes: { } persist_with_no_fields: false custom_storage: false + - + collection: '' + name: field.storage.paragraph.field_items + data: + langcode: en + status: true + dependencies: + module: + - node + - paragraphs + id: paragraph.field_items + field_name: field_items + entity_type: paragraph + type: entity_reference + settings: + target_type: node + module: core + locked: false + cardinality: -1 + translatable: true + indexes: { } + persist_with_no_fields: false + custom_storage: false - collection: '' name: node.type.collection @@ -768,6 +938,18 @@ items: new_revision: true preview_mode: 1 display_submitted: false + - + collection: '' + name: paragraphs.paragraphs_type.drutopia_collection + data: + langcode: en + status: true + dependencies: { } + id: drutopia_collection + label: Collection + icon_uuid: null + description: 'Allows grouping referenced content together. For instance, an Issue collection could use collection paragraphs to group articles into three themes within that issue.' + behavior_plugins: { } - collection: '' name: taxonomy.vocabulary.collection_type diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.geo_citation.yml b/config/sync/config_snapshot.snapshot.config_sync.module.geo_citation.yml new file mode 100644 index 0000000..ea5b97c --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.geo_citation.yml @@ -0,0 +1,11 @@ +uuid: 0bfcde9c-b413-4ee6-ab85-c4c823b7b0cf +langcode: en +status: true +dependencies: + module: + - geo_citation +id: config_sync.module.geo_citation +snapshotSet: config_sync +extensionType: module +extensionName: geo_citation +items: { } From 6aecd53ae7460abe2085d71b6534d6b1b7f2bf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 13:40:38 -0400 Subject: [PATCH 260/865] Make citation title a little less prominent --- web/modules/custom/geo_citation/geo_citation.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index f3399c3..7f54e7b 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -85,7 +85,7 @@ function geo_citation_pseudo_field($entity) { $markup .= '
'; $tooltip = t("When citing this article, please use the following format:"); - $markup .= '

' . t("Citations") . '

'; + $markup .= '
' . t("Citations") . '
'; $markup .= '

'; $markup .= "$authors ($year).  $title"; From 91a83b091bc09ee097de388d52a1e7b56bf56c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 13:41:39 -0400 Subject: [PATCH 261/865] Make tooltip text a little clearer --- web/modules/custom/geo_citation/geo_citation.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index 7f54e7b..22bf574 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -84,7 +84,7 @@ function geo_citation_pseudo_field($entity) { $markup .= '

'; - $tooltip = t("When citing this article, please use the following format:"); + $tooltip = t("When citing this article, please use this format."); $markup .= '
' . t("Citations") . '
'; $markup .= '

'; From e2c5de47f10f5760461ba8ff9522bee187ec51a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 14:48:01 -0400 Subject: [PATCH 262/865] Copy over template from Octavia --- .../custom/geofresco/src/templates/layout/ds-1col.html.twig | 1 + 1 file changed, 1 insertion(+) create mode 100644 web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig diff --git a/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig b/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig new file mode 100644 index 0000000..fa68a1f --- /dev/null +++ b/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig @@ -0,0 +1 @@ +{% extends "@ds/ds-1col.html.twig" %} \ No newline at end of file From d537a8dc9e4f44c84091620d08471e52a45abee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 14:55:34 -0400 Subject: [PATCH 263/865] Copy directly from display suite module so we can actually change something --- .../src/templates/layout/ds-1col.html.twig | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig b/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig index fa68a1f..5dcdfb4 100644 --- a/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig @@ -1 +1,18 @@ -{% extends "@ds/ds-1col.html.twig" %} \ No newline at end of file +{# +/** + * @file + * Display Suite 1 column template. + * + * Available variables: + * - ds_content_wrapper: wrapper around content + * - attributes: content region attributes + * - ds_content: content region + */ +#} +<{{ ds_content_wrapper }}{{ attributes.addClass('ds-1col', 'clearfix') }}> + + {{ title_suffix.contextual_links }} + + {{ ds_content }} + + From dabce158c90c14c81723341163f477906eceec08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 15:50:16 -0400 Subject: [PATCH 264/865] Provide alternate background if no image Ref #33 --- .../geofresco/src/templates/layout/ds-1col.html.twig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig b/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig index 5dcdfb4..3833854 100644 --- a/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig @@ -13,6 +13,12 @@ {{ title_suffix.contextual_links }} - {{ ds_content }} + {% set image = ds_content.field_image|render %} + {% if image %} + {{ image }} + {% else %} +

+ {% endif %} + {{ ds_content|without('field_image') }} From c90472d785698125d96c943f7aa75514ca33500c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 16:22:33 -0400 Subject: [PATCH 265/865] Show related content block on article, blog, gleaning etc. pages --- ...elated_content_block_related_content_2.yml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 config/sync/block.block.views_block__related_content_block_related_content_2.yml diff --git a/config/sync/block.block.views_block__related_content_block_related_content_2.yml b/config/sync/block.block.views_block__related_content_block_related_content_2.yml new file mode 100644 index 0000000..09e61b8 --- /dev/null +++ b/config/sync/block.block.views_block__related_content_block_related_content_2.yml @@ -0,0 +1,42 @@ +uuid: 69eaf1b9-f9ed-44ab-a28c-a35091ac2595 +langcode: en +status: true +dependencies: + config: + - views.view.related_content + module: + - block_visibility_groups + - node + - views + theme: + - geofresco +id: views_block__related_content_block_related_content_2 +theme: geofresco +region: content_bottom +weight: 0 +provider: null +plugin: 'views_block:related_content-block_related_content' +settings: + id: 'views_block:related_content-block_related_content' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: none + context_mapping: { } +visibility: + condition_group: + id: condition_group + negate: false + block_visibility_group: '' + context_mapping: { } + node_type: + id: node_type + bundles: + article: article + blog: blog + collection: collection + gleaning: gleaning + negate: false + context_mapping: + node: '@node.node_route_context:node' From baec194fc70a0f8ba764c849fb5b33413bb4133a Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Sun, 29 Sep 2019 17:16:55 -0400 Subject: [PATCH 266/865] Add collection card config --- ...tity_view_display.node.collection.card.yml | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 config/sync/core.entity_view_display.node.collection.card.yml diff --git a/config/sync/core.entity_view_display.node.collection.card.yml b/config/sync/core.entity_view_display.node.collection.card.yml new file mode 100644 index 0000000..dc09e9b --- /dev/null +++ b/config/sync/core.entity_view_display.node.collection.card.yml @@ -0,0 +1,115 @@ +uuid: fd726346-9c58-4db8-91f8-0e974db1a9d4 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.card + - field.field.node.collection.body + - field.field.node.collection.comment + - field.field.node.collection.field_authors + - field.field.node.collection.field_body_paragraph + - field.field.node.collection.field_collection_items + - field.field.node.collection.field_collection_type + - field.field.node.collection.field_image + - field.field.node.collection.field_meta_tags + - field.field.node.collection.field_summary + - field.field.node.collection.field_tags + - field.field.node.collection.field_topics + - node.type.collection + module: + - ds + - field_group + - responsive_image + - user +third_party_settings: + ds: + layout: + id: ds_1col + library: null + disable_css: false + entity_classes: all_classes + settings: + wrappers: + ds_content: div + outer_wrapper: div + attributes: '' + link_attribute: '' + link_custom: '' + classes: + layout_class: { } + regions: + ds_content: + - node_title + - field_image + - group_card_content + - field_authors + - node_post_date + fields: + node_post_date: + plugin_id: node_post_date + weight: 6 + label: hidden + formatter: ds_post_date_long + node_title: + plugin_id: node_title + weight: 0 + label: hidden + formatter: default + field_group: + group_card_content: + children: + - node_title + - field_image + - field_authors + - node_post_date + parent_name: '' + weight: 1 + format_type: html_element + format_settings: + id: '' + classes: '' + element: div + show_label: false + label_element: h3 + label_element_classes: '' + attributes: '' + effect: none + speed: fast + label: 'card content' + region: hidden +_core: + default_config_hash: VdRPCswDeQt_699xq5eV44VFlk9cve4hp9aTbmY4qIM +id: node.collection.card +targetEntityType: node +bundle: collection +mode: card +content: + field_authors: + weight: 5 + label: hidden + settings: + link: true + third_party_settings: { } + type: entity_reference_label + region: ds_content + field_image: + type: responsive_image + weight: 0 + region: ds_content + label: hidden + settings: + responsive_image_style: '' + image_link: '' + third_party_settings: { } +hidden: + body: true + comment: true + field_body_paragraph: true + field_collection_items: true + field_collection_type: true + field_meta_tags: true + field_summary: true + field_tags: true + field_topics: true + links: true + search_api_excerpt: true From 8d81631929cf80fdc3deffb6c97451a168c08da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 17:11:42 -0400 Subject: [PATCH 267/865] Ensure update 1col template only applies to cards --- .../layout/{ds-1col.html.twig => ds--1col--node-card.html.twig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename web/themes/custom/geofresco/src/templates/layout/{ds-1col.html.twig => ds--1col--node-card.html.twig} (100%) diff --git a/web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig b/web/themes/custom/geofresco/src/templates/layout/ds--1col--node-card.html.twig similarity index 100% rename from web/themes/custom/geofresco/src/templates/layout/ds-1col.html.twig rename to web/themes/custom/geofresco/src/templates/layout/ds--1col--node-card.html.twig From 20ddda78650a910fe89adfcea7c3f8ef35c907ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 17:18:04 -0400 Subject: [PATCH 268/865] Unlink URL in citation; it's always on the same page --- web/modules/custom/geo_citation/geo_citation.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/geo_citation/geo_citation.module b/web/modules/custom/geo_citation/geo_citation.module index 22bf574..8c5f3e8 100644 --- a/web/modules/custom/geo_citation/geo_citation.module +++ b/web/modules/custom/geo_citation/geo_citation.module @@ -94,7 +94,7 @@ function geo_citation_pseudo_field($entity) { } $markup .= ".  "; $markup .= t("Grassroots Economic Organizing (GEO)."); - $markup .= "  $url"; + $markup .= "  $url"; $markup .= '

'; $markup .= '
'; From 9d18571bbc58428c075e398159af85233a74311e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 17:18:37 -0400 Subject: [PATCH 269/865] Start to set correct colors for image-less cards by content types --- web/themes/custom/geofresco/src/global/_layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index 426e4b8..676a315 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -58,6 +58,7 @@ background-color: $blog; } +.background-replacement-for-no-image, .page--content-item--collection .background-replacement-for-no-image { background-color: $collection; } From 0e02a241c5ceab68070edaa76d96640a60d9af96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 17:26:01 -0400 Subject: [PATCH 270/865] Update collection card config to more closely resemble article --- .../sync/core.entity_view_display.node.collection.card.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/sync/core.entity_view_display.node.collection.card.yml b/config/sync/core.entity_view_display.node.collection.card.yml index dc09e9b..6b422f2 100644 --- a/config/sync/core.entity_view_display.node.collection.card.yml +++ b/config/sync/core.entity_view_display.node.collection.card.yml @@ -49,12 +49,16 @@ third_party_settings: plugin_id: node_post_date weight: 6 label: hidden - formatter: ds_post_date_long + formatter: ds_post_date_month_day_year node_title: plugin_id: node_title weight: 0 label: hidden formatter: default + settings: + link: true + wrapper: h2 + class: '' field_group: group_card_content: children: From 1262491e13b79cb9a7b8c6d8193fb8c04331db0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 21:56:43 -0400 Subject: [PATCH 271/865] Add patch to fix display suite's bloody broken template suggestions --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 5caa9b5..ffb738a 100644 --- a/composer.json +++ b/composer.json @@ -93,6 +93,9 @@ "drupal/drutopia_core": { "Remove default content": "patches/drutopia-core-remove-default-content.patch" }, + "drupal/ds": { + "Template suggestions does not work": "https://www.drupal.org/files/issues/2018-08-27/2887778-9.patch" + }, "drupal/migrate_tools": { "The limit option does not accept a value": "https://www.drupal.org/files/issues/2019-02-05/migrate-tools_fix-drush-options_3024399-23.patch" } From a9c6cd1cd27519e5561d2e6cc55f1024fdab147a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 22:33:45 -0400 Subject: [PATCH 272/865] Move to a template suggestion that isn't broken See https://www.drupal.org/project/ds/issues/2887778 --- ...ds--1col--node-card.html.twig => ds-1col--node-card.html.twig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename web/themes/custom/geofresco/src/templates/layout/{ds--1col--node-card.html.twig => ds-1col--node-card.html.twig} (100%) diff --git a/web/themes/custom/geofresco/src/templates/layout/ds--1col--node-card.html.twig b/web/themes/custom/geofresco/src/templates/layout/ds-1col--node-card.html.twig similarity index 100% rename from web/themes/custom/geofresco/src/templates/layout/ds--1col--node-card.html.twig rename to web/themes/custom/geofresco/src/templates/layout/ds-1col--node-card.html.twig From e03a2caa753add4d58b2853b3fbf192bec5484c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 22:35:42 -0400 Subject: [PATCH 273/865] Add card class that Octavia added, before we overrode --- .../geofresco/src/templates/layout/ds-1col--node-card.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/templates/layout/ds-1col--node-card.html.twig b/web/themes/custom/geofresco/src/templates/layout/ds-1col--node-card.html.twig index 3833854..70e3eda 100644 --- a/web/themes/custom/geofresco/src/templates/layout/ds-1col--node-card.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/ds-1col--node-card.html.twig @@ -9,7 +9,7 @@ * - ds_content: content region */ #} -<{{ ds_content_wrapper }}{{ attributes.addClass('ds-1col', 'clearfix') }}> +<{{ ds_content_wrapper }}{{ attributes.addClass('ds-1col', 'card', 'clearfix') }}> {{ title_suffix.contextual_links }} From a039bb672ea8feac564f5d21b1906fce3a1b8702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sun, 29 Sep 2019 22:44:16 -0400 Subject: [PATCH 274/865] Use development version of our twigsuggest module --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ffb738a..26655ee 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "drupal/migrate_tools": "^4.1", "drupal/migrate_upgrade": "^3", "drupal/scn": "^1.1", - "drupal/twigsuggest": "^1.0@alpha", + "drupal/twigsuggest": "dev-8.x-1.x as 1.x-dev", "drupal/webform": "^5.4", "drush/drush": "^9.0", "drutopia/drutopia": "^1.0-beta2" @@ -53,6 +53,10 @@ "drupal/classitup": { "type": "git", "url": "git@git.drupal.org:project/classitup.git" + }, + "drupal/twigsuggest": { + "type": "git", + "url": "git@gitlab.com:agaric/drupal/twigsuggest.git" } }, "scripts": { From 4e182eba8e53755b92430d57965d6fdd7c9aab9e Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Sun, 29 Sep 2019 23:17:54 -0400 Subject: [PATCH 275/865] Update and simplify deployment instructions --- README.md | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index b072dd4..cc41668 100644 --- a/README.md +++ b/README.md @@ -77,24 +77,18 @@ Note: The migration will partially fail because of missing files. For now, re-ru ## Running the migration on the hosted instance -1. Ensure the files you need are uploaded to the server. Obtain the latest from the prior site: database, and files. Upload these to the server (e.g. `scp *.gz geo_live@drutopia.org:`) and we'll extract them there. -1. If a deployment has been performed already, it must be moved out of the way by removing existing databases. Log into the server (`ssh geo_live@drutopia.org`) and remove the database(s): - - Start the mysql client (logged into geo_live): `mysql` - - Drop the drupal db: `drop database geo_live;` - - Drop the migration source db: `drop database geo_legacy;` - - Exit mysql by typing `ctrl+d` -1. Extract the uploaded files (still on server): - - Unzip the uploaded database file (this expects there to be only ONE such file): `gunzip *.mysql.gz` - - Rename the database file: `mv *.mysql geo_legacy.sql` - - Unpack the files, but first cd to where they go (again, there should only be ONE file ending in .tar.gz in home): `cd site/d7/sites/default/files/` and untar: `tar xzf ~/*.tar.gz` (this will take a minute/two). +1. Refresh files and database from live. + - Obtain the latest from the prior site via [Migrate and Backup](http://geo.coop/admin/config/system/backup_migrate): database, and public files, as two separate downloads. The following commands assume the files saved as `files.tar.gz` and `database.sql.gz` + - Upload these to the server: `scp *.gz geo_live@drutopia.org:` + - SSH to server: `ssh geo_live@drutopia.org` + - Unzip the uploaded database file: `gunzip database.sql.gz` + - Drop the existing tables: `drop-tables.sh geo_legacy` + - Reload the uploaded database: `mysql geo_legacy < database.sql` + - Change to the files folder and untar them: `cd site/d7/sites/default/files/` and then: `tar xzf ~/files.tar.gz` (this will take a couple minutes). - The server side is ready! Log off by typing `ctrl+d` -1. Now perform a deployment with drutopia_hosting. This will install the site using the minimal profile and existing config: - - `ahoy deploy-build news` - - `ahoy deploy-site geo_live` -1. Return to the server (`ssh geo_live@drutopia.org`), load legacy db and run the migration: - - Read the db source into the proper database: `mysql geo_legacy < geo_legacy.sql` - - `drush mim --group="migrate_drupal_7_geo"` - - `drush php:script article_type_term.php` +1. Now perform a deployment with drutopia_hosting. This will install the site using the minimal profile and existing config. Set the vars accordingly (drupal_install and drupal_forceinstall must be True), if needed: `ahoy vault-edit` + - Deploy a new build, as needed: `ahoy deploy-build news` + - Deploy the site. With a forced re-install, a migration will be performed automatically: `ahoy deploy-site geo_live` ## Post go-live tasks From b2dbe2677a1a96bf1973d99b4a39fbc7a618175b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 30 Sep 2019 08:40:23 -0400 Subject: [PATCH 276/865] Require noreferrer module for safer blank-targeted links --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 26655ee..3e89424 100644 --- a/composer.json +++ b/composer.json @@ -31,6 +31,7 @@ "drupal/migrate_source_csv": "3.1", "drupal/migrate_tools": "^4.1", "drupal/migrate_upgrade": "^3", + "drupal/noreferrer": "^1.7", "drupal/scn": "^1.1", "drupal/twigsuggest": "dev-8.x-1.x as 1.x-dev", "drupal/webform": "^5.4", From ee353b3276109b607a8f5de57bf00b682aca173e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 30 Sep 2019 08:54:59 -0400 Subject: [PATCH 277/865] Enable and configure noreferrer/noopener privacy/security module Ref #46 --- config/sync/core.extension.yml | 1 + config/sync/noreferrer.settings.yml | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 config/sync/noreferrer.settings.yml diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 197b066..9b9c8da 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -78,6 +78,7 @@ module: migrate_source_csv: 0 migrate_tools: 0 node: 0 + noreferrer: 0 options: 0 page_cache: 0 path: 0 diff --git a/config/sync/noreferrer.settings.yml b/config/sync/noreferrer.settings.yml new file mode 100644 index 0000000..eaf0228 --- /dev/null +++ b/config/sync/noreferrer.settings.yml @@ -0,0 +1,7 @@ +noopener: true +noreferrer: true +publish: false +subscribe_url: '' +whitelisted_domains: 'agaric.coop geo.coop usworker.coop' +_core: + default_config_hash: J8vFVOimVVtQZ_8aFYgcn6DJgdwMtVwwjZzXTe_nhOA From a19eafadce4e1cbaa1051d36428d67f1059f0132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 30 Sep 2019 08:55:11 -0400 Subject: [PATCH 278/865] Commit config snapshot --- ...snapshot.config_sync.module.noreferrer.yml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.noreferrer.yml diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.noreferrer.yml b/config/sync/config_snapshot.snapshot.config_sync.module.noreferrer.yml new file mode 100644 index 0000000..ca8f8ef --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.noreferrer.yml @@ -0,0 +1,20 @@ +uuid: 021d84b8-4bba-43c6-9b63-3eb62b51ca86 +langcode: en +status: true +dependencies: + module: + - noreferrer +id: config_sync.module.noreferrer +snapshotSet: config_sync +extensionType: module +extensionName: noreferrer +items: + - + collection: '' + name: noreferrer.settings + data: + noopener: true + noreferrer: true + publish: false + subscribe_url: '' + whitelisted_domains: '' From 04be0a5e7a28baac89fb0fe763b8d461c2882760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 30 Sep 2019 10:31:45 -0400 Subject: [PATCH 279/865] Commit auto-add of geo citation field settings --- config/sync/core.entity_view_display.node.article.box.yml | 7 ++++++- config/sync/core.entity_view_display.node.article.card.yml | 5 +++++ .../sync/core.entity_view_display.node.article.default.yml | 5 +++++ .../sync/core.entity_view_display.node.article.media.yml | 5 +++++ config/sync/core.entity_view_display.node.article.rss.yml | 5 +++++ .../core.entity_view_display.node.article.search_index.yml | 5 +++++ .../core.entity_view_display.node.article.simple_card.yml | 5 +++++ .../sync/core.entity_view_display.node.article.teaser.yml | 5 +++++ 8 files changed, 41 insertions(+), 1 deletion(-) diff --git a/config/sync/core.entity_view_display.node.article.box.yml b/config/sync/core.entity_view_display.node.article.box.yml index 9107bb7..f882f20 100644 --- a/config/sync/core.entity_view_display.node.article.box.yml +++ b/config/sync/core.entity_view_display.node.article.box.yml @@ -59,7 +59,12 @@ id: node.article.box targetEntityType: node bundle: article mode: box -content: { } +content: + geo_citation: + weight: 90 + settings: { } + third_party_settings: { } + region: content hidden: body: true comment: true diff --git a/config/sync/core.entity_view_display.node.article.card.yml b/config/sync/core.entity_view_display.node.article.card.yml index 2341f8b..b63f13d 100644 --- a/config/sync/core.entity_view_display.node.article.card.yml +++ b/config/sync/core.entity_view_display.node.article.card.yml @@ -108,6 +108,11 @@ content: third_party_settings: ds: ds_limit: '1' + geo_citation: + weight: 90 + settings: { } + third_party_settings: { } + region: content hidden: body: true comment: true diff --git a/config/sync/core.entity_view_display.node.article.default.yml b/config/sync/core.entity_view_display.node.article.default.yml index 4fea98f..fda41a5 100644 --- a/config/sync/core.entity_view_display.node.article.default.yml +++ b/config/sync/core.entity_view_display.node.article.default.yml @@ -53,6 +53,11 @@ content: third_party_settings: { } type: file_default region: content + geo_citation: + weight: 90 + settings: { } + third_party_settings: { } + region: content hidden: body: true comment: true diff --git a/config/sync/core.entity_view_display.node.article.media.yml b/config/sync/core.entity_view_display.node.article.media.yml index f4735fc..bb8f85c 100644 --- a/config/sync/core.entity_view_display.node.article.media.yml +++ b/config/sync/core.entity_view_display.node.article.media.yml @@ -114,6 +114,11 @@ content: settings: link: true third_party_settings: { } + geo_citation: + weight: 90 + settings: { } + third_party_settings: { } + region: content hidden: body: true comment: true diff --git a/config/sync/core.entity_view_display.node.article.rss.yml b/config/sync/core.entity_view_display.node.article.rss.yml index 99b6190..5c525fd 100644 --- a/config/sync/core.entity_view_display.node.article.rss.yml +++ b/config/sync/core.entity_view_display.node.article.rss.yml @@ -85,6 +85,11 @@ content: label: inline settings: { } third_party_settings: { } + geo_citation: + weight: 90 + settings: { } + third_party_settings: { } + region: content links: weight: 4 region: ds_content diff --git a/config/sync/core.entity_view_display.node.article.search_index.yml b/config/sync/core.entity_view_display.node.article.search_index.yml index 76d13cb..c05a1c4 100644 --- a/config/sync/core.entity_view_display.node.article.search_index.yml +++ b/config/sync/core.entity_view_display.node.article.search_index.yml @@ -99,6 +99,11 @@ content: settings: link: true third_party_settings: { } + geo_citation: + weight: 90 + settings: { } + third_party_settings: { } + region: content hidden: body: true comment: true diff --git a/config/sync/core.entity_view_display.node.article.simple_card.yml b/config/sync/core.entity_view_display.node.article.simple_card.yml index 0b7c0d7..8053951 100644 --- a/config/sync/core.entity_view_display.node.article.simple_card.yml +++ b/config/sync/core.entity_view_display.node.article.simple_card.yml @@ -99,6 +99,11 @@ content: third_party_settings: ds: ds_limit: '1' + geo_citation: + weight: 90 + settings: { } + third_party_settings: { } + region: content hidden: body: true comment: true diff --git a/config/sync/core.entity_view_display.node.article.teaser.yml b/config/sync/core.entity_view_display.node.article.teaser.yml index 5a18c1b..1c97e7d 100644 --- a/config/sync/core.entity_view_display.node.article.teaser.yml +++ b/config/sync/core.entity_view_display.node.article.teaser.yml @@ -103,6 +103,11 @@ content: settings: link: true third_party_settings: { } + geo_citation: + weight: 90 + settings: { } + third_party_settings: { } + region: content hidden: body: true comment: true From 53f145c66c67f576c4d4046be7c50a26e7e12cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 30 Sep 2019 11:41:41 -0400 Subject: [PATCH 280/865] Require Linkit module --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 3e89424..0ad1aaf 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "drupal/fixed_block_content": "^1.0", "drupal/honeypot": "^1.29", "drupal/link_attributes": "^1.9", + "drupal/linkit": "^4.3", "drupal/mailchimp": "^1.10", "drupal/menu_link_config": "^1.0@alpha", "drupal/migrate_plus": "^4.2", From 78cf5d734e288c97bde193045fb334186b15c33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 30 Sep 2019 11:42:00 -0400 Subject: [PATCH 281/865] Include patch to fix Claro dropdowns --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 0ad1aaf..eb33d35 100644 --- a/composer.json +++ b/composer.json @@ -90,6 +90,9 @@ }, "enable-patching": true, "patches": { + "drupal/claro": { + "Broken Dropdown prevents Save": "https://www.drupal.org/files/issues/2019-09-18/broken-dropbutton-3079128.patch" + }, "drupal/core": { "Allow an install hook in profiles installing from configuration": "https://www.drupal.org/files/issues/2018-11-27/2982052-22.patch" }, From a18796a766c7f93c7b31ff9b89c5b4726e484454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 30 Sep 2019 11:48:01 -0400 Subject: [PATCH 282/865] Enable and configure Link It module and related --- config/sync/core.extension.yml | 1 + config/sync/editor.editor.basic_html.yml | 8 ++++-- config/sync/editor.editor.full_html.yml | 10 +++++--- config/sync/filter.format.basic_html.yml | 4 +-- config/sync/filter.format.full_html.yml | 18 ++++++++++++- config/sync/filter.format.plain_text.yml | 2 +- config/sync/filter.format.restricted_html.yml | 2 +- .../image.style.linkit_result_thumbnail.yml | 17 +++++++++++++ config/sync/linkit.linkit_profile.default.yml | 25 +++++++++++++++++++ 9 files changed, 77 insertions(+), 10 deletions(-) create mode 100644 config/sync/image.style.linkit_result_thumbnail.yml create mode 100644 config/sync/linkit.linkit_profile.default.yml diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 9b9c8da..72ef506 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -68,6 +68,7 @@ module: image: 0 layout_discovery: 0 link: 0 + linkit: 0 mailchimp: 0 menu_block: 0 menu_ui: 0 diff --git a/config/sync/editor.editor.basic_html.yml b/config/sync/editor.editor.basic_html.yml index 482a71e..c968091 100644 --- a/config/sync/editor.editor.basic_html.yml +++ b/config/sync/editor.editor.basic_html.yml @@ -43,13 +43,17 @@ settings: items: - Source plugins: + language: + language_list: un stylescombo: styles: '' + linkit: + linkit_profile: '' image_upload: status: true scheme: public directory: inline-images max_size: '' max_dimensions: - width: 0 - height: 0 + width: null + height: null diff --git a/config/sync/editor.editor.full_html.yml b/config/sync/editor.editor.full_html.yml index 07ba896..5c54a5d 100644 --- a/config/sync/editor.editor.full_html.yml +++ b/config/sync/editor.editor.full_html.yml @@ -27,7 +27,7 @@ settings: - name: Linking items: - - DrupalLink + - Linkit - DrupalUnlink - name: Lists @@ -51,13 +51,17 @@ settings: - ShowBlocks - Source plugins: + language: + language_list: un stylescombo: styles: '' + linkit: + linkit_profile: default image_upload: status: true scheme: public directory: inline-images max_size: '' max_dimensions: - width: 0 - height: 0 + width: null + height: null diff --git a/config/sync/filter.format.basic_html.yml b/config/sync/filter.format.basic_html.yml index 3d880f8..99a5403 100644 --- a/config/sync/filter.format.basic_html.yml +++ b/config/sync/filter.format.basic_html.yml @@ -8,7 +8,7 @@ _core: default_config_hash: 73bBl0mQ4I5Md9_FoI1V9MErX_I6ykC9gNKwLqb80Ko name: 'Basic HTML' format: basic_html -weight: 0 +weight: -9 filters: filter_html: id: filter_html @@ -16,7 +16,7 @@ filters: status: true weight: -10 settings: - allowed_html: '