diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-07 13:34:38 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-07 15:45:15 +0200 |
| commit | d55a5ec58047dc53118dce1d3aecbeb398cf57de (patch) | |
| tree | d940054e928f217004cb4694027c3b4ff44fcb29 /ishtar_common/templates/ishtar/blocks | |
| parent | 5f6514859cc06841d7bfb0919f98b72168eeade9 (diff) | |
| download | Ishtar-d55a5ec58047dc53118dce1d3aecbeb398cf57de.tar.bz2 Ishtar-d55a5ec58047dc53118dce1d3aecbeb398cf57de.zip | |
🐛 Sheet: add missing fields, improve layout (refs #5863, #5864, #5865, #5866, #5867, #5868, #5869, #5870, #5871, #5872)
Diffstat (limited to 'ishtar_common/templates/ishtar/blocks')
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/sheet_address_section.html | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/sheet_dating_list.html | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html index 80dbc07a4..5f577c9c9 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html @@ -5,6 +5,6 @@ <dd> <pre>{% if item.get_address %}{{item.get_address}}{% endif %}{% if item.get_address_complement %} {{item.get_address_complement}}{% endif %}{% if item.get_postal_code or item.get_town or item.get_precise_town %} -{{item.get_postal_code}} {% if item.get_precise_town %}{{item.get_precise_town}}{% else %}{{item.get_town}}{% endif %}{% endif %}</pre> +{{item.get_postal_code}} {% if item.get_precise_town %}{{item.get_precise_town.name}}{% else %}{{item.get_town}}{% endif %}{% endif %}</pre> </dd> </dl>{% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html b/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html new file mode 100644 index 000000000..6135bbf77 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html @@ -0,0 +1,33 @@ +{% load i18n %} +<table id='{{window_id}}-datings' class="table table-striped"> + <tr> + <th>{% trans "Chronological period" %}</th> + <th>{% trans "Start date" %}</th> + <th>{% trans "End date" %}</th> + <th>{% trans "Dating type" %}</th> + <th>{% trans "Quality" %}</th> + <th>{% trans "Precise on this dating" %}</th> + </tr> + {% for dating in dating_list %} + <tr> + <td> + {{dating.period}} + </td> + <td> + {{dating.start_date|default_if_none:"-"}} + </td> + <td> + {{dating.end_date|default_if_none:"-"}} + </td> + <td> + {{dating.dating_type|default_if_none:"-"}} + </td> + <td> + {{dating.quality|default_if_none:"-"}} + </td> + <td> + {{dating.precise_dating|default_if_none:"-"}} + </td> + </tr> + {% endfor %} +</table> |