ISTWCMS-5618: New OFIS ohana template/profile.

src/patterns/03-layouts/ofis/ofis-profile.twig

@@ -19,10 +19,10 @@
           <div>Phone: {{ ofis_data.profile.profile_phones }}</div>
         {% endif %}
         {% if ofis_data.profile.personal_url %}
-          <div>Personal Website: {{ ofis_data.profile.personal_url | striptags('<a>') | raw }}</div>
+          <div><a href="{{ ofis_data.profile.personal_url }}">{{ ofis_data.profile.personal_url_title }}</a></div>
         {% endif %}
         {% if ofis_data.profile.lab_url %}
-          <div>Lab/Research Website: {{ ofis_data.profile.lab_url | striptags('<a>') | raw }}</div>
+          <div><a href="{{ ofis_data.profile.lab_url }}">{{ ofis_data.profile.lab_url_title }}</a></div>
         {% endif %}
         {% if ofis_data.profile.active %}
           <div>Status: {{ ofis_data.profile.active }}</div>
@@ -34,7 +34,7 @@
     </div>
     {% if ofis_data.profile.profile_bio %}
       <h2>Biography</h2>
-      <div>{{ ofis_data.profile.profile_bio | raw }}</div>
+      <div>{{ ofis_data.profile.profile_bio | nl2br }}</div>
     {% endif %}
     {% if ofis_data.profile.research %}
       <h2>Research Interests</h2>
@@ -46,8 +46,18 @@
         </ul>
       </div>
     {% endif %}
+    {% if ofis_data.profile.education %}
+      <h2>Education</h2>
+      <div>
+        <ul>
+          {% for edu in ofis_data.profile.education %}
+            <li>{{ edu }}</li>
+          {% endfor %}
+        </ul>
+      </div>
+    {% endif %}
     {% if ofis_data.profile.awards %}
-      <h2>Awards &amp; Distinctions</h2>
+      <h2>Awards</h2>
       <div>
         <ul>
           {% for award in ofis_data.profile.awards %}
@@ -56,41 +66,41 @@
         </ul>
       </div>
     {% endif %}
-    {% if ofis_data.profile.education %}
-      <h2>Education</h2>
+    {% if ofis_data.profile.service %}
+      <h2>Service</h2>
       <div>
         <ul>
-          {% for edu in ofis_data.profile.education %}
-            <li>{{ edu }}</li>
+          {% for service in ofis_data.profile.service %}
+            <li>{{ service }}</li>
           {% endfor %}
         </ul>
       </div>
     {% endif %}
-    {% if ofis_data.profile.service_assoc %}
-      <h2>Highlighted Service &amp; Professional Associations</h2>
+    {% if ofis_data.profile.profassociations %}
+      <h2>Professional Associations</h2>
       <div>
         <ul>
-          {% for service in ofis_data.profile.service_assoc %}
-            <li>{{ service }}</li>
+          {% for association in ofis_data.profile.profassociations %}
+            <li>{{ association }}</li>
           {% endfor %}
         </ul>
       </div>
     {% endif %}
-    {% if ofis_data.profile.outreach %}
-      <h2>Affiliations &amp; Volunteer Work</h2>
+    {% if ofis_data.profile.outreach or ofis_data.profile.affiliations %}
+      <h2>Volunteer Work</h2>
       <div>
         <ul>
-          <li>{{ ofis_data.profile.outreach | join(', ') }}</li>
-          {% if ofis_data.profile.affiliations %}
-            {% for affiliations in ofis_data.profile.affiliations %}
-              <li>{{ affiliations }}</li>
-            {% endfor %}
-          {% endif %}
+          {% for outreach in ofis_data.profile.outreach %}
+            <li>{{ outreach }}</li>
+          {% endfor %}
+          {% for affiliations in ofis_data.profile.affiliations %}
+            <li>{{ affiliations }}</li>
+          {% endfor %}
         </ul>
       </div>
     {% endif %}
     {% if ofis_data.profile.courses %}
-      <h2>Courses/Teaching*</h2>
+      <h2>Teaching<sup>*</sup></h2>
       <div>
         <ul>
           {% for course in ofis_data.profile.courses %}
@@ -147,10 +157,10 @@
         {% else %}
           <li>Not currently accepting applications for graduate students</li>
         {% endif %}
-        {% if ofis_data.personal.adds %}
+        {% if ofis_data.profile.adds %}
           <li>Has <a
-              href="https://uwaterloo.ca/graduate-studies-postdoctoral-affairs/about/organization-graduate-studies#ADDS">Approved
-              Doctoral Dissertation Supervisor</a> (ADDS) status
+              href="https://uwaterloo.ca/graduate-studies-postdoctoral-affairs/about/organization-graduate-studies#ADDS">
+              Approved Doctoral Dissertation Supervisor</a> (ADDS) status
           </li>
         {% endif %}
       </ul>