diff options
Diffstat (limited to 'templates/expedition.html')
| -rw-r--r-- | templates/expedition.html | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/templates/expedition.html b/templates/expedition.html index 1623a0c..6356e91 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -25,6 +25,7 @@ <li> <a href="/years/{{expedition.year}}/{{expedition.logbookfile}}">full logbook</a> for this Expo <li> <a href="/logreport/{{expedition.year}}">logbook report</a> for this Expo <li> <a href="/logbookedit/">new logbook entry</a> for this Expo +</ul> {% if logged_in %} <p>Reparse and reload this year's logbook by clicking here: <a href="/expedition/{{expedition.year}}?reload">RELOAD</a> {% endif %} @@ -43,19 +44,32 @@ an "<b>S</b>" for a survey trip. The colours of the "<b>T</b>" and "<b>S</b>" a {{d.day}}/{{d.month}} </th> {% endfor %} -</tr> +</tr> {% for personexpoday in personexpodays|dictsort:"sortname" %} + + <tr> - <td><a href="{{ personexpoday.personexpedition.get_absolute_url }}">{{personexpoday.personexpedition.person.fullname|safe}}</a></td> -<td>{% if personexpoday.personexpedition.person.mug_shot %} -<div align=right><a href="{{personexpoday.personexpedition.person.mug_shot}}">😃</a></div> + <td> + <a href="{{ personexpoday.personexpedition.get_absolute_url }}">{{personexpoday.personexpedition.person.fullname|safe}}</a></td> + +{% if personexpoday.personexpedition.person.mug_shot %} + <!-- Such a godawful kludge I'm almost proud of it --> + <td align=right><popup><a href="{{personexpoday.personexpedition.person.mug_shot}}">😃</a><img style="width:150px; + {% with c=forloop.counter %} + top:{{500|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c|add:c}}px" + {% endwith %} + href="{{personexpoday.personexpedition.person.mug_shot}}" src="{{personexpoday.personexpedition.person.mug_shot}}"></popup></td> + {% else %} {% if personexpoday.personexpedition.person.blurb %} -<a href="{{personexpoday.personexpedition.person.get_mugshot_url}}">😁</a> + <td align=right> + <a href="{{personexpoday.personexpedition.person.get_mugshot_url}}">😁</a> + </td> + {% else %}<td></td> {% endif %} {% endif %} -</td> + {% for activities in personexpoday.personrow %} {% if activities.personentries or activities.survexblocks %} @@ -76,8 +90,9 @@ an "<b>S</b>" for a survey trip. The colours of the "<b>T</b>" and "<b>S</b>" a {% endif %} </td> {% endif %} - + {% endfor %} + </tr> {% endfor %} </table> |