diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:53:37 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:53:37 +0100 |
| commit | 24dc7c5a0c996945a0709f8e82b026914ee9dbfc (patch) | |
| tree | ac79aeb4556ad5ab72bdcfa97ec8dbfb35240dab /templates | |
| parent | 25b695e53dd09415f7849b35cd7bc63ca0b2439b (diff) | |
| download | troggle-24dc7c5a0c996945a0709f8e82b026914ee9dbfc.tar.gz troggle-24dc7c5a0c996945a0709f8e82b026914ee9dbfc.tar.bz2 troggle-24dc7c5a0c996945a0709f8e82b026914ee9dbfc.zip | |
[svn] Photo file handling and mugshots parsing sorted.
Made URL settings more relative, less redundant.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8246 by aaron @ 2/18/2009 6:45 AM
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/person.html | 22 |
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>
|