NBBIB-307 Update yabrm module contributor template

unb-libraries · Aug 4, 2023 · 6b90f17 · 6b90f17
1 parent fe8a0b8
commit 6b90f17
Showing 1 changed file with 50 additions and 31 deletions.
diff --git a/custom/modules/yabrm/templates/yabrm_contributor.html.twig b/custom/modules/yabrm/templates/yabrm_contributor.html.twig
@@ -20,7 +20,16 @@
   {% if content %}
     <div class="container">
       <div class="row description-pic">
+        {% if content.picture|field_value 
+          or content.cover 
+          or content.birth_year|field_value 
+          or content.death_year|field_value 
+          or content.nb_residences|field_value 
+          or content.nble_url|field_value %}
         <div id="contrib-description" class="col-sm-8">
+        {% else %}
+        <div id="contrib-description" class="col-sm-12">
+        {% endif %}
           {% if content.description|field_value %}
               {{ content.description|field_value }}
           {% endif %}
@@ -32,38 +41,46 @@
             {% if content.archival|field_value %}
               <ul id="archival-container">
                 {% for archival in content.full_archivals %}
-                <li class="archival-material">
-                  <a href="#" class="archival-collapse" data-toggle="collapse" data-target="#archival-content-{{ loop.index0 }}" aria-expanded="false">
-                    {{ archival['#yabrm_contrib_archival'].title.getString() ~ " " }}<i class="fa-solid fa-caret-right"></i><i class="fa-solid fa-caret-down"></i>
-                  </a>
-                  <div id="archival-content-{{ loop.index0 }}" class="collapse">
-                    {{ archival }}
-                  </div>
-                </li>
+                  <li class="archival-material">
+                    <a href="#" class="archival-collapse" data-toggle="collapse" data-target="#archival-content-{{ loop.index0 }}" aria-expanded="false">
+                      {{ archival['#yabrm_contrib_archival'].title.getString() ~ " " }}<i class="fa-solid fa-caret-right"></i><i class="fa-solid fa-caret-down"></i>
+                    </a>
+                    <div id="archival-content-{{ loop.index0 }}" class="collapse">
+                      {{ archival }}
+                    </div>
+                  </li>
                 {%- endfor -%}
               </ul>
             {%- endif -%}
           {%- endif -%}
           <div id="contributor-works">
             {% set cid = content.name['#object'].id() %}
-          <h2 class="works-header">Bibliography Items</h2>
-          {{ drupal_view('nb_bibliography_citations', 'page_3', cid, cid, cid, cid) }}
+            <h2 class="works-header">Bibliography Items</h2>
+            {{ drupal_view('nb_bibliography_citations', 'page_3', cid, cid, cid, cid) }}
           </div>
         </div>
-        <div id="contrib-picture" class="col-sm-4 pl-4">
-        {% if content.picture|field_value or content.cover or content.birth_year or content.death_year %}
-            <figure>
-              {% if content.picture|field_value %}
-                {{ content.picture|field_value }}
-              {% elseif content.cover %}
-                {{ content.cover }}
-              {% endif %}
-              {% if content.pic_caption|field_value %}
-                <figcaption>
-                  {{ content.pic_caption }}
-                </figcaption>
-              {% endif %}
-            </figure>
+
+        {% if content.picture|field_value 
+          or content.cover 
+          or content.birth_year|field_value 
+          or content.death_year|field_value 
+          or content.nb_residences|field_value 
+          or content.nble_url|field_value %}
+          <div id="contrib-picture" class="col-sm-4 pl-4">
+            {% if content.picture|field_value or content.cover|field_value %}
+              <figure>
+                {% if content.picture|field_value %}
+                  {{ content.picture|field_value }}
+                {% elseif content.cover %}
+                  {{ content.cover }}
+                {% endif %}
+                {% if content.pic_caption|field_value %}
+                  <figcaption>
+                    {{ content.pic_caption }}
+                  </figcaption>
+                {% endif %}
+              </figure>
+            {% endif %}
             {% if content.birth_year|field_value or content.death_year|field_value %}
               <p><span>
                 <b>Dates of Birth and Death: </b>
@@ -79,11 +96,13 @@
             {%- if content.nb_residences|field_value -%}
               <p><span>
                 <b>Predominant New Brunswick Residences: </b>
-                {%- for i in 0..100 if content.nb_residences[i] -%}
-                  {%- if not loop.first -%}
-                    {{ ", " }}
+                {%- for i in 0..100 -%} 
+                  {%- if content.nb_residences[i] -%}
+                    {%- if not loop.first -%}
+                      {{ ", " }}
+                    {%- endif -%}
+                    {{ content.nb_residences[i]['#title'] }}
                   {%- endif -%}
-                  {{ content.nb_residences[i]['#title'] }}
                 {%- endfor -%}
               </span></p>
             {%- endif -%}
@@ -93,13 +112,13 @@
                 <a href="{{ content.nble_url|field_value[0]['#title'] }}">
                   New Brunswick Literary Encyclopedia
                 </a>
-                 entry.
+                  entry.
               </span></p>
             {%- endif -%}
-        {% endif %}
           </div>
-      </div>
+        {% endif %}
     </div>
+  </div>
 
   {% endif %}
 </div>