diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-05-06 20:07:44 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-05-06 20:07:44 +0200 |
| commit | 37e90a820d3723d1da75b6982048422e581f7d9e (patch) | |
| tree | a8526b98c9cd95b21e75081671ab7a66d6f40b39 | |
| parent | d0965fd0b03d62dee17312454a87c7ba2e0ae363 (diff) | |
| download | Ishtar-37e90a820d3723d1da75b6982048422e581f7d9e.tar.bz2 Ishtar-37e90a820d3723d1da75b6982048422e581f7d9e.zip | |
Minor improve on sheet display
| -rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 8 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 7f45777a0..7d708c23f 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -16,7 +16,7 @@ <div class='tool'>{%trans "Export as:"%} <a href='{% url show-file item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-file item.pk "pdf" %}'>{%trans "PDF file"%}</a></div> <h3>{% trans "General"%}</h3> <p><label>{%trans "Year:"%}</label> <span class='value'>{{ item.year }}</span></p> -<p><label>{%trans "Numerical reference:"%}</label> <span class='value'>{{ item.numeric_reference }}</span></p> +{% if item.numeric_reference %}<p><label>{%trans "Numerical reference:"%}</label> <span class='value'>{{ item.numeric_reference }}</span></p>{% endif %} {% if item.name %} <p><label>{%trans "File's name:"%}</label> <span class='value'>{{ item.name }}</span></p> {% endif %} @@ -42,12 +42,12 @@ <h3>{% trans "Localisation"%}</h3> <p><label>{%trans "Towns:"%}</label> <span class='value'>{{ item.towns.all|join:", " }}</span></p> - +{% if item.address %} <p><label>{%trans "Main address:"%}</label> <span class='value'>{{ item.address }}</span></p> {% if item.address_complement %}<p><label>{%trans "Complement:"%}</label> <span class='value'>{{ item.address_complement }}</span></p>{%endif%} {% if item.postal_code %}<p><label>{%trans "Postal code:"%}</label> <span class='value'>{{ item.postal_code }}</span></p>{%endif%} - -<p><label>{%trans "Surface:"%}</label>{% if item.total_surface %} <span class='value'>{{ item.total_surface }} m<sup>2</sup> ({{ item.total_surface_ha }} ha)</span>{%endif%}</p> +{% endif %} +{% if item.total_surface %}<p><label>{%trans "Surface:"%}</label> <span class='value'>{{ item.total_surface }} m<sup>2</sup> ({{ item.total_surface_ha }} ha)</span></p>{%endif%} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 6fdcfe62d..3a6a20e74 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -45,10 +45,10 @@ <h3>{% trans "Localisation"%}</h3> <p><label>{%trans "Towns:"%}</label> <span class='value'>{{ item.towns.all|join:", " }}</span></p> -<p><label>{%trans "Main address:"%}</label> <span class='value'>{{ item.associated_file.address }}</span></p> +{% if item.associated_file.address %}<p><label>{%trans "Main address:"%}</label> <span class='value'>{{ item.associated_file.address }}</span></p> {% if item.associated_file.address_complement %}<p><label>{%trans "Complement:"%}</label> <span class='value'>{{ item.associated_file.address_complement }}</span></p>{%endif%} {% if item.associated_file.postal_code %}<p><label>{%trans "Postal code:"%}</label> <span class='value'>{{ item.associated_file.postal_code }}</span></p>{%endif%} - +{%endif%} {% comment %} <p><label>{%trans "Lambert X:"%}</label> <span class='value'>{{ item.lambert_x }}</span></p> <p><label>{%trans "Lambert Y:"%}</label> <span class='value'>{{ item.lambert_y }}</span></p> |