1 files changed, 17 insertions, 5 deletions
diff --git a/templates/person.html b/templates/person.html
index 88171c1..aed5989 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -8,17 +8,29 @@
 {% endblock %}
 
 {% block content %}
+{% if person.blurb %}
 {{person.blurb}}
-{% for pic in person.photo_set
+{% endif %}
+
+{% for pic in person.photo_set.all %}
+{% if pic.is_mugshot %}
     <div class="figure">
-      <p> <img src="{{ person.correctURL }}" class="thumbnail" /> </p>
+      <p> <img src="{{ pic.file.url }}" class="thumbnail" />
+      <p> {{ pic.caption }}
+      </p>
+      </p>
     </div>
-    
-<p>{{person|wiki_to_html_short}} has been on expo in the following years:</p>
+{% endif %}
+{% endfor %}
+<br class="clearfloat" />
+
+<h3>{{person|wiki_to_html_short}} has been on expo in the following years:</h3>
 <p>
+<ul>
 {% for personexpedition in person.personexpedition_set.all %}
-  | <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a>
+  <li> <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a></li>
 {% endfor %}
+</ul>
 </p>