Finalize vcard editing:

[citadel.git] / webcit / static / t / vcard / msg_display.html

diff --git a/webcit/static/t/vcard/msg_display.html b/webcit/static/t/vcard/msg_display.html
index 4f0dd3a1d62bd055597847d1f25d32e46455709a..a55b03dca10d6ce79d9f6524519b7b8504f15766 100644 (file)
--- a/webcit/static/t/vcard/msg_display.html
+++ b/webcit/static/t/vcard/msg_display.html
@@ -10,35 +10,35 @@
 </td>
 </tr>
 
-<?!("VC:HAVE:TYPE", 5, #"PhoneNumber")>
+<?!("VC:HAVE:TYPE", 10, #"PhoneNumber")>
 <tr>
  <td>Telephone:</td>
  <td>
 <?ITERATE("VC:TYPE", ="vcard_msg_display_phone", 0, 0, -1, #"PhoneNumber")>
  </td>
 </tr>
-<?@("X", 10)>
+<??("X", 10)>
 
-<?!("VC:HAVE:TYPE", 10, #"EmailAddr")>
+<?!("VC:HAVE:TYPE", 20, #"EmailAddr")>
 <tr>
  <td>E-mail:</td>
  <td>
 <?ITERATE("VC:TYPE", ="vcard_msg_display_email", 0, 0, -1, #"EmailAddr")>
  </td>
 </tr>
-<?!("X", 10)>
+<?!("X", 20)>
 
 
-<?!("VC:HAVE:TYPE", 10, #"VC:.adr.address")>
+<?!("VC:HAVE:TYPE", 30, #"VC:.adr.address")>
 <tr>
- <td><?VC:NAME(#"VC:.adr")>:</td>
+ <td><?VC:NAME(#"Address")>:</td>
  <td>
 <?VC:ITEM(#"VC:.adr.POBox", "X")><br>
-<?VC:ITEM(#"VC:.adr.address", "X")><br>
-<?VC:ITEM(#"VC:.adr.address2", "X")><br>
+<?VC:ITEM(#"VC:.adr.extadr", "X")><br>
+<?VC:ITEM(#"VC:.adr.street", "X")><br>
 <?VC:ITEM(#"VC:.adr.city", "X")> <?VC:ITEM(#"VC:.adr.state", "X")> <?VC:ITEM(#"VC:.adr.zip", "X")> <?VC:ITEM(#"VC:.adr.country", "X")>
  </td>
 </tr>
-<?!("X", 10)>
+<?!("X", 30)>
 </table></div>