diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-29 15:02:07 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-29 15:02:07 +0200 |
| commit | ef6a28d409dab27ac9f26c7ce259ece7ea125994 (patch) | |
| tree | ec252ac69c8a664ba5bff5aa28a844e29a8c3dde /ishtar_common | |
| parent | 5b3bfd2a9c26103ab840080cfb5e6105fbcc17d1 (diff) | |
| parent | 194d4d410645725d0451dd03bdf14b9058da17d5 (diff) | |
| download | Ishtar-ef6a28d409dab27ac9f26c7ce259ece7ea125994.tar.bz2 Ishtar-ef6a28d409dab27ac9f26c7ce259ece7ea125994.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/sheet_address_section.html | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_organization.html | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html new file mode 100644 index 000000000..917258173 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html @@ -0,0 +1,6 @@ +{% load i18n %} +{% if item.address or item.address_complement or item.postal_code or item.town %} +<p><label>{% trans "Address" %}</label><pre>{% if item.address %}{{item.address}}{% endif %}{% if item.address_complement %} +{{item.address_complement}}{% endif %}{% if item.postal_code or item.town %} +{{item.postal_code}} {{item.town}}{% endif %}</pre> +</p>{% endif %} diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html index 525b69325..403eb7dec 100644 --- a/ishtar_common/templates/ishtar/sheet_organization.html +++ b/ishtar_common/templates/ishtar/sheet_organization.html @@ -7,10 +7,7 @@ {% window_nav item window_id 'show-organization' 'organization_modify' %} <p><label>{% trans "Name" %}</label> <span class='value'>{{item.name}}</span></p> <p><label>{%trans "Created by:"%}</label> <span class='value'>{{ item.history_creator.ishtaruser.person }}</span></p> -{% if item.address %}<p><label>{% trans "Address" %}</label> <span class='value'>{{item.address}}</span></p> {% endif %} -{% if item.address_complement %}<p><label>{% trans "Address 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 %} -{% if item.town %}<p><label>{% trans "Town" %}</label> <span class='value'>{{item.town}}</span></p> {% endif %} +{% include "ishtar/blocks/sheet_address_section.html" %} {% if item.phone %}<p><label>{% trans "Phone" %}</label> <span class='value'>{{item.phone}}</span></p> {% endif %} {% if item.mobile_phone %}<p><label>{% trans "Mobile phone" %}</label> <span class='value'>{{item.mobile_phone}}</span></p> {% endif %} |