diff --git a/source/_patterns/04-components/card/card--node/card--node.twig b/source/_patterns/04-components/card/card--node/card--node.twig
index c84cf82b79b28d3b0dcc4f5c503bd68ea0c2ef64..fb1406c2445d2d16187b9c1ef6a302cdf153aff8 100644
--- a/source/_patterns/04-components/card/card--node/card--node.twig
+++ b/source/_patterns/04-components/card/card--node/card--node.twig
@@ -20,24 +20,7 @@
'show_hover': '',
'author': node.author,
'url': node.url,
- 'email': node.email,
- 'phone': node.phone,
- 'location': node.location,
- 'link_profile': node.link_profile,
- 'personal_webpage': node.personal_webpage,
'additional_info': node.additional_info,
- 'contact_for': node.contact_for,
- 'groups': node.groups,
- 'featured_image': featured_image,
- 'card_type': 'node',
- 'hero': node.hero,
- 'host': node.host,
- 'event_website': node.event_website,
- 'cost': node.cost,
- 'map': node.map,
- 'address': node.address,
- 'map_link': node.map_link,
- 'catalog_tags': node.catalog_tags,
- 'position': node.position,
+ 'location_info': node.location_info,
} %}
</div>
diff --git a/source/_patterns/04-components/card/card-footer-elements/_additional-info.twig b/source/_patterns/04-components/card/card-footer-elements/_additional-info.twig
new file mode 100644
index 0000000000000000000000000000000000000000..8d33e636b0e4a93b53ed01df5377a138cda1dffa
--- /dev/null
+++ b/source/_patterns/04-components/card/card-footer-elements/_additional-info.twig
@@ -0,0 +1,32 @@
+<div class="card__additional-info">
+ {% embed '@components/details/details.twig' with {
+ 'is_open': TRUE,
+ } %}
+ {% block details_summary %}
+ Additional Information
+ {% endblock %}
+
+ {% block details_content %}
+
+ {% if additional_info.host %}
+ <span class="uw-label">Host:</span>
+ {% include '@components/links/links.twig' with {
+ 'links': additional_info.host
+ } %}
+ {% endif %}
+
+ {% if additional_info.event_website %}
+ <span class="uw-label">Event website:</span>
+ {% include '@components/links/links.twig' with {
+ 'links': additional_info.event_website
+ } %}
+ {% endif %}
+
+ {% if additional_info.cost %}
+ <span class="uw-label">Cost:</span>
+ {{ additional_info.cost }}
+ {% endif %}
+
+ {% endblock %}
+ {% endembed %}
+</div>
diff --git a/source/_patterns/04-components/card/card-footer-elements/_location-info.twig b/source/_patterns/04-components/card/card-footer-elements/_location-info.twig
new file mode 100644
index 0000000000000000000000000000000000000000..5c1fcc58cb0ae8a14e32ec73e571cc18c0357dd0
--- /dev/null
+++ b/source/_patterns/04-components/card/card-footer-elements/_location-info.twig
@@ -0,0 +1,41 @@
+<div class="card__location">
+ {% embed '@components/details/details.twig' with {
+ is_open: TRUE,
+ } %}
+ {% block details_summary %}
+ Location Information
+ {% endblock %}
+
+ {% block details_content %}
+ {% if address %}
+ <div class="card__address">
+ <span class="uw-label">Location Address:</span>
+ {% if address.organization %}
+ {{ address.organization }}<br />
+ {% endif %}
+ {% if address.address_line1 %}
+ {{ address.address_line1 }}<br />
+ {% endif %}
+ {% if address.address_line2 %}
+ {{ address.address_line2 }}<br />
+ {% endif %}
+ {% if address.locality or address.administrative_area or address.country_code or address.postal_code %}
+ {% if address.locality %}{{ address.locality }}{% if address.administrative_area %}, {% endif %}{% endif %}{% if address.administrative_area %}{{ address.administrative_area }}{% endif %}{% if address.country_code and (address.locality or address.administrative_area) %}, {% endif %}{% if address.country_code %}{{ address.country_code }}{% endif %}{% if address.postal_code and (address.locality or address.administrative_area or address.country_code) %} {% endif %}{% if address.postal_code %}{{ address.postal_code }}{% endif %}
+ {% endif %}
+ </div>
+ {% endif %}
+ {% if map %}
+ <div class="card__map">
+ <span class="uw-label">Location coordinates:</span>
+ {{ map }}
+ </div>
+ {% endif %}
+ {% if map_link %}
+ <div class="card__map-link">
+ <span class="uw-label"> Link to map:</span>
+ <a href="{{ map_link.uri }}">{{ map_link.uri }}</a>
+ </div>
+ {% endif %}
+ {% endblock %}
+ {% endembed %}
+</div>
diff --git a/source/_patterns/04-components/card/card.twig b/source/_patterns/04-components/card/card.twig
index 8bca1dbf97da18ad658b001d35643fae4abc5e6e..26891cea8c0263c841d4b827cb3537b04a93ae98 100644
--- a/source/_patterns/04-components/card/card.twig
+++ b/source/_patterns/04-components/card/card.twig
@@ -104,49 +104,16 @@
<div class="card__footer">
{{ footer }}
+ {{ dd(additional_info) }}
{% if additional_info %}
- <div class="card__additional-info">
- {% embed '@components/details/details.twig' %}
- {% block details_summary %}
- Additional Information
- {% endblock %}
-
- {% block details_content %}
- <div class="card__additional-info-content">
- {{ additional_info }}
- </div>
- {% endblock %}
- {% endembed %}
- </div>
+ {% include '@components/card/card-footer-elements/_additional-info.twig' with {
+ 'additional_info': additional_info
+ } %}
{% endif %}
- {% if email or phone or location %}
- <div class="card__contact-info">
- {% embed '@components/details/details.twig' %}
- {% block details_summary %}
- Contact Information
- {% endblock %}
-
- {% block details_content %}
- {% if email %}
- <div class="card__email">
- <a href="mailto:{{ email }}">{{ email }}</a>
- </div>
- {% endif %}
- {% if phone %}
- <div class="card__phone">
- {{ phone }}
- </div>
- {% endif %}
- {% if location %}
- <div class="card__location">
- <span class="uw-label">Location:</span> {{ location }}
- </div>
- {% endif %}
- {% endblock %}
- {% endembed %}
- </div>
+ {% if contact_info %}
+ some include
{% endif %}
{% if link_profile or personal_webpage %}
@@ -174,93 +141,12 @@
</div>
{% endif %}
- {% if host or event_website or cost %}
- <div class="card__additional-info">
- {% embed '@components/details/details.twig' with {
- is_open: TRUE,
- } %}
- {% block details_summary %}
- Additional Information
- {% endblock %}
-
- {% block details_content %}
- {% if host %}
- <div class="card__host">
- <span class="uw-label"> Host:</span>
- <a href="{{ host.uri }}">
- {% if host.title %}
- {{ host.title }}
- {% else %}
- {{ host.uri }}
- {% endif %}
- </a>
- </div>
- {% endif %}
- {% if event_website %}
- <div class="card__event-website">
- <span class="uw-label"> Event website:</span>
- <a href="{{ event_website.uri }}">
- {% if event_website.title %}
- {{ event_website.title }}
- {% else %}
- {{ event_website.uri }}
- {% endif %}
- </a>
- </div>
- {% endif %}
- {% if cost %}
- <div class="card__cost">
- <span class="uw-label">Cost:</span>
- ${{ cost }}
- </div>
- {% endif %}
- {% endblock %}
- {% endembed %}
- </div>
- {% endif %}
-
- {% if address or map or map_link %}
- <div class="card__location">
- {% embed '@components/details/details.twig' with {
- is_open: TRUE,
- } %}
- {% block details_summary %}
- Location Information
- {% endblock %}
-
- {% block details_content %}
- {% if address %}
- <div class="card__address">
- <span class="uw-label">Location Address:</span>
- {% if address.organization %}
- {{ address.organization }}<br />
- {% endif %}
- {% if address.address_line1 %}
- {{ address.address_line1 }}<br />
- {% endif %}
- {% if address.address_line2 %}
- {{ address.address_line2 }}<br />
- {% endif %}
- {% if address.locality or address.administrative_area or address.country_code or address.postal_code %}
- {% if address.locality %}{{ address.locality }}{% if address.administrative_area %}, {% endif %}{% endif %}{% if address.administrative_area %}{{ address.administrative_area }}{% endif %}{% if address.country_code and (address.locality or address.administrative_area) %}, {% endif %}{% if address.country_code %}{{ address.country_code }}{% endif %}{% if address.postal_code and (address.locality or address.administrative_area or address.country_code) %} {% endif %}{% if address.postal_code %}{{ address.postal_code }}{% endif %}
- {% endif %}
- </div>
- {% endif %}
- {% if map %}
- <div class="card__map">
- <span class="uw-label">Location coordinates:</span>
- {{ map }}
- </div>
- {% endif %}
- {% if map_link %}
- <div class="card__map-link">
- <span class="uw-label"> Link to map:</span>
- <a href="{{ map_link.uri }}">{{ map_link.uri }}</a>
- </div>
- {% endif %}
- {% endblock %}
- {% endembed %}
- </div>
+ {% if location_info %}
+ {% include '@components/card/card-footer-elements/_location-info.twig' with {
+ 'address': location_info.address,
+ 'map': location_info.map,
+ 'map_link': location_info.map_link,
+ }%}
{% endif %}
{% if contact_for %}
diff --git a/source/_patterns/04-components/links/links.twig b/source/_patterns/04-components/links/links.twig
new file mode 100644
index 0000000000000000000000000000000000000000..7c1d21442221d43defd148992cbd2d0cf0f97f15
--- /dev/null
+++ b/source/_patterns/04-components/links/links.twig
@@ -0,0 +1,9 @@
+{% for link in links %}
+ <a href="{{ link.uri }}">
+ {% if link.title %}
+ {{ link.title }}
+ {% else %}
+ {{ link.uri }}
+ {% endif %}
+ </a>
+{% endfor %}