Fix participant photo in the review system and grant nationality (#4310)

Author: marcoacierno

backend/reviews/templates/grant-review.html

@@ -114,7 +114,7 @@ <h2 class="grant-header">
 
       <div class="review-row">
         <strong>Nationality</strong>
-        <div>{{grant.get_nationality_display}}</div>
+        <div>{{grant.nationality}}</div>
       </div>
 
       <div class="review-row">

backend/reviews/templates/proposal-review.html

@@ -191,24 +191,6 @@ <h2>Speaker</h2>
     <strong>Name</strong>
     <div>{{speaker.fullname}}</div>
   </div>
-  <div class="review-row">
-    <strong>Country</strong>
-    <div>{{speaker.country | countryname}}</div>
-  </div>
-  <div class="review-row">
-    <strong>Speaker Experience</strong>
-    <div>{{participant.get_speaker_level_display}}</div>
-  </div>
-  <div class="review-row">
-    <strong>Previous Talk Video</strong>
-    <div>
-      {% if participant.previous_talk_video %}
-        <a target="_blank" rel="noreferrer noopener" href="{{participant.previous_talk_video}}">
-          {{participant.previous_talk_video}}
-        </a>
-      {% endif %}
-    </div>
-  </div>
   <div class="review-row">
     <strong>Requested a grant?</strong>
     {% if grant %}
@@ -230,13 +212,21 @@ <h2>Speaker</h2>
   </div>
   {% endif %}
   <div class="review-row">
-    <strong>Bio</strong>
-    <div>{{participant.bio|linebreaksbr}}</div>
+    <strong>Country</strong>
+    <div>{{speaker.country | countryname}}</div>
   </div>
   <div class="review-row">
-    <strong>Participant Info</strong>
+    <strong>Speaker Experience</strong>
+    <div>{{participant.get_speaker_level_display}}</div>
+  </div>
+  <div class="review-row">
+    <strong>Previous Talk Video</strong>
     <div>
-      <a href="{% url 'admin:participants_participant_change' participant.id %}" target="_blank">Open Participant in admin</a>
+      {% if participant.previous_talk_video %}
+        <a target="_blank" rel="noreferrer noopener" href="{{participant.previous_talk_video}}">
+          {{participant.previous_talk_video}}
+        </a>
+      {% endif %}
     </div>
   </div>
 </fieldset>

backend/schedule/templates/includes/participant/view_info.html

@@ -2,10 +2,20 @@
 
 {% block extrastyle %}
     <link rel="stylesheet" href="{% static "admin/css/forms.css" %}">
+    <style>
+      .participant-info .form-row {
+        display: grid;
+        grid-template-columns: auto 1fr;
+      }
+      .participant-info .form-row a {
+        display: flex;
+        gap: 5px;
+      }
+    </style>
 {% endblock %}
 
 {% if participant %}
-<fieldset class="module aligned ">
+<fieldset class="module aligned participant-info">
   <h2>{{ title }}</h2>
 
   <div class="form-row">
@@ -16,10 +26,12 @@ <h2>{{ title }}</h2>
     </a>
   </div>
 
+  {% if participant.photo_file_id %}
   <div class="form-row">
     <label>Avatar</label>
-    <img src="{{participant.photo}}" style="object-fit: contain;" width="200" height="200" />
+    <img src="{{participant.photo_file.url}}" style="object-fit: contain;" width="200" height="200" />
   </div>
+  {% endif %}
 
   <div class="form-row">
     <label>Bio</label>