diff --git a/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/content/16100_biography-stephen-chanock.content.yml b/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/content/16100_biography-stephen-chanock.content.yml index 680fd7bac2..74f24354a0 100644 --- a/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/content/16100_biography-stephen-chanock.content.yml +++ b/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/content/16100_biography-stephen-chanock.content.yml @@ -14,7 +14,7 @@ args: - 'image' - type: 'module' - filename: '2059-160x140.jpg' + filename: 'biographies-chanock.png' alt: 'Stephen J. Chanock, M.D.' - entity: "node" type: "cgov_biography" diff --git a/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/2059-160x140.jpg b/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/2059-160x140.jpg deleted file mode 100644 index 65de178776..0000000000 Binary files a/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/2059-160x140.jpg and /dev/null differ diff --git a/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/biographies-chanock.png b/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/biographies-chanock.png new file mode 100644 index 0000000000..ae92cd438b Binary files /dev/null and b/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/biographies-chanock.png differ diff --git a/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/dr_chanock_headshot.png b/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/dr_chanock_headshot.png deleted file mode 100644 index cd16d7980b..0000000000 Binary files a/docroot/profiles/custom/cgov_site/modules/custom/cgov_yaml_content/images/dr_chanock_headshot.png and /dev/null differ diff --git a/docroot/profiles/custom/cgov_site/themes/custom/cgov/src/styles/_profile-panel.scss b/docroot/profiles/custom/cgov_site/themes/custom/cgov/src/styles/_profile-panel.scss deleted file mode 100644 index 8958a0e218..0000000000 --- a/docroot/profiles/custom/cgov_site/themes/custom/cgov/src/styles/_profile-panel.scss +++ /dev/null @@ -1,192 +0,0 @@ -.profile-panel { - .slot-item { - background: $white; - border: 1px solid $yetAnotherGrey; - box-shadow: 0 0 9px 1px rgba(0, 0, 0, 0.15); - display: flex; - flex-direction: column; - justify-content: flex-start; - margin: 1.3em 0 0 0; - overflow: hidden; - padding: 25px; - width: 100%; - - @include break(medium) { - flex-direction: row; - } - } - - &-image { - flex: none; - margin-bottom: 16px; - max-width: 206px; - text-align: center; - width: 206px; - } - - &-content { - color: $dgrey00; - flex: 1 1 auto; - font-family: $montserrat-font-stack; - font-size: 16px; - line-height: 1.5; - padding: 0; - word-wrap: break-word; - - h1 { - margin-top: 0; - } - - .profile-title { - font-size: 18px; - line-height: 1.33; - - &:last-of-type { - margin-bottom: 1.25em; - } - } - - .profile-orgs, - .profile-titles { - margin-bottom: 1.25em; - } - - p { - font-size: 16px; - line-height: 1.5; - } - - @include break(medium) { - padding-left: 25px; - } - } - - .contact-divider { - display: none; - margin: 0 5px; - - @include break(medium) { - display: inline-block; - } - } - - &-social-media { - @include break(medium) { - display: flex; - flex-direction: row; - width: 100%; - } - } - - .profile-contact-info { - margin-bottom: 1.25em; - - @include break(medium) { - & > div { - display: inline-block; - } - } - } - - .profile-social-link { - display: inline-block; - height: 35px; - margin-bottom: 15px; - margin-right: 20px; - width: 35px; - - @include break(medium) { - align-items: center; - display: flex; - } - - .icon { - background: $dteal; - border-radius: 50%; - display: inline-block; - height: 35px; - position: relative; - width: 35px; - - &::after { - content: ""; - display: inline-block; - font-size: 1.1em; - height: 28px; - left: 0; - right: 0; - margin: 0 auto; - position: absolute; - top: 2px; - width: 25px; - } - } - - &.twitter { - @include break(medium) { - flex: none; - } - - .icon { - &::after { - @include svg-sprite(twitter-x-white, bg); - width: 20px; - height: 20px; - top: 8px; - } - } - } - - &.linkedin { - @include break(medium) { - flex: none; - } - - .icon { - &::after { - @include svg-sprite(linkedin-white, bg); - width: 17px; - height: 17px; - top: 8px; - } - } - } - - &.publications { - align-items: center; - display: flex; - flex: 1 1 auto; - margin-right: 0; - width: 100%; - - .icon { - display: inline-block; - margin-right: 10px; - - &::after { - @include svg-sprite(file-icon, bg); - } - } - } - } -} - -.press-contact { - background: $white; - border: 1px solid $yetAnotherGrey; - box-shadow: 0 0 9px 1px rgba(0, 0, 0, 0.15); - margin: 1.3em 0 1.5em 0; - padding: 15px; - - h2 { - color: $dgrey00; - font-size: 23px; - margin-top: 0; - } - - p { - &:last-child { - margin-bottom: 0; - } - } -} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/biography/biography-legacy.scss b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/biography/biography-legacy.scss index d2a8f379c9..2ba2c70924 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/biography/biography-legacy.scss +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/biography/biography-legacy.scss @@ -9,7 +9,6 @@ @import '../../legacy/styles/variables'; @import '../../legacy/styles/breakpoint-mixins'; @import '~Styles/sprites/svg-sprite'; -@import '~Core/styles/profile-panel'; // Override wrapper styles for embedded images // (Specifically the figure and caption/credit/enlarge styles @@ -18,3 +17,25 @@ @import '../../legacy/transition-hacks/inner-page-embed-feature-card-hack'; @import '../../legacy/transition-hacks/inner-page-embed-entity-hack'; @import '../../legacy/transition-hacks/inner-page-embed-infographic-hack'; + +// Styles for press contact that was located in profile-panel +.press-contact { + background: $white; + border: 1px solid $yetAnotherGrey; + box-shadow: 0 0 9px 1px rgba(0, 0, 0, 0.15); + margin: 1.3em 0 1.5em 0; + padding: 15px; + + h2 { + color: $dgrey00; + font-size: 23px; + margin-top: 0; + } + + p { + &:last-child { + margin-bottom: 0; + } + } +} + diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/biography/biography.scss b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/biography/biography.scss index 1e2f1b8d2b..19636d2f66 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/biography/biography.scss +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/biography/biography.scss @@ -6,6 +6,7 @@ @forward '../../lib/components/cgdp-article-footer/'; @forward '../../lib/components/cgdp-related-resources'; @forward '../../lib/components/cgdp-document-dates'; +@forward '../../lib/components/cgdp-profile-box'; @forward '../../lib/components/wysiwyg/common/cgdp-embed-image'; @forward '../../lib/components/wysiwyg/common/cgdp-embed-infographic'; @forward '../../lib/components/wysiwyg/common/cgdp-embed-video'; diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/cancer-center/cancer-center-legacy.scss b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/cancer-center/cancer-center-legacy.scss index d2a8f379c9..a3d1c6bd76 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/cancer-center/cancer-center-legacy.scss +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/cancer-center/cancer-center-legacy.scss @@ -9,7 +9,6 @@ @import '../../legacy/styles/variables'; @import '../../legacy/styles/breakpoint-mixins'; @import '~Styles/sprites/svg-sprite'; -@import '~Core/styles/profile-panel'; // Override wrapper styles for embedded images // (Specifically the figure and caption/credit/enlarge styles diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/cancer-center/cancer-center.scss b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/cancer-center/cancer-center.scss index 6f0fc4f2f9..dba1427a92 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/cancer-center/cancer-center.scss +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/entrypoints/cancer-center/cancer-center.scss @@ -6,6 +6,7 @@ @forward '../../lib/components/cgdp-article-footer/'; @forward '../../lib/components/cgdp-related-resources'; @forward '../../lib/components/cgdp-document-dates'; +@forward '../../lib/components/cgdp-profile-box'; @forward '../../lib/components/wysiwyg/common/cgdp-embed-image'; @forward '../../lib/components/wysiwyg/common/cgdp-embed-infographic'; @forward '../../lib/components/wysiwyg/common/cgdp-embed-video'; diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/cgdp-profile-box.ts b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/cgdp-profile-box.ts new file mode 100644 index 0000000000..3c44b3b907 --- /dev/null +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/cgdp-profile-box.ts @@ -0,0 +1,4 @@ +const initialize = () => { + // +}; +export default initialize; diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/index.scss b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/index.scss new file mode 100644 index 0000000000..ad5e87fd70 --- /dev/null +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/index.scss @@ -0,0 +1,37 @@ +@forward 'usa-icon'; +@use 'uswds-core' as *; + +.cgdp-profile-box { + @include u-shadow(2); + @include u-radius('md'); + @include u-padding(3); + + // TODO we should just expect good images, right? + img { + max-width: 100%; + height: auto; + } + + .cgdp-profile-box__heading { + @include typeset-h1; + margin: 0 0 units(2); + } + + .cgdp-profile-box__title { + font-size: size("body", "sm"); + } + + .cgdp-profile-box__titles, + .cgdp-profile-box__org { + @include unstyled-list; + @include u-margin-y(2); + } + + .cgdp-profile-box__address, + .cgdp-profile-box__phone, + .cgdp-profile-box__publications, + .cgdp-profile-box__social-media, + .cgdp-profile-box__website { + @include u-margin-y(2); + } +} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/index.ts b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/index.ts new file mode 100644 index 0000000000..506ebf3768 --- /dev/null +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/front-end/src/lib/components/cgdp-profile-box/index.ts @@ -0,0 +1,3 @@ +// Passthrough for cleaner imports. +import initialize from './cgdp-profile-box'; +export default initialize; diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-campus.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-campus.html.twig index f36f82c862..18e9f3ea64 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-campus.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-campus.html.twig @@ -1,3 +1,3 @@ {% for item in items %} - {{ item.content }} -{% endfor %} \ No newline at end of file + {{ item.content }} +{% endfor %} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-email-address.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-email-address.html.twig index 2e6a2ff2c9..37b4b3b39a 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-email-address.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-email-address.html.twig @@ -1,7 +1,5 @@ {% for item in items %} -
- - {{ item.content }} - -
+ + {{ item.content }} + {% endfor %} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-linkedin-handle.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-linkedin-handle.html.twig index 87bc312387..65378e8827 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-linkedin-handle.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-linkedin-handle.html.twig @@ -1,6 +1,6 @@ {% for item in items %} - - - Connect with me on LinkedIn - -{% endfor %} \ No newline at end of file + + + Connect with me on LinkedIn + +{% endfor %} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-office-location.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-office-location.html.twig index d5e61556cd..18e9f3ea64 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-office-location.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-office-location.html.twig @@ -1,3 +1,3 @@ {% for item in items %} - {{ item.content }} + {{ item.content }} {% endfor %} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-phone-number.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-phone-number.html.twig index 422576523f..18e9f3ea64 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-phone-number.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-phone-number.html.twig @@ -1,3 +1,3 @@ {% for item in items %} -
{{ item.content }}
-{% endfor %} \ No newline at end of file + {{ item.content }} +{% endfor %} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-scientific-publications.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-scientific-publications.html.twig index 95876bbcdf..b1941feb14 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-scientific-publications.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-scientific-publications.html.twig @@ -1,7 +1,3 @@ {% for item in items %} - - - View my - Scientific Publications - -{% endfor %} \ No newline at end of file + Scientific Publications +{% endfor %} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-title.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-title.html.twig index f2ddf3e0af..bc8771393a 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-title.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-title.html.twig @@ -1,5 +1,5 @@ -
+
+ diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-twitter-handle.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-twitter-handle.html.twig index 82d51672ea..8ab0dea99f 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-twitter-handle.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/field--field-twitter-handle.html.twig @@ -1,6 +1,6 @@ {% for item in items %} - - - Follow me on X - -{% endfor %} \ No newline at end of file + + + Follow me on X + +{% endfor %} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/node--cgov-biography--full.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/node--cgov-biography--full.html.twig index e020dbddb7..08749eae0b 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/node--cgov-biography--full.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/biography/node--cgov-biography--full.html.twig @@ -2,71 +2,68 @@ {% import '@ncids_trans/content_page_macros.twig' as contentPageMacros %}
-
-
-
-
-
-
- {{ content.field_image_promotional }} -
-
-

