diff --git a/src/printing/grantlee/themes/full/theme.html b/src/printing/grantlee/themes/full/theme.html index 882b0fef..67167fb2 100644 --- a/src/printing/grantlee/themes/full/theme.html +++ b/src/printing/grantlee/themes/full/theme.html @@ -1,108 +1,112 @@
{% if contacts %} {% for contact in contacts %}
{{ contact.name }}
{{ contact.realName|safe }}
{% if contact.photo %} {% endif %} {% if contact.emails %} {% endif %} {% if contact.organization %} {% endif %} {% if contact.webPage %} {% endif %} {% if contact.birthday %} {% endif %} {% if contact.note %} {% endif %} {% if contact.title %} {% endif %} {% for address in contact.addresses %} {% if address.formattedAddress %} - - + + {% endif %} {% endfor %} {% for listphone in contact.phones %} {% endfor %} {% for im in contact.instantManging %} {% endfor %}
{{ contact.photo|safe }}
{{ contacti18n.emailsi18n }} {% for email in contact.emails %} {{ email.email }}{% if not forloop.last %}, {% endif %} {% endfor %}
{{ contacti18n.organizationi18n }} {{ contact.organization }}
{{ contacti18n.websitei18n }} {{ contact.webPage|safe }}
{{ contacti18n.birthdayi18n }} {{ contact.birthday }}
{{ contacti18n.notei18n }} {{ contact.note }}
{{ contacti18n.titlei18n }} {{ contact.title }}
{{ address.type }}{{ address.formattedAddress|safe }}{{ address.typeLabel }} + {% with address.formattedAddress as fa %} + {% for line in fa.splitlines %}{{ line }}
{% endfor %} + {% endwith %} +
{{ listphone.typeLabel }} {{ listphone.number }}
{{ im.type }} {{ im.address }}

{% endfor %} {% endif %} diff --git a/src/viewertemplates/contact_embedded.html b/src/viewertemplates/contact_embedded.html index 85037169..4ba899e5 100644 --- a/src/viewertemplates/contact_embedded.html +++ b/src/viewertemplates/contact_embedded.html @@ -1,176 +1,183 @@
{% if contact.birthday %} {% with contact.birthdayi18n as title %} {% if contact.birthdayage %} {% with contact.birthdayage|safe as value %} {% include "contact_row.html" %} {% endwith %} {% else %} {% with contact.birthday|safe as value %} {% include "contact_row.html" %} {% endwith %} {% endif %} {% endwith %} {% endif %} {% for phoneNumber in contact.phoneNumbers %} {% if phoneNumber.supportsSms %} {% else %} {% endif %} {% endfor %} {% for email in contact.emails %} {% endfor %} {% for imAddress in contact.imAddresses %} {% with imAddress.type as title %} {% with imAddress.imAddress|safe as value %} {% with imAddress.imIcon|safe as value2 %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endwith %} {% endfor %} {% for website in contact.websites %} {% with contact.websitei18n as title %} {% with website|safe as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endfor %} {% if contact.blogUrl %} {% with "Blog Feed" as title %} {% with contact.blogUrl|safe as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% for address in contact.addresses %} - {% with address.type as title %} - {% with address.formattedAddressLink|safe as value %} - {% with address.formattedAddressIcon|safe as value2 %} - {% include "contact_row.html" %} - {% endwith %} - {% endwith %} - {% endwith %} + + + + + {% endfor %} {% if contact.profession %} {% with contact.Professioni18n as title %} {% with contact.profession as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% if contact.department %} {% with contact.departmenti18n as title %} {% with contact.department as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% if contact.office %} {% with contact.officei18n as title %} {% with contact.office as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% if contact.manager %} {% with contact.manageri18n as title %} {% with contact.manager as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% if contact.assistant %} {% with contact.assistanti18n as title %} {% with contact.assistant as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% if contact.spouse %} {% with contact.spousei18n as title %} {% with contact.spouse as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% if contact.anniversary %} {% with contact.anniversaryi18n as title %} {% with contact.anniversary as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% for customField in contact.customFieldsUrl %} {% with customField.title as title %} {% with customField.value|safe as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endfor %} {% for customField in contact.customFields %} {% with customField.title as title %} {% with customField.value as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endfor %} {% if contact.addressBookName %} {% with contact.addressBookNamei18n as title %} {% with contact.addressBookName as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %} {% if contact.note %} {% with contact.notei18n as title %} {% with contact.note|safe as value %} {% include "contact_row.html" %} {% endwith %} {% endwith %} {% endif %}
{{ contact.name }}
{{ contact.job }}
{{ contact.organization }}
{{ phoneNumber.typeLabel }}{{ phoneNumber.number }} {{ phoneNumber.number }}
{{ contact.emailsi18n }} {{ email.email }}
{{ address.typeLabel }} + {% with address.formattedAddress as fa %} + {% for line in fa.splitlines %} + {{ line }} + {% if line and not forloop.last %}
{% endif %} + {% endfor %} + {% endwith %} + 		+ +
{% if contact.hasqrcode %}

{% endif %}