From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 19 Nov 2015 21:47:40 +0000 (+0100)
Subject: finalize vcard list display
X-Git-Tag: Release_902~128
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=4270e7167f490784cb1bfa919b1d730ca8e7ceca

finalize vcard list display
---

diff --git a/webcit/static/t/test_vcard.html b/webcit/static/t/test_vcard.html
deleted file mode 100644
index 7c3afe287..000000000
--- a/webcit/static/t/test_vcard.html
+++ /dev/null
@@ -1,21 +0,0 @@
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-lastname: <?VC:ITEM(#"VC:.n.last", "X")>
-firstname: <?VC:ITEM(#"VC:.n.first", "X")>
-middlename: <?VC:ITEM(#"VC:.n.middle", "X")>
-prefix: <?VC:ITEM(#"VC:.n.prefix", "X")>
-suffix: <?VC:ITEM(#"VC:.n.suffix", "X")>
-
-VC:.tel;cell: <?VC:ITEM(#"VC:.tel;cell", X)> X-----X
-______________________________
-<?ITERATE("VC:TYPE", ="testphone", 0, 0, -1, #"PhoneNumber")>
-------------------------------
-<?ITERATE("VC:TYPE", ="testemail", 0, 0, -1, #"EmailAddr")>
-------------------------------
-
-<?VC:NAME(#"VC:.adr.POBox")> - PLZ: <?VC:ITEM(#"VC:.adr.POBox", "X")>
-<?VC:NAME(#"VC:.adr.address")> - Addr1: <?VC:ITEM(#"VC:.adr.address", "X")>
-<?VC:NAME(#"VC:.adr.address2")> - Addr2: <?VC:ITEM(#"VC:.adr.address2", "X")>
-<?VC:NAME(#"VC:.adr.city")> - City: <?VC:ITEM(#"VC:.adr.city", "X")>
-<?VC:NAME(#"VC:.adr.state")> - state: <?VC:ITEM(#"VC:.adr.state", "X")>
-<?VC:NAME(#"VC:.adr.zip")> - zip: <?VC:ITEM(#"VC:.adr.zip", "X")>
-<?VC:NAME(#"VC:.adr.country")> - country: <?VC:ITEM(#"VC:.adr.country", "X")>
diff --git a/webcit/static/t/vcard/list/item.html b/webcit/static/t/vcard/list/item.html
index 864dbe294..7f04d0b68 100644
--- a/webcit/static/t/vcard/list/item.html
+++ b/webcit/static/t/vcard/list/item.html
@@ -1,7 +1,7 @@
 <??("COND:ITERATE:FIRSTN", 40)><?!("COND:ITERATE:ISMOD", 45, #"NAMESPERPAGE", 0)><!--y=<?ITERATE:N()>--><?=("vcard_list_section_end")><??("X", 40)><??("X", 45)>
 <?!("COND:ITERATE:ISMOD", 10, #"NAMESPERPAGE", 0)><?=("vcard_list_section_start")><??("X", 10)>
 <?!("COND:ITERATE:ISMOD", 20, 4, 0)> <?=("vcard_list_row_start")><??("X", 20)>
-<td><!--X=<?ITERATE:N()>--><a href='readfwd?startmsg=<?VC:MSGNO()>?is_singlecard=1?maxmsgs=1?is_summary=0?alpha=<?BSTR("alpha")>'><?VC:ITEM(#"VC:.n.last", "X")> <?VC:ITEM(#"VC:.n.first", "X")><?VC:ITEM(#"VC:.n.middle", "X")>;<?VC:ITEM(#"VC:.n.prefix", "X")>;<?VC:ITEM(#"VC:.n.suffix", "X")></a></td>
+<td><!--X=<?ITERATE:N()>--><a href='readfwd?startmsg=<?VC:MSGNO()>?is_singlecard=1?maxmsgs=1?is_summary=0?alpha=<?BSTR("alpha")>'><?VC:ITEM(#"VC:.n.last", "X")> <?VC:ITEM(#"VC:.n.first", "X")><?VC:ITEM(#"VC:.n.middle", "X")> <?VC:ITEM(#"VC:.n.prefix", "X")> <?VC:ITEM(#"VC:.n.suffix", "X")></a></td>
 
 <??("COND:ITERATE:FIRSTN", 30)><?!("COND:ITERATE:ISMOD", 35, 4, 3)> <?=("vcard_list_row_end")><??("X", 35)><?!("X", 30)>
 <?!("COND:ITERATE:LASTN",  40)><??("COND:ITERATE:ISMOD", 45, 4, 3)> <?=("vcard_list_row_end")><??("X", 45)><?!("X", 40)>