From d59cb7fdec44941dafbbc48d93e09024a55a9002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 09:17:46 -0400 Subject: [PATCH 01/12] Style the slogan --- .../custom/geofresco/src/global/_elements.scss | 13 +++++++++++++ web/themes/custom/geofresco/src/global/global.scss | 1 + .../geofresco/src/templates/layout/page.html.twig | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss index de95395..c85c75e 100644 --- a/web/themes/custom/geofresco/src/global/_elements.scss +++ b/web/themes/custom/geofresco/src/global/_elements.scss @@ -50,3 +50,16 @@ font-size: 22px; padding-top: 18px; } + +.slogan { + position: relative; + top: -36px; + height: 36px; + z-index: 30; + display: flex; + .title { + color: $green-gray; + font-size: 1.2rem; + margin: auto; + } +} diff --git a/web/themes/custom/geofresco/src/global/global.scss b/web/themes/custom/geofresco/src/global/global.scss index 5ca0c70..ab9a268 100644 --- a/web/themes/custom/geofresco/src/global/global.scss +++ b/web/themes/custom/geofresco/src/global/global.scss @@ -5,6 +5,7 @@ $blue: #4391E0; $red: #a70c20; $light-green: #65AB1F; $green: #478D00; +$green-gray: #8FB489; // Update Bulma's global variables. $primary: $green; 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 36b95fe..ce7b47d 100644 --- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig +++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig @@ -37,7 +37,7 @@ {{ parent() }} {% endblock navbar %} {% block header %} -
{{ site_slogan }}
+

{{ site_slogan }}

