diff --git a/blt/md/md-1947 b/blt/md/md-1947
new file mode 100644
index 000000000..c6b13a24c
--- /dev/null
+++ b/blt/md/md-1947
@@ -0,0 +1 @@
+campuschampions_cyberinfrastructure_org
diff --git a/composer.lock b/composer.lock
index ea7f98aaf..625739332 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": "58a40cd4ac0d6bc3507020d09839e793",
+ "content-hash": "62cb3faa1a53be517640259b96e4f4d2",
"packages": [
{
"name": "access/drupal_seamless_cilogon",
@@ -295,7 +295,7 @@
"source": {
"type": "git",
"url": "https://github.com/necyberteam/access.git",
- "reference": "349fec95fe37430c80bb1fa275405763c28e818f"
+ "reference": "e2bf244388c12721a2543a621c16d818a660cdb4"
},
"default-branch": true,
"type": "drupal-custom-module",
@@ -313,7 +313,7 @@
"issues": "https://github.com/necyberteam/access/issues",
"source": "https://github.com/necyberteam/access"
},
- "time": "2024-01-05T16:27:37+00:00"
+ "time": "2024-01-05T20:11:26+00:00"
},
{
"name": "arthurkushman/query-path",
@@ -11338,7 +11338,7 @@
"source": {
"type": "git",
"url": "https://github.com/necyberteam/aspTheme.git",
- "reference": "d116b6a49dcec9941369cfb58073a9371269428e"
+ "reference": "507812c691f7fefb7b7e6098d28b05af0b5a4683"
},
"default-branch": true,
"type": "drupal-theme",
@@ -11356,7 +11356,7 @@
"issues": "https://github.com/necyberteam/aspTheme/issues",
"source": "https://github.com/necyberteam/aspTheme"
},
- "time": "2024-01-05T16:35:27+00:00"
+ "time": "2024-01-05T20:02:04+00:00"
},
{
"name": "necyberteam/campus-champions-theme",
@@ -11364,7 +11364,7 @@
"source": {
"type": "git",
"url": "https://github.com/necyberteam/campus-champions-theme.git",
- "reference": "acf7243377991516fa6ac6a21ec77ed44a41504b"
+ "reference": "144634d4e7459482e4803c32a9fc5d2bac3a7759"
},
"default-branch": true,
"type": "drupal-theme",
@@ -11382,7 +11382,7 @@
"issues": "https://github.com/necyberteam/campus-champions-theme/issues",
"source": "https://github.com/necyberteam/campus-champions-theme"
},
- "time": "2024-01-05T16:19:53+00:00"
+ "time": "2024-01-05T16:37:53+00:00"
},
{
"name": "nikic/php-parser",
diff --git a/tests/behat/features/asp/affinity-groups/affinity_groups-individual.feature b/tests/behat/features/asp/affinity-groups/affinity_groups-individual.feature
index e7ea94ed8..2ee396555 100644
--- a/tests/behat/features/asp/affinity-groups/affinity_groups-individual.feature
+++ b/tests/behat/features/asp/affinity-groups/affinity_groups-individual.feature
@@ -150,6 +150,7 @@ Feature: Feature: test an Affinity Groups page
Given I am logged in as a user with the "authenticated" role
When I am on "/affinity-groups/cloud-computing"
When I follow "Join"
+ Wait 2 seconds
Then I should see "You have joined this affinity group"
When I follow "Leave"
Then I should see "You have left this affinity group"
diff --git a/tests/behat/features/templates/affinity_groups/affinity_group.feature b/tests/behat/features/templates/affinity_groups/affinity_group.feature
index 0fc6abb76..c3e9632bf 100644
--- a/tests/behat/features/templates/affinity_groups/affinity_group.feature
+++ b/tests/behat/features/templates/affinity_groups/affinity_group.feature
@@ -143,6 +143,7 @@ Feature: Feature: test an Affinity Group page
Given I am logged in as a user with the "authenticated" role
When I am on "/affinity-groups/cloud-computing"
When I follow "Join"
+ Wait 2 seconds
Then I should see "You have joined this affinity group"
And I wait 10 seconds
When I follow "Leave"
diff --git a/web/sites/default/config/default/core.entity_view_display.eventinstance.default.default.yml b/web/sites/default/config/default/core.entity_view_display.eventinstance.default.default.yml
index b607dcf8d..29afdd9d7 100644
--- a/web/sites/default/config/default/core.entity_view_display.eventinstance.default.default.yml
+++ b/web/sites/default/config/default/core.entity_view_display.eventinstance.default.default.yml
@@ -16,14 +16,6 @@ targetEntityType: eventinstance
bundle: default
mode: default
content:
- affinity_group:
- type: entity_reference_label
- label: above
- settings:
- link: true
- third_party_settings: { }
- weight: 9
- region: content
affinity_group_node_ref:
type: entity_reference_label
label: above
@@ -66,18 +58,18 @@ content:
label: above
settings: { }
third_party_settings: { }
- weight: 10
+ weight: 9
region: content
location:
type: text_default
- label: hidden
+ label: above
settings: { }
third_party_settings: { }
weight: 6
region: content
registration:
type: link
- label: hidden
+ label: above
settings:
trim_length: 80
url_only: false
@@ -92,7 +84,7 @@ content:
label: above
settings: { }
third_party_settings: { }
- weight: 11
+ weight: 10
region: content
tags:
type: entity_reference_label
@@ -111,5 +103,6 @@ content:
weight: 2
region: content
hidden:
+ affinity_group: true
body: true
event_affiliation: true
diff --git a/web/themes/nect-theme/templates/field--eventinstance--tags.html.twig b/web/themes/nect-theme/templates/field--eventinstance--tags.html.twig
new file mode 100644
index 000000000..0e6b67eb2
--- /dev/null
+++ b/web/themes/nect-theme/templates/field--eventinstance--tags.html.twig
@@ -0,0 +1,75 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a field.
+ *
+ * To override output, copy the "field.html.twig" from the templates directory
+ * to your theme's directory and customize it, just like customizing other
+ * Drupal templates such as page.html.twig or node.html.twig.
+ *
+ * Instead of overriding the theming for all fields, you can also just override
+ * theming for a subset of fields using
+ * @link themeable Theme hook suggestions. @endlink For example,
+ * here are some theme hook suggestions that can be used for a field_foo field
+ * on an article node type:
+ * - field--node--field-foo--article.html.twig
+ * - field--node--field-foo.html.twig
+ * - field--node--article.html.twig
+ * - field--field-foo.html.twig
+ * - field--text-with-summary.html.twig
+ * - field.html.twig
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - multiple: TRUE if a field can contain multiple items.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item's content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see template_preprocess_field()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set title_classes = [
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+
+
+{% if label_hidden %}
+ {% if multiple %}
+
+ {% for item in items %}
+ {{ item.content }}