LOOP-1257: Cleaned up user profile display

Author: rimi-itk

web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/user.html.twig

@@ -28,9 +28,11 @@
 </div>
 <article{{ attributes.addClass('user-profile', 'rounded-lg', 'p-30') }}>
   {% if content %}
-  {% set initials = (user.os2loop_user_given_name.value|first ~ user.os2loop_user_family_name.value|first ?: 'Anonymous user'|t|first)|upper %}
-  {% set full_name = user.os2loop_user_given_name.value ~ ' ' ~ user.os2loop_user_family_name.value %}
-  {% set street_address = ((user.os2loop_user_address.value is not empty ? user.os2loop_user_address.value : '') ~ ', ' ~ (user.os2loop_user_postal_code.value is not empty ? user.os2loop_user_postal_code.value : '') ~ (user.os2loop_user_city.value is not empty ? ' ' ~ user.os2loop_user_city.value : ''))|trim(', ', 'left') %}
+    {% set given_name = user.os2loop_user_given_name.value|default('') %}
+    {% set family_name = user.os2loop_user_family_name.value|default('') %}
+    {% set initials = (given_name|first ~ family_name|first ?: 'Anonymous user'|t|first)|upper %}
+    {% set full_name = given_name ~ ' ' ~ family_name %}
+    {% set street_address = ((user.os2loop_user_address.value is not empty ? user.os2loop_user_address.value : '') ~ ', ' ~ (user.os2loop_user_postal_code.value is not empty ? user.os2loop_user_postal_code.value : '') ~ (user.os2loop_user_city.value is not empty ? ' ' ~ user.os2loop_user_city.value : ''))|trim(', ', 'left') %}
     <div class="row">
       <div class="col-auto">
         <div class="user-image">
@@ -48,12 +50,12 @@
           <div class="col">
             <div class="row">
               <div class="col-auto">
-              {% if user.os2loop_user_phone_number.value is not empty %}
-                <div class="user-contact-information mb-10">
-                  <i class="bi bi-telephone"></i>
-                  <p>{{- user.os2loop_user_phone_number.value -}}</p>
-                </div>
-              {% endif %}
+                {% if user.os2loop_user_phone_number.value is not empty %}
+                  <div class="user-contact-information mb-10">
+                    <i class="bi bi-telephone"></i>
+                    <p>{{- user.os2loop_user_phone_number.value -}}</p>
+                  </div>
+                {% endif %}
                 <div class="user-contact-information">
                   <i class="bi bi-envelope"></i>
                   <p>{{- user.mail.value -}}</p>
@@ -65,27 +67,27 @@
                   <div>
                     <p>{{- user.os2loop_user_place.value -}}</p>
                     <p>{{- street_address -}}</p>
-                  <div>
+                    <div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
+            {% if content.os2loop_user_areas_of_expertise.value is not empty %}
+              <div class="row mt-40">
+                <div class="col">
+                  {{- content.os2loop_user_areas_of_expertise -}}
+                </div>
+              </div>
+            {% endif %}
+            {% if content.os2loop_user_biography.value is not empty %}
+              <div class="row mt-30">
+                <div class="col pr-140">
+                  {{- content.os2loop_user_biography -}}
+                </div>
+              </div>
+            {% endif %}
           </div>
         </div>
-        {% if content.os2loop_user_areas_of_expertise.value is not empty %}
-          <div class="row mt-40">
-            <div class="col">
-              {{- content.os2loop_user_areas_of_expertise -}}
-            </div>
-          </div>
-        {% endif %}
-        {% if content.os2loop_user_biography.value is not empty %}
-          <div class="row mt-30">
-            <div class="col pr-140">
-              {{- content.os2loop_user_biography -}}
-            </div>
-          </div>
-        {% endif %}
-      </div>
-    </div>
   {% endif %}
 </article>