[X] where X is the number of the footnote. Links to the footnotes will be generated automatically when rendered.'
+required: false
+translatable: true
+default_value: { }
+default_value_callback: ''
+settings:
+ allowed_formats:
+ - footnotes
+field_type: text_long
diff --git a/config/field.field.paragraph.image_with_text.field_text.yml b/config/field.field.paragraph.image_with_text.field_text.yml
index 9bc45aec..38353196 100755
--- a/config/field.field.paragraph.image_with_text.field_text.yml
+++ b/config/field.field.paragraph.image_with_text.field_text.yml
@@ -4,15 +4,26 @@ status: true
dependencies:
config:
- field.storage.paragraph.field_text
+ - filter.format.filtered_html
+ - filter.format.limited_html
+ - filter.format.plain_text
- paragraphs.paragraphs_type.image_with_text
module:
- allowed_formats
+ - field_config_cardinality
- text
third_party_settings:
allowed_formats:
- limited_html: limited_html
- plain_text: '0'
- filtered_html: '0'
+ allowed_formats:
+ - plain_text
+ - filtered_html
+ - limited_html
+ field_config_cardinality:
+ cardinality_config: '1'
+ cardinality_label_config: false
+ unlimited_not_required: ''
+ limited_not_required: ''
+ limited_required: ''
id: paragraph.image_with_text.field_text
field_name: field_text
entity_type: paragraph
@@ -23,5 +34,9 @@ required: true
translatable: true
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats:
+ - plain_text
+ - filtered_html
+ - limited_html
field_type: text_long
diff --git a/config/field.field.paragraph.text.field_footnotes.yml b/config/field.field.paragraph.text.field_footnotes.yml
index 26df27f2..8ce332a9 100755
--- a/config/field.field.paragraph.text.field_footnotes.yml
+++ b/config/field.field.paragraph.text.field_footnotes.yml
@@ -4,16 +4,22 @@ status: true
dependencies:
config:
- field.storage.paragraph.field_footnotes
+ - filter.format.footnotes
- paragraphs.paragraphs_type.text
module:
- allowed_formats
+ - field_config_cardinality
- text
third_party_settings:
allowed_formats:
- footnotes: footnotes
- plain_text: '0'
- filtered_html: '0'
- limited_html: '0'
+ allowed_formats:
+ - footnotes
+ field_config_cardinality:
+ cardinality_config: '1'
+ cardinality_label_config: false
+ unlimited_not_required: ''
+ limited_not_required: ''
+ limited_required: ''
id: paragraph.text.field_footnotes
field_name: field_footnotes
entity_type: paragraph
@@ -24,5 +30,7 @@ required: false
translatable: true
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats:
+ - footnotes
field_type: text_long
diff --git a/config/field.field.paragraph.text.field_text.yml b/config/field.field.paragraph.text.field_text.yml
index 3b406279..6f0f240c 100755
--- a/config/field.field.paragraph.text.field_text.yml
+++ b/config/field.field.paragraph.text.field_text.yml
@@ -4,16 +4,26 @@ status: true
dependencies:
config:
- field.storage.paragraph.field_text
+ - filter.format.filtered_html
+ - filter.format.limited_html
+ - filter.format.plain_text
- paragraphs.paragraphs_type.text
module:
- allowed_formats
+ - field_config_cardinality
- text
third_party_settings:
allowed_formats:
- limited_html: limited_html
- plain_text: '0'
- filtered_html: '0'
- footnotes: '0'
+ allowed_formats:
+ - plain_text
+ - filtered_html
+ - limited_html
+ field_config_cardinality:
+ cardinality_config: '1'
+ cardinality_label_config: false
+ unlimited_not_required: ''
+ limited_not_required: ''
+ limited_required: ''
id: paragraph.text.field_text
field_name: field_text
entity_type: paragraph
@@ -24,5 +34,9 @@ required: true
translatable: true
default_value: { }
default_value_callback: ''
-settings: { }
+settings:
+ allowed_formats:
+ - plain_text
+ - filtered_html
+ - limited_html
field_type: text_long
diff --git a/html/modules/custom/gho_footnotes/gho_footnotes.module b/html/modules/custom/gho_footnotes/gho_footnotes.module
index 4a111464..0027d897 100644
--- a/html/modules/custom/gho_footnotes/gho_footnotes.module
+++ b/html/modules/custom/gho_footnotes/gho_footnotes.module
@@ -6,8 +6,9 @@
*/
use Drupal\Component\Utility\Html;
-use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
use Drupal\gho_footnotes\GhoFootnotes;
/**
@@ -51,6 +52,9 @@ function gho_footnotes_theme() {
* Implements hook_node_view_alter().
*/
function gho_footnotes_node_view_alter(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
+ if (!empty($build['#skip_footnotes_processing'])) {
+ return;
+ }
gho_footnotes_prepare_build($build, $entity);
}
@@ -58,7 +62,7 @@ function gho_footnotes_node_view_alter(array &$build, EntityInterface $entity, E
* Implements hook_paragraph_view_alter().
*/
function gho_footnotes_paragraph_view_alter(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
- if ($entity->bundle() === 'text') {
+ if ($entity instanceof FieldableEntityInterface && $entity->hasField('field_text') && $entity->hasField('field_footnotes')) {
gho_footnotes_prepare_build($build, $entity);
}
}
@@ -110,7 +114,16 @@ function gho_footnotes_prepare_build(array &$build, EntityInterface $entity) {
}
}
- if ($build['#view_mode'] === 'preview' || $build['#view_mode'] === 'full') {
+ // On edit pages, we want to support different view modes, so that the
+ // footnotes appear rendered more or less correctly in the paragraph preview.
+ $is_edit_page = \Drupal::routeMatch()->getRouteName() == 'entity.node.edit_form';
+ $full_view_modes = array_filter([
+ 'preview',
+ 'full',
+ $is_edit_page ? 'default' : NULL,
+ $is_edit_page ? 'facts_and_figures' : NULL,
+ ]);
+ if (in_array($build['#view_mode'], $full_view_modes)) {
// Create a footnote list placeholder.
$build['footnotes'] = [
'#type' => 'inline_template',
diff --git a/html/modules/custom/gho_footnotes/src/GhoFootnotes.php b/html/modules/custom/gho_footnotes/src/GhoFootnotes.php
index c4765332..2e6c498b 100644
--- a/html/modules/custom/gho_footnotes/src/GhoFootnotes.php
+++ b/html/modules/custom/gho_footnotes/src/GhoFootnotes.php
@@ -25,8 +25,11 @@ public static function trustedCallbacks() {
public static function updateFootnotes($html, $build) {
$dom = Html::load($html);
+ // Define view modes that should not use accumulated.
+ $single_view_modes = ['preview', 'facts_and_figures'];
+
$accumulator = [];
- $accumulated = ($build['#view_mode'] ?? NULL) !== 'preview';
+ $accumulated = !in_array(($build['#view_mode'] ?? NULL), $single_view_modes);
// Process the texts with footnotes.
foreach (iterator_to_array($dom->getElementsByTagName('gho-footnotes-text')) as $node) {
diff --git a/html/modules/custom/ncms_graphql/graphql/ncms_schema_extension.base.graphqls b/html/modules/custom/ncms_graphql/graphql/ncms_schema_extension.base.graphqls
index e7079aec..4429ef07 100644
--- a/html/modules/custom/ncms_graphql/graphql/ncms_schema_extension.base.graphqls
+++ b/html/modules/custom/ncms_graphql/graphql/ncms_schema_extension.base.graphqls
@@ -6,6 +6,8 @@ type MetaData {
created: String
updated: String
summary: String
+ content_space: String
+ tags: [String]
autoVisible: Int!
forceUpdate: Int
}
diff --git a/html/modules/custom/ncms_graphql/src/Plugin/GraphQL/DataProducer/EntityLoadMultipleByTitle.php b/html/modules/custom/ncms_graphql/src/Plugin/GraphQL/DataProducer/EntityLoadMultipleByTitle.php
index e2877b51..a3c6d95c 100644
--- a/html/modules/custom/ncms_graphql/src/Plugin/GraphQL/DataProducer/EntityLoadMultipleByTitle.php
+++ b/html/modules/custom/ncms_graphql/src/Plugin/GraphQL/DataProducer/EntityLoadMultipleByTitle.php
@@ -2,6 +2,7 @@
namespace Drupal\ncms_graphql\Plugin\GraphQL\DataProducer;
+use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Entity\EntityPublishedInterface;
use Drupal\Core\Entity\EntityRepositoryInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -197,6 +198,9 @@ public function resolve($type, string $title, ?string $language, ?array $bundles
continue;
}
}
+ uasort($entities, function (ContentEntityInterface $a, ContentEntityInterface $b) {
+ return $a->get('created')->value <= $b->get('created')->value;
+ });
return new ContentSearchWrapper($entities);
});
}
diff --git a/html/modules/custom/ncms_graphql/src/Wrappers/ContentExportWrapper.php b/html/modules/custom/ncms_graphql/src/Wrappers/ContentExportWrapper.php
index cb42001d..4a006a1d 100644
--- a/html/modules/custom/ncms_graphql/src/Wrappers/ContentExportWrapper.php
+++ b/html/modules/custom/ncms_graphql/src/Wrappers/ContentExportWrapper.php
@@ -66,6 +66,9 @@ public function metaData() {
$field_query->addJoin('LEFT', 'node__field_summary', 'summary', 'n.nid = summary.entity_id');
$field_query->addJoin('LEFT', 'node__field_short_title', 'short_title', 'n.nid = short_title.entity_id');
$field_query->addJoin('LEFT', 'node__field_automatically_visible', 'auto_visible', 'n.nid = auto_visible.entity_id');
+ $field_query->addJoin('LEFT', 'node__field_content_space', 'content_space', 'n.nid = content_space.entity_id');
+ $field_query->addJoin('LEFT', 'node__field_computed_tags', 'computed_tags', 'n.nid = computed_tags.entity_id');
+ $field_query->addJoin('LEFT', 'taxonomy_term_field_data', 'cm_tag', 'content_space.field_content_space_target_id = cm_tag.tid');
$field_query->addField('n', 'nid', 'id');
$field_query->addField('n', 'status');
$field_query->addExpression('FROM_UNIXTIME(n.created)', 'created');
@@ -73,11 +76,17 @@ public function metaData() {
$field_query->addField('n', 'title');
$field_query->addField('short_title', 'field_short_title_value', 'title_short');
$field_query->addField('summary', 'field_summary_value', 'summary');
+ $field_query->addField('cm_tag', 'name', 'content_space');
+ $field_query->addField('computed_tags', 'field_computed_tags_value', 'tags');
$field_query->addField('n', 'force_update', 'forceUpdate');
$field_query->addField('auto_visible', 'field_automatically_visible_value', 'autoVisible');
$field_query->orderBy('n.changed', 'DESC');
- $result = $field_query->execute();
- return $result->fetchAllAssoc('id');
+ $result = $field_query->execute()->fetchAllAssoc('id');
+ $result = array_map(function ($item) {
+ $item->tags = explode(',', $item->tags);
+ return $item;
+ }, $result);
+ return $result;
}
/**
diff --git a/html/modules/custom/ncms_ui/css/frontend_styles.css b/html/modules/custom/ncms_ui/css/frontend_styles.css
index 57695f9f..b60a0788 100644
--- a/html/modules/custom/ncms_ui/css/frontend_styles.css
+++ b/html/modules/custom/ncms_ui/css/frontend_styles.css
@@ -83,9 +83,28 @@
flex-flow: row wrap;
margin: 0 -.5em;
}
-.paragraph--type--facts-and-figures .field--name-field-paragraphs > .field__item {
- flex: 0 0 32%;
- padding: 0 .5em;
+.paragraph--type--facts-and-figures .field--name-field-paragraphs.field__items {
+ display: flex;
+ flex-flow: row wrap;
+ gap: 1rem;
+}
+.paragraph--type--facts-and-figures .field--name-field-paragraphs.field__items > .field__item {
+ padding: 0;
+}
+.paragraph--type--facts-and-figures .field--name-field-paragraphs.field__items.col-1 > .field__item {
+ flex: 0 0 calc((100% - 3rem));
+}
+.paragraph--type--facts-and-figures .field--name-field-paragraphs.field__items.col-2 > .field__item {
+ flex: 0 0 calc((100% - 3rem) / 2);
+}
+.paragraph--type--facts-and-figures .field--name-field-paragraphs.field__items.col-3 > .field__item {
+ flex: 0 0 calc((100% - 3rem) / 3);
+}
+.paragraph--type--facts-and-figures .field--name-field-paragraphs.field__items.col-4 > .field__item {
+ flex: 0 0 calc((100% - 3rem) / 4);
+}
+.paragraph--type--facts-and-figures .field--name-field-paragraphs.field__items > .field__item > * {
+ padding: 0 0.5rem;
}
/*------------------------------------------------------------------------------
diff --git a/html/modules/custom/ncms_ui/ncms_ui.module b/html/modules/custom/ncms_ui/ncms_ui.module
index 6a4f14b6..9c7efb78 100644
--- a/html/modules/custom/ncms_ui/ncms_ui.module
+++ b/html/modules/custom/ncms_ui/ncms_ui.module
@@ -318,11 +318,17 @@ function ncms_ui_preprocess_field__paragraph__field_title__document_chapter(&$va
/**
* Implements hook_preprocess_hook().
*/
-function ncms_ui_preprocess_field__paragraph__achievement_list(&$variables) {
+function ncms_ui_preprocess_field__paragraph(&$variables, $original_hook) {
/** @var \Drupal\paragraphs\Entity\Paragraph $paragraph */
$paragraph = $variables['element']['#object'];
- $columns = $paragraph->hasField('field_columns') ? ($paragraph->get('field_columns')->value ?? 4) : 4;
- $variables['attributes']['class'][] = 'col-' . $columns;
+ if ($paragraph->hasField('field_columns')) {
+ $columns_field = $paragraph->get('field_columns');
+ if ($columns_field->isEmpty()) {
+ $columns_field->applyDefaultValue();
+ }
+ $columns = $columns_field->value;
+ $variables['attributes']['class'][] = 'col-' . $columns;
+ }
}
/**
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 1dbcd848..80b4d252 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -80,6 +80,8 @@ gho-facts-and-figures:
css:
theme:
components/gho-facts-and-figures/gho-facts-and-figures.css: {}
+ dependencies:
+ - common_design_subtheme/gho-aside
gho-further-reading:
css:
@@ -119,6 +121,8 @@ gho-story:
css:
theme:
components/gho-story/gho-story.css: {}
+ dependencies:
+ - common_design_subtheme/gho-aside
gho-text:
css:
diff --git a/html/themes/custom/common_design_subtheme/components/gho-achievement-list/gho-achievement-list.css b/html/themes/custom/common_design_subtheme/components/gho-achievement-list/gho-achievement-list.css
index e98e9a9a..ccede85e 100644
--- a/html/themes/custom/common_design_subtheme/components/gho-achievement-list/gho-achievement-list.css
+++ b/html/themes/custom/common_design_subtheme/components/gho-achievement-list/gho-achievement-list.css
@@ -21,7 +21,7 @@
/* Full size col-2 */
flex: 0 0 calc((100% - 2rem) / 2);
}
- .gho-achievement-list .field__items.col-4 > .field__items {
+ .gho-achievement-list .field__items.col-4 > .field__item {
flex: 0 0 calc((100% - 2rem) / 3);
}
}
diff --git a/html/themes/custom/common_design_subtheme/components/gho-facts-and-figures/gho-facts-and-figures.css b/html/themes/custom/common_design_subtheme/components/gho-facts-and-figures/gho-facts-and-figures.css
index d0bde01c..5b75f58a 100644
--- a/html/themes/custom/common_design_subtheme/components/gho-facts-and-figures/gho-facts-and-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/gho-facts-and-figures/gho-facts-and-figures.css
@@ -5,48 +5,50 @@
margin-bottom: 1.25rem;
}
-/**
- * Base facts and figures.
- */
-.gho-facts-and-figures__list {
- /* Compensate for the padding of the image and text paragraphs */
- margin: -0.625rem;
-}
.gho-facts-and-figures__item {
padding: 0.625rem;
}
-.gho-facts-and-figures__caption {
- margin-top: 1.25rem;
+.gho-facts-and-figures__item img {
+ width: 100%;
}
-.gho-facts-and-figures__item + .gho-facts-and-figures__item {
- margin-top: 1.5rem;
+.gho-facts-and-figures__caption {
+ margin-top: 1.25rem;
}
/**
- * Three columns.
+ * Up to three columns.
*
* In this mode, the images (responsive) span 1/3 of the width of the page's
* content region on desktop and on smaller screens they take up the entire
* content column width like the single column.
*/
-@media screen and (min-width: 768px) {
- .gho-facts-and-figures__list {
- display: flex;
- flex-wrap: wrap;
- justify-content: space-around;
+.gho-facts-and-figures__list {
+ display: flex;
+ flex-flow: row wrap;
+ gap: 1rem;
+ /* Compensate for the padding of the image and text paragraphs */
+ margin: -0.625rem;
+}
+
+.gho-facts-and-figures__list .gho-facts-and-figures__item {
+ width: 100%;
+}
+
+@media (min-width: 734px) {
+ .col-2 .gho-facts-and-figures__list > .gho-facts-and-figures__item {
+ flex: 0 0 calc((100% - 1rem) / 2);
}
- .gho-facts-and-figures__item {
- /* Not using flex-basis to determine the width because it doesn't work well
- * in IE11 wih the padding and negative margins on the parent. Using the
- * width works everywhere. */
- flex-basis: auto;
- flex-grow: 0;
- flex-shrink: 0;
- width: 33.33%;
+ .col-3 .gho-facts-and-figures__list > .gho-facts-and-figures__item {
+ /* Full size col-2 */
+ flex: 0 0 calc((100% - 2rem) / 2);
}
- .gho-facts-and-figures__item + .gho-facts-and-figures__item {
- margin-top: 0;
+}
+
+@media (min-width: 960px) {
+ .col-3 .gho-facts-and-figures__list > .gho-facts-and-figures__item {
+ /* Full size col-3 */
+ flex: 0 0 calc((100% - 2rem) / 3);
}
}
diff --git a/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-paragraphs--facts-and-figures.html.twig b/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-paragraphs--facts-and-figures.html.twig
index 88112f25..6cf1002f 100644
--- a/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-paragraphs--facts-and-figures.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/fields/field--paragraph--field-paragraphs--facts-and-figures.html.twig
@@ -1,4 +1,4 @@
-