Skip to content

Commit

Permalink
Merge pull request #143 from gm3dmo/addcwgcurl
Browse files Browse the repository at this point in the history
gh pr merge
  • Loading branch information
gm3dmo authored Dec 25, 2023
2 parents c39e7bc + 8b98732 commit 95c461d
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions templates/cmp/soldier.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ <h4>Soldier Record</h4>
{% for decoration in soldier.soldierdecoration_set.all %}
<tr><td>Decoration: </td><td>{{ decoration }} <a href="{{ decoration.generate_gazette_url }}">(London Gazette: {{ decoration.gazette_issue }} Page: {{ decoration.gazette_page}} {{ decoration.gazette_date }}</a>) </td></r>
<tr><td>Citation: </td><td>{{ decoration.citation }}</td></r>

{% endfor %}
{% endif %}

Expand All @@ -31,22 +30,17 @@ <h4>Soldier Record</h4>
{% for imprisonment in soldier.soldierimprisonment_set.all %}
<tr><td>Imprisonment: </td><td>{{ imprisonment }} {{imprisonment.pow_camp.country}} {{imprisonment.pow_camp.country.flag}}</td></tr>
{% endfor %}

{% endif %}


{% if soldier.soldierdeath %}
<tr><td colspan="2"><h4>Casualty Record:</h4></td></tr>
<tr><td>Date of Death:</td><td>{{ soldier.soldierdeath.date }}</td></tr>
<tr><td>Company:</td><td>{{ soldier.soldierdeath.company }}</td></tr>
<tr><td>Cemetery:</td><td>{{ soldier.soldierdeath.cemetery }}, {{soldier.soldierdeath.cemetery.country }} <span style="font-size: 1.5em;">{{ soldier.soldierdeath.cemetery.country.flag }}</span>
</td></tr>
<tr><td>CWGC Link:</td><td><span style="font-size: 1.5em;"><a href="{{ soldier.soldierdeath.cwgc_url }}">{{ soldier.soldierdeath.cwgc_id }}</span></a></td></tr>
<tr><td>Cemetery:</td><td>{{ soldier.soldierdeath.cemetery }}, {{soldier.soldierdeath.cemetery.country }} <span style="font-size: 1.3em;">{{ soldier.soldierdeath.cemetery.country.flag }}</span>
<tr><td colspan="2"> {{ cemetery_map | safe }} </td></tr>
{% endif %}




</tbody>
</table>

Expand Down

0 comments on commit 95c461d

Please sign in to comment.