Git commit 53fcc1c68dc67aa4eb544e62f74f9672d5d0fec2 by Montel Laurent.
Committed on 31/03/2014 at 20:58.
Pushed by mlaurent into branch 'master'.
improve default theme
M +24 -2 kaddressbook/printing/grantlee/themes/default/theme.html
M +4 -0 kaddressbookgrantlee/formatter/grantleecontactutils.cpp
http://commits.kde.org/kdepim/53fcc1c68dc67aa4eb544e62f74f9672d5d0fec2
diff --git a/kaddressbook/printing/grantlee/themes/default/theme.html b/kad=
dressbook/printing/grantlee/themes/default/theme.html
index bfbdf7f..98dcad7 100644
--- a/kaddressbook/printing/grantlee/themes/default/theme.html
+++ b/kaddressbook/printing/grantlee/themes/default/theme.html
@@ -29,7 +29,7 @@
{% if contacts %}
{% for contact in contacts %}
-
{{ contact.familyName }}
+
{{ contact.name }}
=
@@ -48,10 +48,32 @@
{% if contact.webPage %}
- {{ contact.webPage }} |
+ {{ contact.webPage|safe }} |
{% endif %}
+ {% if contact.birthday %}
+
+
+ {{ contact.birthday }} |
+
+ {% endif %}
+ {% if contact.note %}
+
+
+ {{ contact.note }} |
+
+ {% endif %}
+ {% if contact.title %}
+
+
+ {{ contact.title }} |
+
+ {% endif %}
+ {% for address in addresses %}
+
+ {% endfor %}
+
{% endfor %}
{% endif %}
=
diff --git a/kaddressbookgrantlee/formatter/grantleecontactutils.cpp b/kadd=
ressbookgrantlee/formatter/grantleecontactutils.cpp
index 83a837c..fd9a6a3 100644
--- a/kaddressbookgrantlee/formatter/grantleecontactutils.cpp
+++ b/kaddressbookgrantlee/formatter/grantleecontactutils.cpp
@@ -56,6 +56,10 @@ QString GrantleeContactUtils::variableI18n(const QString=
&variable)
return i18n( "Longitude" );
} else if (variable =3D=3D QLatin1String("organizationi18n")) {
return i18n( "Organization" );
+ } else if (variable =3D=3D QLatin1String("namei18n")) {
+ return i18n( "Name" );
+ } else if (variable =3D=3D QLatin1String("titlei18n")) {
+ return i18n( "Title" );
} else {
return variable;
}