diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index f217e5bc8..ab4337098 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -396,7 +396,7 @@ ng-click="addressbook.selectCard(currentCard)">
-
+
{{currentCard.$preferredEmail(addressbook.selectedFolder.constructor.$query.value)}}
diff --git a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox index b6b10668b..7fa99dd96 100644 --- a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox +++ b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox @@ -61,7 +61,7 @@
-

+

{{editor.card.$description()}}
diff --git a/UI/WebServerResources/js/Contacts/Card.service.js b/UI/WebServerResources/js/Contacts/Card.service.js index 5390a839f..98264fa5b 100644 --- a/UI/WebServerResources/js/Contacts/Card.service.js +++ b/UI/WebServerResources/js/Contacts/Card.service.js @@ -216,14 +216,14 @@ return Card.$$resource.download(this.pid, 'export', {uids: selectedIDs}, {type: 'application/octet-stream'}); }; - Card.prototype.$fullname = function() { - var fn = this.c_cn || '', names; + Card.prototype.$fullname = function(options) { + var fn = this.c_cn || '', html = options && options.html, names; if (fn.length === 0) { names = []; if (this.c_givenname && this.c_givenname.length > 0) names.push(this.c_givenname); if (this.nickname && this.nickname.length > 0) - names.push('' + this.nickname + ''); + names.push((html?'':'') + this.nickname + (html?'':'')); if (this.c_sn && this.c_sn.length > 0) names.push(this.c_sn); if (names.length > 0)