Merge pull request #834 from USEPA/IN-1768

Update Redel template and View display.
USEPA · Jun 13, 2023 · a66c3a2 · a66c3a2
2 parents d01e443 + 9ca40d2
commit a66c3a2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 26 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
@@ -49,8 +49,7 @@ dependencies:
 third_party_settings:
   field_group:
     group_signed_memo:
-      children:
-        - field_signed_memo
+      children: {  }
       label: 'Signed Memo'
       parent_name: ''
       region: content
@@ -63,12 +62,11 @@ third_party_settings:
         open: false
         description: ''
     group_related_resource_s_:
-      children:
-        - field_related_resources
+      children: {  }
       label: 'Related Resources'
       parent_name: ''
       region: content
-      weight: 28
+      weight: 29
       format_type: details
       format_settings:
         classes: ''
@@ -268,7 +266,7 @@ content:
       rel: '0'
       target: '0'
     third_party_settings: {  }
-    weight: 22
+    weight: 30
     region: content
   field_replacing:
     type: entity_reference_label
@@ -302,7 +300,7 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 29
+    weight: 31
     region: content
   field_signed_memo:
     type: entity_reference_entity_view
@@ -311,7 +309,7 @@ content:
       view_mode: link
       link: false
     third_party_settings: {  }
-    weight: 26
+    weight: 28
     region: content
   field_to_whom_delegated:
     type: cshs_full_hierarchy

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
@@ -134,8 +134,8 @@
             {% endif %}
             {% if content.field_limitation|render|trim is not empty %}
               <li>
-                {{ content.field_limitation }}
                 {{ content.field_limitations }}
+                {{ content.field_limitation }}
               </li>
             {% endif %}
             {% if 'May not be redelegated.' in content.field_further_redelegation|render|render  %}
@@ -149,25 +149,21 @@
                 </ul>
               </li>
             {% endif %}
+            <li><div class="field__label">Authority Citations</div>
             {% if content.field_references|render|trim is not empty %}
-              <li><div class="field__label">Authority Citations</div>
-                {% if content.field_references %}
-                  {{ content.field_references }}
-                {% else %}
-                  <p>None.</p>
-                {% endif %}
-              </li>
-            {%  endif %}
-          </ol>
-            {% if content.field_related_resources|render|trim is not empty %}
-              <div class="field__label">Related Resources</div>
-                {{ content.field_related_resources }}
-
+              {{ content.field_references }}
+            {% else %}
+              <p>None.</p>
             {% endif %}
-            {% if content.field_signed_memo|render|trim is not empty %}
-              <div class="field__label">Signed Memo</div>
-                {{ content.field_signed_memo }}
-            {%  endif %}
+            </li>
+          </ol>
+          {% if content.field_related_resources|render|trim is not empty %}
+              {{ content.field_related_resources }}
+          {% endif %}
+          {% if content.field_signed_memo|render|trim is not empty %}
+            <div class="field__label">Signed Memo</div>
+              {{ content.field_signed_memo }}
+          {% endif %}
         </div>
 	{% endif %}