- {{ node.label }} -

+
+
+
+ {{ content.field_image_promotional }} +
+
+

{{ node.label }}

- {{ content.field_title }} +
+ {{ content.field_title }} - {% if content.field_org_name_1|field_value or content.field_org_name_2|field_value %} -
-
- {% if content.field_org_url_1|field_value %} - {{ content.field_org_name_1 }} - {% else %} - {{ content.field_org_name_1 }} - {% endif %} -
+ {% if content.field_org_name_1|field_value or content.field_org_name_2|field_value %} +
    + {% if content.field_org_url_1|field_value %} +
  • {{ content.field_org_name_1 }}
  • + {% else %} +
  • {{ content.field_org_name_1 }}
  • + {% endif %} - {% if content.field_org_name_2|field_value %} -
    - {% if content.field_org_url_2|field_value %} - {{ content.field_org_name_2 }} - {% else %} - {{ content.field_org_name_2 }} - {% endif %} -
    - {% endif %} -
- {% endif %} + {% if content.field_org_name_2|field_value %} + {% if content.field_org_url_2|field_value %} +
  • {{ content.field_org_name_2 }}
  • + {% else %} +
  • {{ content.field_org_name_2 }}
  • + {% endif %} + {% endif %} + + {% endif %} - {% if content.field_campus|field_value or content.field_office_location|field_value %} -

    - {{ content.field_campus }} - {{ (content.field_campus|field_value and content.field_office_location|field_value)? '|' : '' }} - {{ content.field_office_location }} -

    - {% endif %} +
    + {% if content.field_campus|field_value or content.field_office_location|field_value %} + {{ content.field_campus }} + {{ (content.field_campus|field_value and content.field_office_location|field_value)? '|' : '' }} + {{ content.field_office_location }} + {% endif %} +
    - {% if content.field_phone_number|field_value or content.field_email_address|field_value %} -
    - {{ content.field_phone_number}} - {{ (content.field_phone_number|field_value and content.field_email_address|field_value)? '|': '' }} - {{ content.field_email_address }} -
    - {% endif %} +
    + {% if content.field_phone_number|field_value or content.field_email_address|field_value %} + {{ content.field_phone_number }} + {{ (content.field_phone_number|field_value and content.field_email_address|field_value)? '|': '' }} + {{ content.field_email_address }} + {% endif %} +
    - {% if content.field_twitter_handle|field_value or content.field_linkedin_handle|field_value or content.field_scientific_publications|field_value %} - - {% endif %} -
    -
    -
    - + {{ content.field_scientific_publications }} + +
    +
    +
    +
    + + +
    +
    +
    {{ content.body }} {% if node.field_display_bio_press_info.value == '1' %} diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/cancer_center/address-plain.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/cancer_center/address-plain.html.twig index 116901ffcc..78057cae03 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/cancer_center/address-plain.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/cancer_center/address-plain.html.twig @@ -32,7 +32,7 @@ * @ingroup themeable */ #} -

    +

    {% if address_line1 %} {{ address_line1 }}
    {% endif %} @@ -55,4 +55,4 @@ {{ postal_code }} {% endif %} {% endif %} -

    +
    diff --git a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/cancer_center/node--cgov-cancer-center--full.html.twig b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/cancer_center/node--cgov-cancer-center--full.html.twig index e6ac294669..52c2bbd663 100644 --- a/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/cancer_center/node--cgov-cancer-center--full.html.twig +++ b/docroot/profiles/custom/cgov_site/themes/custom/ncids_trans/templates/content/cancer_center/node--cgov-cancer-center--full.html.twig @@ -2,64 +2,68 @@ {% import '@ncids_trans/content_page_macros.twig' as contentPageMacros %}
    -
    -
    -
    -
    -
    - -
    - {{ content.field_image_promotional }} -
    -
    -

    {{ node.label }}

    - {% if content.field_parent_institution[0] or content.field_institution_type[0] %} -
    - {{ content.field_parent_institution }} - {% if content.field_parent_institution[0] and content.field_institution_type[0] %} -
    - {% endif %} - {{ content.field_institution_type }} -
    - {%- endif -%} - {%- if content.field_org_head_name[0] -%} -

    - {{ content.field_org_head_name|field_value }} - {%- if content.field_org_head_title[0] -%} - , - {{ content.field_org_head_title }} - {%- endif -%} -

    - {%- endif -%} +
    +
    +
    + {{ content.field_image_promotional }} +
    - {% if content.field_address[0] %} - {{ content.field_address }} - {% endif %} +
    +

    {{ node.label }}

    - {% if content.field_phone_number_1[0] or content.field_phone_number_2[0]%} -

    - {% if content.field_phone_label_1[0] and content.field_phone_number_1[0] %} - {{- content.field_phone_label_1|field_value -}}: - {{ content.field_phone_number_1 }}
    - {% endif %} - {% if content.field_phone_label_2[0] and content.field_phone_number_2[0] %} - {{ content.field_phone_label_2|field_value -}}: - {{ content.field_phone_number_2 }} - {% endif %} -

    - {% endif %} +
    + {% if content.field_parent_institution[0] or content.field_institution_type[0] %} +
      + {%- if content.field_parent_institution[0] -%} +
    • {{ content.field_parent_institution }}
    • + {%- endif -%} + {%- if content.field_institution_type[0] -%} +
    • {{ content.field_institution_type }}
    • + {%- endif -%} +
    + {%- endif -%} - {% if content.field_website_title[0] and content.field_website_url[0] %} -

    - {{ content.field_website_title }} -

    - {% endif %} -
    - -
    -
    - +
    + {%- if content.field_org_head_name[0] -%} + {{ content.field_org_head_name|field_value }} + {%- if content.field_org_head_title[0] -%} + , + {{ content.field_org_head_title }} + {%- endif -%} + {%- endif -%} + + {% if content.field_address[0] %} + {{ content.field_address }} + {% endif %} + + {% if content.field_phone_number_1[0] or content.field_phone_number_2[0] %} +
    + {% if content.field_phone_label_1[0] and content.field_phone_number_1[0] %} + {{- content.field_phone_label_1|field_value -}}: + {{ content.field_phone_number_1 }}
    + {% endif %} + {% if content.field_phone_label_2[0] and content.field_phone_number_2[0] %} + {{ content.field_phone_label_2|field_value -}}: + {{ content.field_phone_number_2 }} + {% endif %} +
    + {% endif %} +
    + + {% if content.field_website_title[0] and content.field_website_url[0] %} + + {% endif %} +
    +
    +
    +
    + + +
    +
    +
    {{ content.body }}