From 5c7c58eab47e0dbbd3ae6558784d89f4d157bc07 Mon Sep 17 00:00:00 2001 From: Baptiste Niviere Date: Tue, 15 Nov 2022 16:21:22 -0800 Subject: [PATCH] courtyard / template update --- composer-manifest.yaml | 2 +- composer.lock | 126 +++++------------- .../atrium/templates/page/page-header.twig | 3 + 3 files changed, 41 insertions(+), 90 deletions(-) diff --git a/composer-manifest.yaml b/composer-manifest.yaml index 02b9680a..6c8af989 100644 --- a/composer-manifest.yaml +++ b/composer-manifest.yaml @@ -153,7 +153,7 @@ packages: harvesthq/chosen: 1.8.7 html2text/html2text: 4.3.1 joachim-n/composer-manifest: 1.1.4 - judicialcouncil/courtyard-artifact: 0.1.335 + judicialcouncil/courtyard-artifact: 0.1.347 laminas/laminas-diactoros: 2.11.3 laminas/laminas-escaper: 2.9.0 laminas/laminas-feed: 2.17.0 diff --git a/composer.lock b/composer.lock index aea1a689..f8ba2d09 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": "e3431a2a1d42bae20538db782f1dd128", + "content-hash": "449cc8c0825213527076566a8b55d170", "packages": [ { "name": "asm89/stack-cors", @@ -56,10 +56,6 @@ "cors", "stack" ], - "support": { - "issues": "https://github.com/asm89/stack-cors/issues", - "source": "https://github.com/asm89/stack-cors/tree/1.3.0" - }, "time": "2019-12-24T22:41:47+00:00" }, { @@ -551,10 +547,6 @@ } ], "description": "Provide configuration services for a commandline tool.", - "support": { - "issues": "https://github.com/consolidation/config/issues", - "source": "https://github.com/consolidation/config/tree/master" - }, "time": "2019-03-03T19:37:04+00:00" }, { @@ -622,9 +614,6 @@ } ], "description": "This project uses dflydev/dot-access-data to provide simple output filtering for applications built with annotated-command / Robo.", - "support": { - "source": "https://github.com/consolidation/filter-via-dot-access-data/tree/1.0.0" - }, "time": "2019-01-18T06:05:07+00:00" }, { @@ -887,10 +876,6 @@ } ], "description": "Provides a self:update command for Symfony Console applications.", - "support": { - "issues": "https://github.com/consolidation/self-update/issues", - "source": "https://github.com/consolidation/self-update/tree/1.2.0" - }, "time": "2020-04-13T02:49:20+00:00" }, { @@ -1038,10 +1023,6 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "support": { - "issues": "https://github.com/container-interop/container-interop/issues", - "source": "https://github.com/container-interop/container-interop/tree/master" - }, "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, @@ -1150,10 +1131,6 @@ "dot", "notation" ], - "support": { - "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", - "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/master" - }, "time": "2017-01-20T21:14:22+00:00" }, { @@ -3245,6 +3222,10 @@ "[web-root]/profiles/README.txt": "assets/scaffold/files/profiles.README.txt", "[web-root]/themes/README.txt": "assets/scaffold/files/themes.README.txt" } + }, + "patches_applied": { + "Don't override media title with metadata on translation save.": "https://www.drupal.org/files/issues/2019-04-25/media-translation_hassourcefieldchanged-2999370-11.patch", + "Media library edit": "https://www.drupal.org/files/issues/2021-01-04/3168868-9.patch" } }, "autoload": { @@ -3936,6 +3917,9 @@ }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, "drupal": { "version": "8.x-1.0", "datestamp": "1578322688", @@ -4877,6 +4861,9 @@ "status": "covered", "message": "Covered by Drupal's security advisory policy" } + }, + "patches_applied": { + "Secure user data after pdf is rendered.": "patches/webform-pdf-protect.patch" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -5421,6 +5408,9 @@ "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." } + }, + "patches_applied": { + "Add Webform matcher to fix link creation autocomplete": "https://www.drupal.org/files/issues/2022-07-06/2946234-30.patch" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -7728,16 +7718,24 @@ "role": "Maintainer" }, { - "name": "newsignature", - "homepage": "https://www.drupal.org/user/765518" + "name": "chrisjlee", + "homepage": "https://www.drupal.org/user/760600" + }, + { + "name": "drywall", + "homepage": "https://www.drupal.org/user/192591" + }, + { + "name": "jsenich", + "homepage": "https://www.drupal.org/user/58871" }, { - "name": "ultimike", - "homepage": "https://www.drupal.org/user/51132" + "name": "markie", + "homepage": "https://www.drupal.org/user/206687" }, { - "name": "volkswagenchick", - "homepage": "https://www.drupal.org/user/3332522" + "name": "newsignature", + "homepage": "https://www.drupal.org/user/765518" } ], "description": "Provides a more robust alternative to 'summary or trimmed' textfield format.", @@ -8380,6 +8378,9 @@ "services": { "drush.services.yml": "^9 || ^10" } + }, + "patches_applied": { + "By default, do not save submissions.": "patches/disable-results-by-default.patch" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -9105,11 +9106,6 @@ "recaptcha", "spam" ], - "support": { - "forum": "https://groups.google.com/forum/#!forum/recaptcha", - "issues": "https://github.com/google/recaptcha/issues", - "source": "https://github.com/google/recaptcha" - }, "time": "2020-03-31T17:50:54+00:00" }, { @@ -9157,10 +9153,6 @@ } ], "description": "Expands internal property references in PHP arrays file.", - "support": { - "issues": "https://github.com/grasmash/expander/issues", - "source": "https://github.com/grasmash/expander/tree/master" - }, "time": "2017-12-21T22:14:55+00:00" }, { @@ -9209,10 +9201,6 @@ } ], "description": "Expands internal property references in a yaml file.", - "support": { - "issues": "https://github.com/grasmash/yaml-expander/issues", - "source": "https://github.com/grasmash/yaml-expander/tree/master" - }, "time": "2017-12-16T16:06:03+00:00" }, { @@ -9623,16 +9611,16 @@ }, { "name": "judicialcouncil/courtyard-artifact", - "version": "0.1.335", + "version": "0.1.347", "source": { "type": "git", "url": "https://github.com/JudicialCouncilOfCalifornia/courtyard-artifact.git", - "reference": "9ec477594162b7950d585e81641a79a4369eeb04" + "reference": "5a061eab41f172bee757e40f2f2dea84ee85facd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JudicialCouncilOfCalifornia/courtyard-artifact/zipball/9ec477594162b7950d585e81641a79a4369eeb04", - "reference": "9ec477594162b7950d585e81641a79a4369eeb04", + "url": "https://api.github.com/repos/JudicialCouncilOfCalifornia/courtyard-artifact/zipball/5a061eab41f172bee757e40f2f2dea84ee85facd", + "reference": "5a061eab41f172bee757e40f2f2dea84ee85facd", "shasum": "" }, "type": "drupal-library", @@ -9647,11 +9635,7 @@ } ], "description": "A build artifact of the Courtyard Pattern Lab pattern library.", - "support": { - "issues": "https://github.com/JudicialCouncilOfCalifornia/courtyard-artifact/issues", - "source": "https://github.com/JudicialCouncilOfCalifornia/courtyard-artifact/tree/0.1.335" - }, - "time": "2022-06-29T17:45:21+00:00" + "time": "2022-11-15T23:39:15+00:00" }, { "name": "laminas/laminas-diactoros", @@ -10395,10 +10379,6 @@ "diff", "html" ], - "support": { - "issues": "https://github.com/mkalkbrenner/php-htmldiff/issues", - "source": "https://github.com/mkalkbrenner/php-htmldiff/tree/master" - }, "time": "2016-07-25T17:07:32+00:00" }, { @@ -10638,10 +10618,6 @@ "archive", "tar" ], - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar", - "source": "https://github.com/pear/Archive_Tar" - }, "funding": [ { "url": "https://github.com/mrook", @@ -10699,10 +10675,6 @@ } ], "description": "More info available on: http://pear.php.net/package/Console_Getopt", - "support": { - "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Getopt", - "source": "https://github.com/pear/Console_Getopt" - }, "time": "2019-11-20T18:27:48+00:00" }, { @@ -10960,9 +10932,6 @@ "psr", "psr-6" ], - "support": { - "source": "https://github.com/php-fig/cache/tree/master" - }, "time": "2016-08-06T20:24:11+00:00" }, { @@ -11057,10 +11026,6 @@ "psr", "psr-14" ], - "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" - }, "time": "2019-01-08T18:20:26+00:00" }, { @@ -11165,9 +11130,6 @@ "request", "response" ], - "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" - }, "time": "2019-04-30T12:38:16+00:00" }, { @@ -11218,9 +11180,6 @@ "request", "response" ], - "support": { - "source": "https://github.com/php-fig/http-message/tree/master" - }, "time": "2016-08-06T14:39:51+00:00" }, { @@ -11319,9 +11278,6 @@ "psr-16", "simple-cache" ], - "support": { - "source": "https://github.com/php-fig/simple-cache/tree/master" - }, "time": "2017-10-23T01:57:42+00:00" }, { @@ -11438,10 +11394,6 @@ } ], "description": "A polyfill for getallheaders.", - "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" - }, "time": "2019-03-08T08:55:37+00:00" }, { @@ -14546,10 +14498,6 @@ } ], "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", - "support": { - "issues": "https://github.com/webmozart/path-util/issues", - "source": "https://github.com/webmozart/path-util/tree/2.3.0" - }, "abandoned": "symfony/filesystem", "time": "2015-12-17T08:42:14+00:00" }, @@ -14942,5 +14890,5 @@ "php": ">=7.4" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "1.1.0" } diff --git a/web/themes/custom/atrium/templates/page/page-header.twig b/web/themes/custom/atrium/templates/page/page-header.twig index 47f0c69b..7e269a85 100644 --- a/web/themes/custom/atrium/templates/page/page-header.twig +++ b/web/themes/custom/atrium/templates/page/page-header.twig @@ -4,6 +4,8 @@ {% set form_action_link = '/' ~ language.getId() ~ "/search" %} {% endif %} +{% set home_url_ml = path('') %} + {% include '@organisms/global/header-base/header-base.twig' with { header_base: { height_variant: 'basic', @@ -20,6 +22,7 @@ }, title: site_branding.title, logo: site_branding.logo, + home_url: home_url_ml, menu_icon: { name: 'menu', title: "Menu",