Merge pull request #836 from USEPA/IN-1768

Redel twig tweaks
USEPA · Jun 15, 2023 · 0f6b2f6 · 0f6b2f6
2 parents 1dbc72e + d4e874d
commit 0f6b2f6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/config/sync/core.entity_view_display.node.re_delegation.default.yml b/config/sync/core.entity_view_display.node.re_delegation.default.yml
@@ -331,7 +331,7 @@ content:
     region: content
   field_transmittal_notice:
     type: string
-    label: above
+    label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }

diff --git a/docroot/themes/custom/epa_intranet/templates/node--re-delegation.html.twig b/docroot/themes/custom/epa_intranet/templates/node--re-delegation.html.twig
@@ -143,9 +143,18 @@
             {% else %}
               <li>{{ content.field_further_redelegation }}
                 <ul>
-                  <li>{{ content.field_redelegation_language }}</li>
-                  <li>{{ content.field_re_redelegation_authority }}</li>
-                  <li>{{ content.field_link_to_further_redelegati }}</li>
+                  {% if content.field_redelegation_language|render|trim is not empty %}
+                    <li>{{ content.field_redelegation_language }}</li>
+                  {% endif %}
+                  {% if content.field_re_redelegation_authority|render|trim is not empty %}
+                    <li>{{ content.field_re_redelegation_authority }}</li>
+                  {% endif %}
+                  {% if content.field_link_to_further_redelegati|render|trim is not empty %}
+                    <li>{{ content.field_link_to_further_redelegati }}</li>
+                  {% endif %}
+                  {% if content.field_link_to_further_redelegati|render|trim is not empty %}
+                    <li>{{ content.field_upload_further_delegation }}</li>
+                  {% endif %}
                 </ul>
               </li>
             {% endif %}
@@ -162,7 +171,7 @@
           {% endif %}
           {% if content.field_signed_memo|render|trim is not empty %}
             <div class="field__label">Signed Memo</div>
-              {{ content.field_signed_memo }}
+            <div class="field__item">{{ content.field_signed_memo }}</div>
           {% endif %}
         </div>
 	{% endif %}