diff --git a/composer.json b/composer.json index 2c34442c..cd17b218 100644 --- a/composer.json +++ b/composer.json @@ -73,6 +73,7 @@ "drupal/maillog": "1.x-dev@dev", "drupal/mailsystem": "^4.4", "drupal/media_library_edit": "^3.0", + "drupal/media_remote_hls": "^1.0", "drupal/menu_admin_per_menu": "^1.5", "drupal/metatag": "^2.0", "drupal/override_node_options": "^2.7", diff --git a/composer.lock b/composer.lock index 630090ca..94568bb0 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": "03e17041ccf37ab7a7a0d9c85ca1ee6f", + "content-hash": "49e234bd423b473ff250e5842a1c1818", "packages": [ { "name": "asm89/stack-cors", @@ -1753,17 +1753,17 @@ }, { "name": "drupal/captcha", - "version": "2.0.6", + "version": "2.0.7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/captcha.git", - "reference": "2.0.6" + "reference": "2.0.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/captcha-2.0.6.zip", - "reference": "2.0.6", - "shasum": "3553127b2779ce5c24ac5c7fb682b5089d681bb2" + "url": "https://ftp.drupal.org/files/projects/captcha-2.0.7.zip", + "reference": "2.0.7", + "shasum": "8e97ba41810811bcd5d7e8b714cdc0b664dd8eec" }, "require": { "drupal/core": "^9.5 || ^10 || ^11" @@ -1771,8 +1771,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.6", - "datestamp": "1719900315", + "version": "2.0.7", + "datestamp": "1732250192", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1788,7 +1788,7 @@ ], "authors": [ { - "name": "Anybody", + "name": "anybody", "homepage": "https://www.drupal.org/user/291091" }, { @@ -1796,7 +1796,7 @@ "homepage": "https://www.drupal.org/user/1021502" }, { - "name": "Grevil", + "name": "grevil", "homepage": "https://www.drupal.org/user/3668491" }, { @@ -1812,7 +1812,7 @@ "homepage": "https://www.drupal.org/user/116002" }, { - "name": "RobLoach", + "name": "robloach", "homepage": "https://www.drupal.org/user/61114" }, { @@ -2297,16 +2297,16 @@ }, { "name": "drupal/core", - "version": "10.3.8", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44" + "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/4006024a8dd7c9976fad0a2af7c9034d120c8e44", - "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44", + "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144", + "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144", "shasum": "" }, "require": { @@ -2455,13 +2455,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.8" + "source": "https://github.com/drupal/core/tree/10.3.10" }, - "time": "2024-11-12T09:52:10+00:00" + "time": "2024-11-22T12:51:33+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.8", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2505,13 +2505,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.8" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10" }, "time": "2024-08-22T14:31:34+00:00" }, { "name": "drupal/core-project-message", - "version": "10.3.8", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", @@ -2546,22 +2546,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-project-message/tree/11.0.6" + "source": "https://github.com/drupal/core-project-message/tree/11.1.0-beta1" }, "time": "2023-07-24T07:55:25+00:00" }, { "name": "drupal/core-recommended", - "version": "10.3.8", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa" + "reference": "1d739e569c9324bcac1ecc7be600d414386a399b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa", - "reference": "d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/1d739e569c9324bcac1ecc7be600d414386a399b", + "reference": "1d739e569c9324bcac1ecc7be600d414386a399b", "shasum": "" }, "require": { @@ -2570,7 +2570,7 @@ "doctrine/annotations": "~1.14.3", "doctrine/deprecations": "~1.1.3", "doctrine/lexer": "~2.1.1", - "drupal/core": "10.3.8", + "drupal/core": "10.3.10", "egulias/email-validator": "~4.0.2", "guzzlehttp/guzzle": "~7.8.1", "guzzlehttp/promises": "~2.0.2", @@ -2631,9 +2631,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/10.3.8" + "source": "https://github.com/drupal/core-recommended/tree/10.3.10" }, - "time": "2024-11-12T09:52:10+00:00" + "time": "2024-11-22T12:51:33+00:00" }, { "name": "drupal/ctools", @@ -3054,7 +3054,7 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -3154,17 +3154,17 @@ }, { "name": "drupal/file_resup", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/file_resup.git", - "reference": "2.0.1" + "reference": "2.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/file_resup-2.0.1.zip", - "reference": "2.0.1", - "shasum": "e28b507a9fc1efa5abbe09ed2c144ca851d016ca" + "url": "https://ftp.drupal.org/files/projects/file_resup-2.0.2.zip", + "reference": "2.0.2", + "shasum": "81c238e375fba4ba1d5677c35ebfc712f128713a" }, "require": { "drupal/core": "^9 || ^10" @@ -3172,8 +3172,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.1", - "datestamp": "1729175113", + "version": "2.0.2", + "datestamp": "1731972494", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3576,6 +3576,103 @@ "issues": "https://www.drupal.org/project/issues/media_library_edit" } }, + { + "name": "drupal/media_remote", + "version": "1.9.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/media_remote.git", + "reference": "1.9.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/media_remote-1.9.1.zip", + "reference": "1.9.1", + "shasum": "d89d423029af38bb8c6e4c7027824df50d50f97e" + }, + "require": { + "drupal/core": "^9 || ^10 || ^11" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.9.1", + "datestamp": "1729150362", + "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": "Lullabot", + "homepage": "https://www.drupal.org/user/3815489" + }, + { + "name": "marcoscano", + "homepage": "https://www.drupal.org/user/1288796" + } + ], + "description": "Provides Media integration for remote content (non-OEmbed).", + "homepage": "https://www.drupal.org/project/media_remote", + "keywords": [ + "Drupal" + ], + "support": { + "source": "http://cgit.drupalcode.org/media_remote", + "issues": "http://drupal.org/project/issues/media_remote" + } + }, + { + "name": "drupal/media_remote_hls", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/media_remote_hls.git", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/media_remote_hls-1.0.0.zip", + "reference": "1.0.0", + "shasum": "e06bb9972752e39d312b1373c82d8055b8da4fba" + }, + "require": { + "drupal/core": "^9 || ^10", + "drupal/media_remote": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.0.0", + "datestamp": "1731558228", + "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-or-later" + ], + "authors": [ + { + "name": "john franklin", + "homepage": "https://www.drupal.org/user/683430" + } + ], + "description": "Allow embedding remote HLS streams", + "homepage": "https://www.drupal.org/project/media_remote_hls", + "support": { + "source": "https://git.drupalcode.org/project/media_remote_hls" + } + }, { "name": "drupal/menu_admin_per_menu", "version": "1.6.0", @@ -5886,20 +5983,20 @@ }, { "name": "halaxa/json-machine", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/halaxa/json-machine.git", - "reference": "5147f38f74d7ab3e27733e3f3bdabbd2fd28e3fa" + "reference": "114b3f8d70a4b994e2d4a27d2922ac6b641d968c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/halaxa/json-machine/zipball/5147f38f74d7ab3e27733e3f3bdabbd2fd28e3fa", - "reference": "5147f38f74d7ab3e27733e3f3bdabbd2fd28e3fa", + "url": "https://api.github.com/repos/halaxa/json-machine/zipball/114b3f8d70a4b994e2d4a27d2922ac6b641d968c", + "reference": "114b3f8d70a4b994e2d4a27d2922ac6b641d968c", "shasum": "" }, "require": { - "php": "7.0 - 8.3" + "php": "7.2 - 8.4" }, "require-dev": { "ext-json": "*", @@ -5933,7 +6030,7 @@ "description": "Efficient, easy-to-use and fast JSON pull parser", "support": { "issues": "https://github.com/halaxa/json-machine/issues", - "source": "https://github.com/halaxa/json-machine/tree/1.1.4" + "source": "https://github.com/halaxa/json-machine/tree/1.1.5" }, "funding": [ { @@ -5941,20 +6038,20 @@ "type": "other" } ], - "time": "2023-11-28T21:12:40+00:00" + "time": "2024-11-22T09:07:34+00:00" }, { "name": "illuminate/collections", - "version": "v11.31.0", + "version": "v11.33.2", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "4fdef06e35aac0239d76033a2bad0ddb921226e8" + "reference": "a01a9d0799700bf34ab3797988fdd5f420d42bfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/4fdef06e35aac0239d76033a2bad0ddb921226e8", - "reference": "4fdef06e35aac0239d76033a2bad0ddb921226e8", + "url": "https://api.github.com/repos/illuminate/collections/zipball/a01a9d0799700bf34ab3797988fdd5f420d42bfe", + "reference": "a01a9d0799700bf34ab3797988fdd5f420d42bfe", "shasum": "" }, "require": { @@ -5996,11 +6093,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-11-08T03:05:25+00:00" + "time": "2024-11-15T15:43:48+00:00" }, { "name": "illuminate/conditionable", - "version": "v11.31.0", + "version": "v11.33.2", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -6046,16 +6143,16 @@ }, { "name": "illuminate/contracts", - "version": "v11.31.0", + "version": "v11.33.2", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8" + "reference": "44c15aec6ea0d997e0885aa5b04876fe8a141433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/56312862af937bd6da8e6dc8bbd88188dfb478f8", - "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/44c15aec6ea0d997e0885aa5b04876fe8a141433", + "reference": "44c15aec6ea0d997e0885aa5b04876fe8a141433", "shasum": "" }, "require": { @@ -6090,11 +6187,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-09-22T15:08:08+00:00" + "time": "2024-11-15T15:40:33+00:00" }, { "name": "illuminate/macroable", - "version": "v11.31.0", + "version": "v11.33.2", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -11690,16 +11787,16 @@ }, { "name": "composer/composer", - "version": "2.8.2", + "version": "2.8.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "6e543d03187c882ea1c6ba43add2467754427803" + "reference": "2a7c71266b2545a3bed9f4860734081963f6e688" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/6e543d03187c882ea1c6ba43add2467754427803", - "reference": "6e543d03187c882ea1c6ba43add2467754427803", + "url": "https://api.github.com/repos/composer/composer/zipball/2a7c71266b2545a3bed9f4860734081963f6e688", + "reference": "2a7c71266b2545a3bed9f4860734081963f6e688", "shasum": "" }, "require": { @@ -11713,7 +11810,7 @@ "justinrainbow/json-schema": "^5.3", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", - "react/promise": "^3.2", + "react/promise": "^2.11 || ^3.2", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", @@ -11784,7 +11881,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.8.2" + "source": "https://github.com/composer/composer/tree/2.8.3" }, "funding": [ { @@ -11800,7 +11897,7 @@ "type": "tidelift" } ], - "time": "2024-10-29T15:12:11+00:00" + "time": "2024-11-17T12:13:04+00:00" }, { "name": "composer/metadata-minifier", @@ -12297,7 +12394,7 @@ }, { "name": "drupal/core-dev", - "version": "10.3.8", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", @@ -12347,7 +12444,7 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/10.3.8" + "source": "https://github.com/drupal/core-dev/tree/10.3.10" }, "time": "2024-07-04T10:19:29+00:00" }, @@ -13862,26 +13959,27 @@ }, { "name": "phpspec/prophecy", - "version": "v1.19.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87" + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87", - "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a0165c648cab6a80311c74ffc708a07bb53ecc93", + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.40", "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" @@ -13925,22 +14023,22 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.19.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.20.0" }, - "time": "2024-02-29T11:52:51+00:00" + "time": "2024-11-19T13:12:41+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.2.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "16e1247e139434bce0bac09848bc5c8d882940fc" + "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/16e1247e139434bce0bac09848bc5c8d882940fc", - "reference": "16e1247e139434bce0bac09848bc5c8d882940fc", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/8819516c1b489ecee4c60db5f5432fac1ea8ac6f", + "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f", "shasum": "" }, "require": { @@ -13948,6 +14046,9 @@ "phpspec/prophecy": "^1.18", "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0" }, + "require-dev": { + "phpstan/phpstan": "^1.10" + }, "type": "library", "extra": { "branch-alias": { @@ -13977,9 +14078,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.2.0" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.3.0" }, - "time": "2024-03-01T08:33:58+00:00" + "time": "2024-11-19T13:24:17+00:00" }, { "name": "phpstan/extension-installer", @@ -14078,16 +14179,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.10", + "version": "1.12.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "fc463b5d0fe906dcf19689be692c65c50406a071" + "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071", - "reference": "fc463b5d0fe906dcf19689be692c65c50406a071", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d1fc20a962a91be578bcfe7cf939e6e1a2ff733", + "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733", "shasum": "" }, "require": { @@ -14132,7 +14233,7 @@ "type": "github" } ], - "time": "2024-11-11T15:37:09+00:00" + "time": "2024-11-17T14:08:01+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -16104,16 +16205,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.11.0", + "version": "3.11.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450" + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/70c08f8d20c0eb4fe56f26644dd94dae76a7f450", - "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", "shasum": "" }, "require": { @@ -16180,7 +16281,7 @@ "type": "open_collective" } ], - "time": "2024-11-12T09:53:29+00:00" + "time": "2024-11-16T12:02:36+00:00" }, { "name": "symfony/browser-kit", diff --git a/composer.log b/composer.log index 0d7c6d5c..15cf25d8 100644 --- a/composer.log +++ b/composer.log @@ -46,3 +46,5 @@ c844a0df1fb652429755003179a5177c|Matt Poole|feature/BSD-305-dep-update|Tue Oct 1 56ccb5a257914e0eced9c581db3dc19d|Matt Poole|release/1.5.0|Wed Oct 16 09:17:37 EDT 2024|./composer.sh update 835eac30efa74f467f99dea027b5e553|Matt Poole|feature/BSD-329-site-wide-alert-be|Fri Nov 1 15:48:57 EDT 2024|./composer.sh require drupal/sitewide_alert 79be0192ea4e882a1cf2b73eb098c76e|Matt Poole|feature/BSD-342-update-deps|Wed Nov 13 14:23:04 EST 2024|./composer.sh update +7ba32a3b2d2e71420c79a194217d54ff|Matt Poole|feature/BSD-348-update-deps|Fri Nov 22 10:45:45 EST 2024|./composer.sh update +fa3ebb6ff574f4eb1ae36967973062ed|John Franklin|feature/BSD-298-enable-hls-video|Fri Nov 22 11:45:43 EST 2024|./composer.sh require drupal/media_remote_hls diff --git a/config/sync/core.entity_form_display.media.hls_video.default.yml b/config/sync/core.entity_form_display.media.hls_video.default.yml new file mode 100644 index 00000000..eedf4bbc --- /dev/null +++ b/config/sync/core.entity_form_display.media.hls_video.default.yml @@ -0,0 +1,67 @@ +uuid: 3aa18c7a-3a5e-4902-9ce3-f9bc813df535 +langcode: en +status: true +dependencies: + config: + - field.field.media.hls_video.field_media_media_remote + - media.type.hls_video + module: + - path +id: media.hls_video.default +targetEntityType: media +bundle: hls_video +mode: default +content: + created: + type: datetime_timestamp + weight: 10 + region: content + settings: { } + third_party_settings: { } + field_media_media_remote: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + langcode: + type: language_select + weight: 2 + region: content + settings: + include_locked: true + third_party_settings: { } + name: + type: string_textfield + weight: -5 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + path: + type: path + weight: 30 + region: content + settings: { } + third_party_settings: { } + status: + type: boolean_checkbox + weight: 100 + region: content + settings: + display_label: true + third_party_settings: { } + uid: + type: entity_reference_autocomplete + weight: 5 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: { } diff --git a/config/sync/core.entity_form_display.media.hls_video.media_library.yml b/config/sync/core.entity_form_display.media.hls_video.media_library.yml new file mode 100644 index 00000000..e41adc6b --- /dev/null +++ b/config/sync/core.entity_form_display.media.hls_video.media_library.yml @@ -0,0 +1,28 @@ +uuid: 278bae80-6c7d-48db-a6a9-93b6dc62bdba +langcode: en +status: true +dependencies: + config: + - core.entity_form_mode.media.media_library + - field.field.media.hls_video.field_media_media_remote + - media.type.hls_video +id: media.hls_video.media_library +targetEntityType: media +bundle: hls_video +mode: media_library +content: + name: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + field_media_media_remote: true + langcode: true + path: true + status: true + uid: true diff --git a/config/sync/core.entity_view_display.media.hls_video.default.yml b/config/sync/core.entity_view_display.media.hls_video.default.yml new file mode 100644 index 00000000..256ebcce --- /dev/null +++ b/config/sync/core.entity_view_display.media.hls_video.default.yml @@ -0,0 +1,32 @@ +uuid: 89538217-2bd1-4d8c-a553-b9afdeb624d5 +langcode: en +status: true +dependencies: + config: + - field.field.media.hls_video.field_media_media_remote + - media.type.hls_video + module: + - media_remote_hls +id: media.hls_video.default +targetEntityType: media +bundle: hls_video +mode: default +content: + field_media_media_remote: + type: media_remote_hls + label: hidden + settings: + width: '960' + height: '600' + autoplay: '1' + formatter_class: Drupal\media_remote_hls\Plugin\Field\FieldFormatter\MediaRemoteHLSFormatter + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + langcode: true + name: true + search_api_excerpt: true + thumbnail: true + uid: true diff --git a/config/sync/core.entity_view_display.media.hls_video.media_library.yml b/config/sync/core.entity_view_display.media.hls_video.media_library.yml new file mode 100644 index 00000000..7460838b --- /dev/null +++ b/config/sync/core.entity_view_display.media.hls_video.media_library.yml @@ -0,0 +1,34 @@ +uuid: a48aacb5-1842-44a1-8f5a-a2126d6e3679 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.media.media_library + - field.field.media.hls_video.field_media_media_remote + - image.style.medium + - media.type.hls_video + module: + - image +id: media.hls_video.media_library +targetEntityType: media +bundle: hls_video +mode: media_library +content: + thumbnail: + type: image + label: hidden + settings: + image_link: '' + image_style: medium + image_loading: + attribute: lazy + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + field_media_media_remote: true + langcode: true + name: true + search_api_excerpt: true + uid: true diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index e93296a2..5dc7e8a8 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -57,6 +57,8 @@ module: media: 0 media_library: 0 media_library_edit: 0 + media_remote: 0 + media_remote_hls: 0 menu_link_content: 0 menu_ui: 0 metatag: 0 diff --git a/config/sync/field.field.media.hls_video.field_media_media_remote.yml b/config/sync/field.field.media.hls_video.field_media_media_remote.yml new file mode 100644 index 00000000..2eb4e50f --- /dev/null +++ b/config/sync/field.field.media.hls_video.field_media_media_remote.yml @@ -0,0 +1,19 @@ +uuid: 5bcc2e43-d005-474d-9f0b-9b715e168fba +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_media_media_remote + - media.type.hls_video +id: media.hls_video.field_media_media_remote +field_name: field_media_media_remote +entity_type: media +bundle: hls_video +label: 'Remote Media URL' +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.storage.media.field_media_media_remote.yml b/config/sync/field.storage.media.field_media_media_remote.yml new file mode 100644 index 00000000..f5216695 --- /dev/null +++ b/config/sync/field.storage.media.field_media_media_remote.yml @@ -0,0 +1,21 @@ +uuid: c8ffa937-f683-4509-a7bd-0e7dac2bd470 +langcode: en +status: true +dependencies: + module: + - media +id: media.field_media_media_remote +field_name: field_media_media_remote +entity_type: media +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/language.content_settings.media.hls_video.yml b/config/sync/language.content_settings.media.hls_video.yml new file mode 100644 index 00000000..7c83a562 --- /dev/null +++ b/config/sync/language.content_settings.media.hls_video.yml @@ -0,0 +1,11 @@ +uuid: a88483a5-0ed4-4676-8186-32640de95525 +langcode: en +status: true +dependencies: + config: + - media.type.hls_video +id: media.hls_video +target_entity_type_id: media +target_bundle: hls_video +default_langcode: site_default +language_alterable: false diff --git a/config/sync/media.type.hls_video.yml b/config/sync/media.type.hls_video.yml new file mode 100644 index 00000000..f1639187 --- /dev/null +++ b/config/sync/media.type.hls_video.yml @@ -0,0 +1,15 @@ +uuid: 158e198c-4114-492e-af2b-fd53e6f5780a +langcode: en +status: true +dependencies: + module: + - media_remote +id: hls_video +label: 'HLS Video' +description: 'Remote video using the HLS protocol' +source: media_remote +queue_thumbnail_downloads: false +new_revision: false +source_configuration: + source_field: field_media_media_remote +field_map: { } diff --git a/config/sync/user.role.editor.yml b/config/sync/user.role.editor.yml index 11e3e3c0..243b3b0a 100644 --- a/config/sync/user.role.editor.yml +++ b/config/sync/user.role.editor.yml @@ -5,6 +5,7 @@ dependencies: config: - node.type.bixaler - node.type.blog + - node.type.case_study - node.type.contract_vehicle - node.type.landing_page - taxonomy.vocabulary.certifications @@ -41,6 +42,7 @@ permissions: - 'administer mainnavcta menu items' - 'create bixaler content' - 'create blog content' + - 'create case_study content' - 'create contract_vehicle content' - 'create landing_page content' - 'create media' @@ -52,6 +54,7 @@ permissions: - 'create url aliases' - 'delete any bixaler content' - 'delete any blog content' + - 'delete any case_study content' - 'delete any contract_vehicle content' - 'delete any landing_page content' - 'delete any media' @@ -62,6 +65,7 @@ permissions: - 'delete terms in team' - 'edit any bixaler content' - 'edit any blog content' + - 'edit any case_study content' - 'edit any contract_vehicle content' - 'edit any landing_page content' - 'edit terms in certifications' diff --git a/stories/assets/styles/global/global.scss b/stories/assets/styles/global/global.scss index 1e45a889..be5f6eff 100644 --- a/stories/assets/styles/global/global.scss +++ b/stories/assets/styles/global/global.scss @@ -142,6 +142,13 @@ h6 { } } +.bix-title-prefix-label { + @extend .bix-title-prefix; + border-left: none; + border-right: none; + padding: 0px; +} + dl { line-height: 1.75; margin-top: units(2); diff --git a/stories/components/section/section.html.twig b/stories/components/section/section.html.twig index e429d760..e74cd750 100644 --- a/stories/components/section/section.html.twig +++ b/stories/components/section/section.html.twig @@ -4,6 +4,9 @@ * * Available variables: * - prefix: Optional string. Contains title prefix with borders on the side. + * - prefix_below: Opt boolean. If true, the prefix will show under the title. + * - prefix_label: Optional string. Adds a label to prefix seperated by a | + and removes the borders from the sides. * - heading_type: String heading type for title. * - title: String title of section. * - description: String body text, can include paragraphs. @@ -33,12 +36,18 @@ #}
{% block header %} + {% if prefix_below %} + {% include "@partials/section-title.html.twig" %} + {% endif %} {% if prefix %} -
- {{ prefix }} +
+ {% if prefix_label %}{{ prefix_label }}  {% endif %}{{ prefix }}
{% endif %} - {% include "@partials/section-title.html.twig" %} + {% if not prefix_below %} + {% include "@partials/section-title.html.twig" %} + {% endif %} + {% endblock %} {% block description %} diff --git a/stories/components/section/section.stories.js b/stories/components/section/section.stories.js index a4078177..eeef3e75 100644 --- a/stories/components/section/section.stories.js +++ b/stories/components/section/section.stories.js @@ -11,6 +11,8 @@ export default { args: { center_content: false, prefix: "Who we are", + prefix_below: 0, + prefix_label: '', heading_type: "h2", title: "Bixal is a diverse group of strategists, designers, engineers, and thinkers.", diff --git a/web/modules/custom/bixal_default_content/content/file/f91cbcf4-ec16-4afc-affe-7ca92eb412d0.yml b/web/modules/custom/bixal_default_content/content/file/f91cbcf4-ec16-4afc-affe-7ca92eb412d0.yml new file mode 100644 index 00000000..82f89f7b --- /dev/null +++ b/web/modules/custom/bixal_default_content/content/file/f91cbcf4-ec16-4afc-affe-7ca92eb412d0.yml @@ -0,0 +1,27 @@ +_meta: + version: '1.0' + entity_type: file + uuid: f91cbcf4-ec16-4afc-affe-7ca92eb412d0 + default_langcode: en +default: + uid: + - + target_id: 1 + filename: + - + value: generic.png + uri: + - + value: 'public://media-icons/generic/generic.png' + filemime: + - + value: image/png + filesize: + - + value: 3900 + status: + - + value: true + created: + - + value: 1732300629 diff --git a/web/modules/custom/bixal_default_content/content/file/generic.png b/web/modules/custom/bixal_default_content/content/file/generic.png new file mode 100644 index 00000000..753d733a Binary files /dev/null and b/web/modules/custom/bixal_default_content/content/file/generic.png differ diff --git a/web/modules/custom/bixal_default_content/content/media/695fd0fc-81ec-4c39-b516-1050db298111.yml b/web/modules/custom/bixal_default_content/content/media/695fd0fc-81ec-4c39-b516-1050db298111.yml new file mode 100644 index 00000000..55a0d6c4 --- /dev/null +++ b/web/modules/custom/bixal_default_content/content/media/695fd0fc-81ec-4c39-b516-1050db298111.yml @@ -0,0 +1,27 @@ +_meta: + version: '1.0' + entity_type: media + uuid: 695fd0fc-81ec-4c39-b516-1050db298111 + bundle: hls_video + default_langcode: en +default: + status: + - + value: true + uid: + - + target_id: 1 + name: + - + value: 'HLS video from https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8' + created: + - + value: 1732300628 + path: + - + alias: '' + langcode: en + pathauto: 0 + field_media_media_remote: + - + value: 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8' diff --git a/web/modules/custom/bixal_default_content/content/node/ae2ccfc9-3663-4545-86b1-5b0df73608b6.yml b/web/modules/custom/bixal_default_content/content/node/ae2ccfc9-3663-4545-86b1-5b0df73608b6.yml new file mode 100644 index 00000000..cc511226 --- /dev/null +++ b/web/modules/custom/bixal_default_content/content/node/ae2ccfc9-3663-4545-86b1-5b0df73608b6.yml @@ -0,0 +1,105 @@ +_meta: + version: '1.0' + entity_type: node + uuid: ae2ccfc9-3663-4545-86b1-5b0df73608b6 + bundle: landing_page + default_langcode: en + depends: + 32ebf31f-7318-4144-988d-5008355d9b22: media +default: + revision_uid: + - + target_id: 1 + status: + - + value: true + uid: + - + target_id: 1 + title: + - + value: 'HLS Video Test' + created: + - + value: 1732300598 + promote: + - + value: false + sticky: + - + value: false + path: + - + alias: /hls + langcode: en + pathauto: 0 + field_banner_image: + - + entity: 32ebf31f-7318-4144-988d-5008355d9b22 + field_hero_variant: + - + value: image-bg + field_paragraphs: + - + entity: + _meta: + version: '1.0' + entity_type: paragraph + uuid: 60527371-e5e3-4979-bbe6-578cfccff419 + bundle: section + default_langcode: en + default: + status: + - + value: true + created: + - + value: 1732300608 + behavior_settings: + - + value: { } + field_button: + - + entity: + _meta: + version: '1.0' + entity_type: paragraph + uuid: bb4b78f0-4f68-4d71-9864-fe1c186c48db + bundle: button + default_langcode: en + default: + status: + - + value: true + created: + - + value: 1732300608 + behavior_settings: + - + value: { } + field_center_content: + - + value: false + field_nested_paragraphs: + - + entity: + _meta: + version: '1.0' + entity_type: paragraph + uuid: 0a3f1f34-f026-4c00-82cd-94ecda4d757d + bundle: wysiwyg + default_langcode: en + default: + status: + - + value: true + created: + - + value: 1732300614 + behavior_settings: + - + value: { } + field_wysiwyg: + - + value: ' ' + format: html_text diff --git a/web/sites/default/settings.lando.php b/web/sites/default/settings.lando.php index 27f08615..45ff5ae8 100644 --- a/web/sites/default/settings.lando.php +++ b/web/sites/default/settings.lando.php @@ -47,21 +47,22 @@ if (isset($lando_info->cache->type)) { switch ($lando_info->cache->type) { case 'redis': - require 'settings.redis.php'; - if (function_exists('_settings_redis')) { - _settings_redis( + require_once 'settings.redis.php'; + if (function_exists('_drupal_env_settings_redis')) { + _drupal_env_settings_redis( $settings, $lando_info->cache->internal_connection->host, - $lando_info->cache->internal_connection->port + $lando_info->cache->internal_connection->port, + 'PhpRedis', ); } break; case 'memcached': - require 'settings.memcache.php'; - if (function_exists('_settings_memcache')) { - $memcache_host = implode(':', (array)$lando_info->cache->internal_connection); - _settings_memcache($settings, $memcache_host); + require_once 'settings.memcache.php'; + if (function_exists('_drupal_env_settings_memcache')) { + $memcache_host = implode(':', (array) $lando_info->cache->internal_connection); + _drupal_env_settings_memcache($settings, $memcache_host); } break; diff --git a/web/sites/default/settings.memcache.php b/web/sites/default/settings.memcache.php index ff476ad3..cff7119b 100644 --- a/web/sites/default/settings.memcache.php +++ b/web/sites/default/settings.memcache.php @@ -2,41 +2,52 @@ use Drupal\Core\Installer\InstallerKernel; -if (( +if ( !InstallerKernel::installationAttempted() && (extension_loaded('memcached') || extension_loaded('memcache')) && - file_exists($app_root . '/modules/contrib/memcache') && - !function_exists('_settings_memcache') -)) { - function _settings_memcache(array &$settings, string $host): void { + file_exists($app_root . '/modules/contrib/memcache') +) { + /** + * Apply Memcache cache settings. + * + * Drush can be bootstrap Drupal twice, this should be safe to be called + * multiple times. + * + * @param array $settings + * The $settings array from settings.php. + * @param string $host + * The host that Memcache will be contacted on. + * + * @return void + */ + function _drupal_env_settings_memcache(array &$settings, string $host): void { $settings['memcache']['servers'][$host] = 'default'; - } - # Use for all bins otherwise specified. - $settings['cache']['default'] = 'cache.backend.memcache'; + // Use for all bins otherwise specified. + $settings['cache']['default'] = 'cache.backend.memcache'; + + /* Optional settings: - // Optional settings: + Apply changes to the container configuration to better leverage Memcache. + This includes using Memcache for the lock and flood control systems, as well + as the cache tag checksum. Alternatively, copy the contents of that file + to your project-specific services.yml file, modify as appropriate, and + remove this line. */ + $settings['container_yamls'][] = 'modules/contrib/memcache/example.services.yml'; - // Apply changes to the container configuration to better leverage Redis. - // This includes using Memcache for the lock and flood control systems, as well - // as the cache tag checksum. Alternatively, copy the contents of that file - // to your project-specific services.yml file, modify as appropriate, and - // remove this line. - $settings['container_yamls'][] = 'modules/contrib/memcache/example.services.yml'; + // Allow the services to work before the Memcache module itself is enabled. + $settings['container_yamls'][] = 'modules/contrib/memcache/memcache.services.yml'; - // Allow the services to work before the Redis module itself is enabled. - $settings['container_yamls'][] = 'modules/contrib/memcache/memcache.services.yml'; + // Use Memcache for container cache. + // The container cache is used to load the container definition itself, and + // thus any configuration stored in the container itself is not available + // yet. These lines force the container cache to use Memcache rather than the + // default SQL cache. + require 'settings.memcache.container_pure.php'; + } + // These only need to be done once, then they are included and applied always. // Manually add the classloader path, this is required for the container cache bin definition below - // and allows to use it without the redis module being enabled. + // and allows to use it without the Memcache module being enabled. $class_loader->addPsr4('Drupal\\memcache\\', 'modules/contrib/memcache/src'); - - require 'settings.memcache.container_pure.php'; } - - - - - - - diff --git a/web/sites/default/settings.platformsh.php b/web/sites/default/settings.platformsh.php index 0caee893..b53c33b2 100644 --- a/web/sites/default/settings.platformsh.php +++ b/web/sites/default/settings.platformsh.php @@ -42,57 +42,28 @@ } // Enable Redis caching. -if ($platformsh->hasRelationship('redis') && !InstallerKernel::installationAttempted() && extension_loaded('redis') && class_exists('Drupal\redis\ClientFactory')) { - $redis = $platformsh->credentials('redis'); - - // Set Redis as the default backend for any cache bin not otherwise specified. - $settings['cache']['default'] = 'cache.backend.redis'; - $settings['redis.connection']['host'] = $redis['host']; - $settings['redis.connection']['port'] = $redis['port']; - - // Apply changes to the container configuration to better leverage Redis. - // This includes using Redis for the lock and flood control systems, as well - // as the cache tag checksum. Alternatively, copy the contents of that file - // to your project-specific services.yml file, modify as appropriate, and - // remove this line. - $settings['container_yamls'][] = 'modules/contrib/redis/example.services.yml'; - - // Allow the services to work before the Redis module itself is enabled. - $settings['container_yamls'][] = 'modules/contrib/redis/redis.services.yml'; - - // Manually add the classloader path, this is required for the container cache bin definition below - // and allows to use it without the redis module being enabled. - $class_loader->addPsr4('Drupal\\redis\\', 'modules/contrib/redis/src'); - - // Use redis for container cache. - // The container cache is used to load the container definition itself, and - // thus any configuration stored in the container itself is not available - // yet. These lines force the container cache to use Redis rather than the - // default SQL cache. - $settings['bootstrap_container_definition'] = [ - 'parameters' => [], - 'services' => [ - 'redis.factory' => [ - 'class' => 'Drupal\redis\ClientFactory', - ], - 'cache.backend.redis' => [ - 'class' => 'Drupal\redis\Cache\CacheBackendFactory', - 'arguments' => ['@redis.factory', '@cache_tags_provider.container', '@serialization.phpserialize'], - ], - 'cache.container' => [ - 'class' => '\Drupal\redis\Cache\PhpRedis', - 'factory' => ['@cache.backend.redis', 'get'], - 'arguments' => ['container'], - ], - 'cache_tags_provider.container' => [ - 'class' => 'Drupal\redis\Cache\RedisCacheTagsChecksum', - 'arguments' => ['@redis.factory'], - ], - 'serialization.phpserialize' => [ - 'class' => 'Drupal\Component\Serialization\PhpSerialize', - ], - ], - ]; +if ($platformsh->hasRelationship('redis')) { + require_once 'settings.redis.php'; + if (function_exists('_drupal_env_settings_redis')) { + $redis = $platformsh->credentials('redis'); + _drupal_env_settings_redis( + $settings, + $redis['host'], + $redis['port'], + 'PhpRedis', + ); + } +} +// Enable Memcached caching. +if ($platformsh->hasRelationship('memcached')) { + require_once 'settings.memcache.php'; + if (function_exists('_drupal_env_settings_memcache')) { + $memcached = $platformsh->credentials('memcached'); + _drupal_env_settings_memcache( + $settings, + $memcached['host'] . ':' . $memcached['port'] + ); + } } if ($platformsh->inRuntime()) { diff --git a/web/sites/default/settings.redis.php b/web/sites/default/settings.redis.php index 33ce67e7..08890d0d 100644 --- a/web/sites/default/settings.redis.php +++ b/web/sites/default/settings.redis.php @@ -2,41 +2,60 @@ use Drupal\Core\Installer\InstallerKernel; -if (( +if ( !InstallerKernel::installationAttempted() && extension_loaded('redis') && - class_exists('Drupal\redis\ClientFactory') && - !function_exists('_settings_redis') -)) { - function _settings_redis(array &$settings, string $host, string $port): void { + class_exists('Drupal\redis\ClientFactory') +) { + /** + * Apply Redis cache settings. + * + * Drush can be bootstrap Drupal twice, this should be safe to be called + * multiple times. + * + * @param array $settings + * The $settings array from settings.php. + * @param string $host + * The host that Redis will be contacted on. + * @param string $port + * The port that Redis will be contacted on. + * @param string $interface + * This can be 'Relay', 'PhpRedis', or 'Predis'. PhpRedis is fastest, Predis + * + * @return void + */ + function _drupal_env_settings_redis(array &$settings, string $host, string $port, string $interface = ''): void { $settings['redis.connection']['host'] = $host; $settings['redis.connection']['port'] = $port; + if (!empty($interface)) { + $settings['redis.connection']['interface'] = $interface; + } + // Use for all bins otherwise specified. + $settings['cache']['default'] = 'cache.backend.redis'; + + /* Optional settings: + + Apply changes to the container configuration to better leverage Redis. + This includes using Redis for the lock and flood control systems, as well + as the cache tag checksum. Alternatively, copy the contents of that file + to your project-specific services.yml file, modify as appropriate, and + remove this line. */ + $settings['container_yamls'][] = 'modules/contrib/redis/example.services.yml'; + + // Allow the services to work before the Redis module itself is enabled. + $settings['container_yamls'][] = 'modules/contrib/redis/redis.services.yml'; + + // Use redis for container cache. + // The container cache is used to load the container definition itself, and + // thus any configuration stored in the container itself is not available + // yet. These lines force the container cache to use Redis rather than the + // default SQL cache. + require 'settings.redis.container.php'; } - $settings['redis.connection']['interface'] = 'PhpRedis'; // Can be "Predis". - # Use for all bins otherwise specified. - $settings['cache']['default'] = 'cache.backend.redis'; - - // Optional settings: - - // Apply changes to the container configuration to better leverage Redis. - // This includes using Redis for the lock and flood control systems, as well - // as the cache tag checksum. Alternatively, copy the contents of that file - // to your project-specific services.yml file, modify as appropriate, and - // remove this line. - $settings['container_yamls'][] = 'modules/contrib/redis/example.services.yml'; - - // Allow the services to work before the Redis module itself is enabled. - $settings['container_yamls'][] = 'modules/contrib/redis/redis.services.yml'; - + // These only need to be done once, then they are included and applied always. // Manually add the classloader path, this is required for the container cache bin definition below // and allows to use it without the redis module being enabled. $class_loader->addPsr4('Drupal\\redis\\', 'modules/contrib/redis/src'); - require 'settings.redis.container.php'; } - - - - - diff --git a/web/themes/custom/bixal_uswds/templates/node/node--case-study--full.html.twig b/web/themes/custom/bixal_uswds/templates/node/node--case-study--full.html.twig index f1d53c2b..ec8a1daf 100644 --- a/web/themes/custom/bixal_uswds/templates/node/node--case-study--full.html.twig +++ b/web/themes/custom/bixal_uswds/templates/node/node--case-study--full.html.twig @@ -73,6 +73,8 @@ heading_type: "h1", prefix: content.field_client | field_value, title: node.label, + prefix_below: 1, + prefix_label: 'Client', } only %} {% set main_body %} @@ -95,11 +97,11 @@ {% include "@components/section/section.html.twig" with { variant: "accent-cool", title: 'Impact' | t, - body: content.field_introduction | field_value + body: content.field_impact | field_value } only %} {% include "@components/section/section.html.twig" with { variant: "primary-alt", title: 'Conclusion' | t, - body: content.field_introduction | field_value + body: content.field_conclusion | field_value } only %}