{% block header_and_search %} {% if page.header %} From fee3d941dc6dad1f42640a274d8d0f4cbafc10aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 09:17:57 -0400 Subject: [PATCH 02/12] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index ff6a513..ff4a017 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -3083,6 +3083,19 @@ a.tag:hover { font-size: 22px; padding-top: 18px; } +.slogan { + position: relative; + top: -36px; + height: 36px; + z-index: 30; + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + .slogan .title { + color: #8FB489; + font-size: 1.2rem; + margin: auto; } + .input, .textarea, .select select { background-color: white; border-color: #dbdbdb; From bf29ec6416c8543daf46c4b79e9c26ceabbdf682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 09:18:48 -0400 Subject: [PATCH 03/12] Add the tiniest tweak because bottoms of letters carry less weight than tops of letters --- web/themes/custom/geofresco/src/global/_elements.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss index c85c75e..077c8ea 100644 --- a/web/themes/custom/geofresco/src/global/_elements.scss +++ b/web/themes/custom/geofresco/src/global/_elements.scss @@ -58,6 +58,8 @@ z-index: 30; display: flex; .title { + position: relative; + top: 2px; color: $green-gray; font-size: 1.2rem; margin: auto; From f31e4aac6c0258b2be5c730909b3d420cde1df7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 12:34:15 -0400 Subject: [PATCH 04/12] No menu for articles, i mean it this time! --- config/sync/node.type.article.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/sync/node.type.article.yml b/config/sync/node.type.article.yml index eac85fd..8d82ac7 100644 --- a/config/sync/node.type.article.yml +++ b/config/sync/node.type.article.yml @@ -1,7 +1,13 @@ uuid: 9c4edacb-83e1-447b-a25e-93264c1cd018 langcode: en status: true -dependencies: { } +dependencies: + module: + - menu_ui +third_party_settings: + menu_ui: + available_menus: { } + parent: '' _core: default_config_hash: AeW1SEDgb1OTQACAWGhzvMknMYAJlcZu0jljfeU3oso name: Article From 752a80326d36455dc9a8d98b4e1ed2d6f550a47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 12:34:50 -0400 Subject: [PATCH 05/12] Default to unpublished for articles --- ...ase_field_override.node.article.status.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 config/sync/core.base_field_override.node.article.status.yml diff --git a/config/sync/core.base_field_override.node.article.status.yml b/config/sync/core.base_field_override.node.article.status.yml new file mode 100644 index 0000000..db9195f --- /dev/null +++ b/config/sync/core.base_field_override.node.article.status.yml @@ -0,0 +1,22 @@ +uuid: df7cd0d9-09bc-4673-892c-8fa2c54c1530 +langcode: en +status: true +dependencies: + config: + - node.type.article +id: node.article.status +field_name: status +entity_type: node +bundle: article +label: Published +description: '' +required: false +translatable: true +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean From c91362dc54410f57930b12c4886db64283aa4e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 13:17:31 -0400 Subject: [PATCH 06/12] Disable preview, enable revisions, and default to unpublished for all content types --- ...e.base_field_override.node.blog.status.yml | 22 +++++++++++++++++++ ...se_field_override.node.gleaning.status.yml | 22 +++++++++++++++++++ ...e.base_field_override.node.page.status.yml | 22 +++++++++++++++++++ ...base_field_override.node.people.status.yml | 22 +++++++++++++++++++ config/sync/node.type.article.yml | 2 +- config/sync/node.type.blog.yml | 4 ++-- config/sync/node.type.gleaning.yml | 4 ++-- config/sync/node.type.page.yml | 2 +- config/sync/node.type.people.yml | 2 +- 9 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 config/sync/core.base_field_override.node.blog.status.yml create mode 100644 config/sync/core.base_field_override.node.gleaning.status.yml create mode 100644 config/sync/core.base_field_override.node.page.status.yml create mode 100644 config/sync/core.base_field_override.node.people.status.yml diff --git a/config/sync/core.base_field_override.node.blog.status.yml b/config/sync/core.base_field_override.node.blog.status.yml new file mode 100644 index 0000000..9c0730b --- /dev/null +++ b/config/sync/core.base_field_override.node.blog.status.yml @@ -0,0 +1,22 @@ +uuid: e8723a9c-07b4-4830-ae58-33ddfc638ffa +langcode: en +status: true +dependencies: + config: + - node.type.blog +id: node.blog.status +field_name: status +entity_type: node +bundle: blog +label: Published +description: '' +required: false +translatable: true +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/config/sync/core.base_field_override.node.gleaning.status.yml b/config/sync/core.base_field_override.node.gleaning.status.yml new file mode 100644 index 0000000..fff59dd --- /dev/null +++ b/config/sync/core.base_field_override.node.gleaning.status.yml @@ -0,0 +1,22 @@ +uuid: 4cf8492a-ca92-4c87-ac26-181193dbeec6 +langcode: en +status: true +dependencies: + config: + - node.type.gleaning +id: node.gleaning.status +field_name: status +entity_type: node +bundle: gleaning +label: Published +description: '' +required: false +translatable: true +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/config/sync/core.base_field_override.node.page.status.yml b/config/sync/core.base_field_override.node.page.status.yml new file mode 100644 index 0000000..82eaa6f --- /dev/null +++ b/config/sync/core.base_field_override.node.page.status.yml @@ -0,0 +1,22 @@ +uuid: c699ca82-26f3-4a26-bad5-7df13b9e4b6b +langcode: en +status: true +dependencies: + config: + - node.type.page +id: node.page.status +field_name: status +entity_type: node +bundle: page +label: Published +description: '' +required: false +translatable: true +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/config/sync/core.base_field_override.node.people.status.yml b/config/sync/core.base_field_override.node.people.status.yml new file mode 100644 index 0000000..475418c --- /dev/null +++ b/config/sync/core.base_field_override.node.people.status.yml @@ -0,0 +1,22 @@ +uuid: 61438e3a-2e6a-4439-a0ef-20888b2ff51d +langcode: en +status: true +dependencies: + config: + - node.type.people +id: node.people.status +field_name: status +entity_type: node +bundle: people +label: Published +description: '' +required: false +translatable: true +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/config/sync/node.type.article.yml b/config/sync/node.type.article.yml index 8d82ac7..26a1f11 100644 --- a/config/sync/node.type.article.yml +++ b/config/sync/node.type.article.yml @@ -15,5 +15,5 @@ type: article description: 'Use articles for time-sensitive content like news, press releases or blog posts.' help: '' new_revision: true -preview_mode: 1 +preview_mode: 0 display_submitted: true diff --git a/config/sync/node.type.blog.yml b/config/sync/node.type.blog.yml index 9a6cb5a..485ab46 100644 --- a/config/sync/node.type.blog.yml +++ b/config/sync/node.type.blog.yml @@ -15,6 +15,6 @@ name: Blog type: blog description: 'Use blog for personal or journal-like posts.' help: '' -new_revision: false -preview_mode: 1 +new_revision: true +preview_mode: 0 display_submitted: true diff --git a/config/sync/node.type.gleaning.yml b/config/sync/node.type.gleaning.yml index e811f16..f2424a4 100644 --- a/config/sync/node.type.gleaning.yml +++ b/config/sync/node.type.gleaning.yml @@ -13,6 +13,6 @@ name: Gleaning type: gleaning description: 'A gleaning is a quick link to material posted somewhere else online. It should have a title, a link, and can also have a comment. ' help: '' -new_revision: false -preview_mode: 1 +new_revision: true +preview_mode: 0 display_submitted: false diff --git a/config/sync/node.type.page.yml b/config/sync/node.type.page.yml index 4af3eb8..b8f54cb 100644 --- a/config/sync/node.type.page.yml +++ b/config/sync/node.type.page.yml @@ -17,5 +17,5 @@ type: page description: 'Use basic pages for your static content, such as an ''About us'' page.' help: '' new_revision: true -preview_mode: 1 +preview_mode: 0 display_submitted: false diff --git a/config/sync/node.type.people.yml b/config/sync/node.type.people.yml index 76a3fa7..7f8c340 100644 --- a/config/sync/node.type.people.yml +++ b/config/sync/node.type.people.yml @@ -16,5 +16,5 @@ type: people description: 'Use people content type for people such as staff, volunteers, contributors.' help: '' new_revision: true -preview_mode: 1 +preview_mode: 0 display_submitted: false From 8c09b8f0d1829e87bf9511ba3761470f2cd36273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 13:24:31 -0400 Subject: [PATCH 07/12] Hack to show only first image if multiple for blogs --- config/sync/core.entity_view_display.node.blog.full.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 a3430b7..dfe16da 100644 --- a/config/sync/core.entity_view_display.node.blog.full.yml +++ b/config/sync/core.entity_view_display.node.blog.full.yml @@ -106,7 +106,9 @@ content: settings: responsive_image_style: wide image_link: '' - third_party_settings: { } + third_party_settings: + ds: + ds_limit: '1' type: responsive_image region: header field_tags: From b409f56e8d679e244eb1d82d95c38fe6654e7c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 13:25:32 -0400 Subject: [PATCH 08/12] Hack to only show first image if multiple on blogs --- config/sync/core.entity_view_display.node.article.full.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 aed3b50..8e4b5fa 100644 --- a/config/sync/core.entity_view_display.node.article.full.yml +++ b/config/sync/core.entity_view_display.node.article.full.yml @@ -138,7 +138,9 @@ content: settings: responsive_image_style: wide image_link: '' - third_party_settings: { } + third_party_settings: + ds: + ds_limit: '1' label: visually_hidden region: header field_institutions_structures: From e0c3dd5cadba1205de06efccf237ed43c576537c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 14:45:47 -0400 Subject: [PATCH 09/12] Allow article type to be multivalue --- config/sync/field.storage.node.field_article_type.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/field.storage.node.field_article_type.yml b/config/sync/field.storage.node.field_article_type.yml index 29dbf67..0c3c681 100644 --- a/config/sync/field.storage.node.field_article_type.yml +++ b/config/sync/field.storage.node.field_article_type.yml @@ -15,7 +15,7 @@ settings: target_type: taxonomy_term module: core locked: false -cardinality: 1 +cardinality: -1 translatable: true indexes: { } persist_with_no_fields: false From 55e5935b42aa102903c4724590dbc3b59e51b598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 14:47:01 -0400 Subject: [PATCH 10/12] Add field token value (a better, non-PHP-dangerous, computed field) module --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7d365be..1526be7 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ "drupal/migrate_tools": "^4.1", "drupal/config_actions": "1.x-dev", "drupal/convert_bundles": "^1.0@alpha", - "drupal/drutopia_collection": "^1.0@alpha" + "drupal/drutopia_collection": "^1.0@alpha", + "drupal/field_token_value": "^1.0" }, "repositories": { "drupal": { From 702c2361d8c19d760c94e7da20c86100bdff454f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 14:47:14 -0400 Subject: [PATCH 11/12] Update composer lock file --- composer.lock | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 499bce9..3edf895 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": "b03aebc622e464e94a8a9daac90b1737", + "content-hash": "c599c4440653c0c90f0151d0684fa35a", "packages": [ { "name": "asm89/stack-cors", @@ -5990,6 +5990,54 @@ "source": "https://git.drupalcode.org/project/field_group" } }, + { + "name": "drupal/field_token_value", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/field_token_value.git", + "reference": "8.x-1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/field_token_value-8.x-1.0.zip", + "reference": "8.x-1.0", + "shasum": "ba0c70108ca09589b9fa2ecce4c7a7194cdca897" + }, + "require": { + "drupal/core": "~8.0", + "drupal/token": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.0", + "datestamp": "1503548344", + "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": "haydent", + "homepage": "https://www.drupal.org/user/2763191" + } + ], + "description": "Provides a field allowing the value to be set using a string containing tokens.", + "homepage": "https://www.drupal.org/project/field_token_value", + "support": { + "source": "https://git.drupalcode.org/project/field_token_value" + } + }, { "name": "drupal/focal_point", "version": "1.0.0", @@ -6542,6 +6590,9 @@ "services": { "drush.services.yml": "^9" } + }, + "patches_applied": { + "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" } }, "notification-url": "https://packages.drupal.org/8/downloads", From eac7c6e941b80b1f62e9d2158c5214291d673c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 14:47:24 -0400 Subject: [PATCH 12/12] Enable Field Token Value --- 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 4ac3918..11cd345 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -47,6 +47,7 @@ module: faqfield: 0 field: 0 field_group: 0 + field_token_value: 0 field_ui: 0 file: 0 filter: 0