From 2b5bfbad556173d5fc0adfd22300518132b2155a Mon Sep 17 00:00:00 2001 From: Mel Wong Date: Wed, 27 Oct 2021 14:09:09 -0700 Subject: [PATCH 1/2] SRL-523: linkit security update & robotstxt uninstall --- composer-manifest.yaml | 5 +- composer.json | 1 - composer.lock | 86 +++----------------- config/config-default/core.extension.yml | 1 - config/config-default/robotstxt.settings.yml | 3 - 5 files changed, 15 insertions(+), 81 deletions(-) delete mode 100644 config/config-default/robotstxt.settings.yml diff --git a/composer-manifest.yaml b/composer-manifest.yaml index 344386fa..7557b1c1 100644 --- a/composer-manifest.yaml +++ b/composer-manifest.yaml @@ -82,7 +82,7 @@ packages: drupal/honeypot: 1.30.0 drupal/inline_entity_form: 1.0.0-rc6 drupal/key: 1.14.0 - drupal/linkit: 4.3.0 + drupal/linkit: 4.4.0 drupal/log_stdout: 1.1.0 drupal/login_emailusername: 1.1.0 drupal/maillog: 'dev-1.x:3ec675bd7842c04bc01860fa8b3f424f95a17d93' @@ -106,7 +106,6 @@ packages: drupal/range: 1.2.0 drupal/redirect: 1.6.0 drupal/restui: 1.20.0 - drupal/robotstxt: 1.4.0 drupal/role_delegation: 1.1.0 drupal/scheduler: 1.3.0 drupal/scheduler_content_moderation_integration: 1.3.0 @@ -150,7 +149,7 @@ packages: harvesthq/chosen: 1.8.7 html2text/html2text: 4.0.1 joachim-n/composer-manifest: 1.0.4 - judicialcouncil/courtyard-artifact: 0.1.225 + judicialcouncil/courtyard-artifact: 0.1.241 kub-at/php-simple-html-dom-parser: 1.9.1 laminas/laminas-diactoros: 1.8.7p2 laminas/laminas-escaper: 2.6.1 diff --git a/composer.json b/composer.json index ac45a4c4..2a940ed7 100644 --- a/composer.json +++ b/composer.json @@ -159,7 +159,6 @@ "drupal/range": "^1.1", "drupal/redirect": "^1.3", "drupal/restui": "^1.20", - "drupal/robotstxt": "^1.4", "drupal/role_delegation": "^1.0", "drupal/scheduler": "^1.3", "drupal/scheduler_content_moderation_integration": "^1.3", diff --git a/composer.lock b/composer.lock index 62593bda..dbdf047c 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": "75b7b188c286b2e074d3b685a13fb816", + "content-hash": "e59aa2854668489c18892ed4e61be07b", "packages": [ { "name": "alchemy/zippy", @@ -5248,17 +5248,17 @@ }, { "name": "drupal/linkit", - "version": "4.3.0", + "version": "4.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "8.x-4.3" + "reference": "8.x-4.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-8.x-4.3.zip", - "reference": "8.x-4.3", - "shasum": "e624ea2f18a6100b76a8337e24f7c08df6e2235e" + "url": "https://ftp.drupal.org/files/projects/linkit-8.x-4.4.zip", + "reference": "8.x-4.4", + "shasum": "c6db47623f14e939f03375565229af45b15f5b91" }, "require": { "drupal/core": "~8.0" @@ -5266,8 +5266,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-4.3", - "datestamp": "1490205830", + "version": "8.x-4.4", + "datestamp": "1632933665", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6709,63 +6709,6 @@ "source": "https://git.drupalcode.org/project/restui" } }, - { - "name": "drupal/robotstxt", - "version": "1.4.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/robotstxt.git", - "reference": "8.x-1.4" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/robotstxt-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "8793121a58d2897c0523f3cf13c31f7d80f90154" - }, - "require": { - "drupal/core": "^8.0 || ^9.0" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-1.4", - "datestamp": "1585290535", - "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": "hass", - "homepage": "https://www.drupal.org/u/hass" - }, - { - "name": "See other contributors", - "homepage": "https://www.drupal.org/node/53579/committers" - }, - { - "name": "ccjjmartin", - "homepage": "https://www.drupal.org/user/3210801" - }, - { - "name": "mikeegoulding", - "homepage": "https://www.drupal.org/user/2867877" - } - ], - "description": "Generates the robots.txt file dynamically and gives you the chance to edit it, on a per-site basis, from the web UI.", - "homepage": "https://www.drupal.org/project/robotstxt", - "support": { - "source": "https://git.drupal.org/project/robotstxt.git", - "issues": "https://www.drupal.org/project/issues/robotstxt" - } - }, { "name": "drupal/role_delegation", "version": "1.1.0", @@ -8327,9 +8270,6 @@ "drupal/core": "^8 || ^9", "ext-xmlwriter": "*" }, - "require-dev": { - "drupal/robotstxt": "^1.0" - }, "suggest": { "drush/drush": "Command-line regenerating and rebuilding sitemaps." }, @@ -9194,16 +9134,16 @@ }, { "name": "judicialcouncil/courtyard-artifact", - "version": "0.1.225", + "version": "0.1.241", "source": { "type": "git", "url": "https://github.com/JudicialCouncilOfCalifornia/courtyard-artifact.git", - "reference": "377494d37910a2a8804e42d4cd98581796b47a92" + "reference": "bd7147a269b5a01b482602b9ca86cedd42b9a384" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JudicialCouncilOfCalifornia/courtyard-artifact/zipball/377494d37910a2a8804e42d4cd98581796b47a92", - "reference": "377494d37910a2a8804e42d4cd98581796b47a92", + "url": "https://api.github.com/repos/JudicialCouncilOfCalifornia/courtyard-artifact/zipball/bd7147a269b5a01b482602b9ca86cedd42b9a384", + "reference": "bd7147a269b5a01b482602b9ca86cedd42b9a384", "shasum": "" }, "type": "drupal-library", @@ -9218,7 +9158,7 @@ } ], "description": "A build artifact of the Courtyard Pattern Lab pattern library.", - "time": "2021-10-12T18:23:26+00:00" + "time": "2021-10-27T19:05:38+00:00" }, { "name": "kub-at/php-simple-html-dom-parser", diff --git a/config/config-default/core.extension.yml b/config/config-default/core.extension.yml index 2bd209b8..eef2959f 100644 --- a/config/config-default/core.extension.yml +++ b/config/config-default/core.extension.yml @@ -118,7 +118,6 @@ module: rh_media: 0 rh_node: 0 rh_taxonomy: 0 - robotstxt: 0 role_delegation: 0 scheduler: 0 scheduler_content_moderation_integration: 0 diff --git a/config/config-default/robotstxt.settings.yml b/config/config-default/robotstxt.settings.yml deleted file mode 100644 index 37f464d9..00000000 --- a/config/config-default/robotstxt.settings.yml +++ /dev/null @@ -1,3 +0,0 @@ -content: "#\n# robots.txt\n#\n# This file is to prevent the crawling and indexing of certain parts\n# of your site by web crawlers and spiders run by sites like Yahoo!\n# and Google. By telling these \"robots\" where not to go on your site,\n# you save bandwidth and server resources.\n#\n# This file will be ignored unless it is at the root of your host:\n# Used: http://example.com/robots.txt\n# Ignored: http://example.com/site/robots.txt\n#\n# For more information about the robots.txt standard, see:\n# http://www.robotstxt.org/robotstxt.html\n\nUser-agent: *\n# CSS, JS, Images\nAllow: /core/*.css$\nAllow: /core/*.css?\nAllow: /core/*.js$\nAllow: /core/*.js?\nAllow: /core/*.gif\nAllow: /core/*.jpg\nAllow: /core/*.jpeg\nAllow: /core/*.png\nAllow: /core/*.svg\nAllow: /profiles/*.css$\nAllow: /profiles/*.css?\nAllow: /profiles/*.js$\nAllow: /profiles/*.js?\nAllow: /profiles/*.gif\nAllow: /profiles/*.jpg\nAllow: /profiles/*.jpeg\nAllow: /profiles/*.png\nAllow: /profiles/*.svg\n# Directories\nDisallow: /core/\nDisallow: /profiles/\n# Files\nDisallow: /README.txt\nDisallow: /web.config\n# Paths (clean URLs)\nDisallow: /admin/\nDisallow: /comment/reply/\nDisallow: /filter/tips\nDisallow: /node/add/\nDisallow: /search/\nDisallow: /user/register/\nDisallow: /user/password/\nDisallow: /user/login/\nDisallow: /user/logout/\n# Paths (no clean URLs)\nDisallow: /index.php/admin/\nDisallow: /index.php/comment/reply/\nDisallow: /index.php/filter/tips\nDisallow: /index.php/node/add/\nDisallow: /index.php/search/\nDisallow: /index.php/user/password/\nDisallow: /index.php/user/register/\nDisallow: /index.php/user/login/\nDisallow: /index.php/user/logout/\n\n# Remove this line after Alpha2 launch.\nDisallow: /\n" -_core: - default_config_hash: ceCx5XZ_ay1Mxcv-sB95U_fBKoVkpvo8RaQiwutSZLI From f55a1f65649aaffc6f018b29da2652fe9899be0a Mon Sep 17 00:00:00 2001 From: Mel Wong Date: Wed, 3 Nov 2021 09:52:39 -0700 Subject: [PATCH 2/2] SRL-525: add share component --- .../templates/node/node--basic--full.html.twig | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/atrium/templates/node/node--basic--full.html.twig b/web/themes/custom/atrium/templates/node/node--basic--full.html.twig index 50847160..94ba0136 100644 --- a/web/themes/custom/atrium/templates/node/node--basic--full.html.twig +++ b/web/themes/custom/atrium/templates/node/node--basic--full.html.twig @@ -113,10 +113,24 @@ {% set column_content_left = {field_media: content.field_media, body: content.body} %} + {% set right_column %} + + {% endset %} + + + {% if column_content_left|render %} {% include '@organisms/sections/text-section/text-section.twig' with { text_section: { - column_content_left: column_content_left + column_content_left: column_content_left, + column_content_right: right_column, } } only %} {% endif %}