Apply patches sent by Harlow Solutions -- for WebCit

[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 a55b03dca10d6ce79d9f6524519b7b8504f15766..4a7c57db02aefba60f1a3a349da930e671711837 100644 (file)
--- a/webcit/static/t/vcard/msg_display.html
+++ b/webcit/static/t/vcard/msg_display.html
@@ -1,44 +1,44 @@
-<div class="message_content"><div>
+<!-- start msg_display.html -->
+<div class="message_content">
 <div align="center">
 <table bgcolor="#aaaaaa" width="50%">
 <tr bgcolor="#aaaaaa">
   <td colspan=2 bgcolor="#ffffff">
-  <img align="center" src="static/webcit_icons/essen/32x32/contact.png">
-  <font size="+1"><b><?VC:ITEM(#"VC:.fn", "X")></b></font>
-  <div align="right>"<?VC:ITEM(#"VC:.title", "X")></div>
-  <div align="right"><?VC:ITEM(#"VC:.org", "X")></div>
-</td>
+    <img style="vertical-align:middle" alt="" src="static/webcit_icons/essen/32x32/contact.png">
+    <font size="+1"><b><?VC:ITEM(#"VC:.fn", "X")></b></font>
+    <div align="right"><?VC:ITEM(#"VC:.title", "X")></div>
+    <div align="right"><?VC:ITEM(#"VC:.org", "X")></div>
+  </td>
 </tr>
 
 <?!("VC:HAVE:TYPE", 10, #"PhoneNumber")>
 <tr>
- <td>Telephone:</td>
- <td>
-<?ITERATE("VC:TYPE", ="vcard_msg_display_phone", 0, 0, -1, #"PhoneNumber")>
- </td>
+  <td style="vertical-align:top"><?VC:NAME(#"VC:.tel")></td>
+  <td><?ITERATE("VC:TYPE", ="vcard_msg_display_phone", 0, 0, -1, #"PhoneNumber")></td>
 </tr>
 <??("X", 10)>
 
 <?!("VC:HAVE:TYPE", 20, #"EmailAddr")>
 <tr>
- <td>E-mail:</td>
- <td>
-<?ITERATE("VC:TYPE", ="vcard_msg_display_email", 0, 0, -1, #"EmailAddr")>
- </td>
+  <td style="vertical-align:top"><?VC:NAME(#"VC:.email")></td>
+  <td><?ITERATE("VC:TYPE", ="vcard_msg_display_email", 0, 0, -1, #"EmailAddr")></td>
 </tr>
 <?!("X", 20)>
 
-
-<?!("VC:HAVE:TYPE", 30, #"VC:.adr.address")>
+<?!("VC:HAVE:TYPE", 30, #"Address")>
 <tr>
- <td><?VC:NAME(#"Address")>:</td>
- <td>
-<?VC:ITEM(#"VC:.adr.POBox", "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>
+  <td style="vertical-align:top"><?VC:NAME(#"VC:.adr")></td>
+  <td>
+    <?VC:ITEM(#"VC:.adr.POBox", "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")><br>
+    <?VC:ITEM(#"VC:.adr.country", "X")>
+  </td>
 </tr>
 <?!("X", 30)>
-</table></div>
 
+</table>
+</div>
+</div>
+<!-- end msg_display.html -->