diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-06-26 18:43:42 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-06-26 18:43:42 +0100 |
| commit | b5cca8be3b7017bc44517049ac7769501776378e (patch) | |
| tree | a8b5ddcc45e9ccb0bac9652f9730f234eeba03a7 | |
| parent | c06d37298469d88aed1ba9429d148145a627b711 (diff) | |
| parent | 8fe02e5c89b20a896883805c95781665862414b7 (diff) | |
| download | troggle-b5cca8be3b7017bc44517049ac7769501776378e.tar.gz troggle-b5cca8be3b7017bc44517049ac7769501776378e.tar.bz2 troggle-b5cca8be3b7017bc44517049ac7769501776378e.zip | |
Merge
| -rw-r--r-- | templates/expedition.html | 2 | ||||
| -rw-r--r-- | templates/personexpedition.html | 2 | ||||
| -rw-r--r-- | templates/svxcavesingle.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/templates/expedition.html b/templates/expedition.html index 0b0d360..b5b58a8 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -37,7 +37,7 @@ an "S" for a survey trip. The colours are the same for people on the same trip. </tr> {% for personexpeditionday in personexpeditiondays %} <tr> - <td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person}}</a></td> + <td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person|safe}}</a></td> {% for persondayactivities in personexpeditionday.personrow %} {% if persondayactivities.persontrips or persondayactivities.survexblocks %} diff --git a/templates/personexpedition.html b/templates/personexpedition.html index 30d071b..93228d9 100644 --- a/templates/personexpedition.html +++ b/templates/personexpedition.html @@ -7,7 +7,7 @@ {% block content %} <h1> - <a href="{{personexpedition.person.get_absolute_url}}">{{personexpedition.person}}</a> : + <a href="{{personexpedition.person.get_absolute_url}}">{{personexpedition.person|safe}}</a> : <a href="{{personexpedition.expedition.get_absolute_url}}">{{personexpedition.expedition}}</a> </h1> diff --git a/templates/svxcavesingle.html b/templates/svxcavesingle.html index ad5540f..54a4250 100644 --- a/templates/svxcavesingle.html +++ b/templates/svxcavesingle.html @@ -41,7 +41,7 @@ <td>{{survexblock.name}}</td> <td> {% if survexblock.expedition %} - <a href="{{survexblock.expedition.get_absolute_url}}">{{survexblock.date}}</a> + <a href="{{survexblock.expedition.get_absolute_url}}">{{survexblock.date|date:"D d M Y"}}</a> {% else %} {{survexblock.date}} {% endif %} |