Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/contact.adp	25 May 2005 16:23:51 -0000	1.3
+++ openacs-4/packages/contacts/www/contact.adp	27 May 2005 09:02:14 -0000	1.4
@@ -1,28 +1,51 @@
 <master src="/packages/contacts/lib/contact-master">
 <property name="party_id">@party_id@</property>
 
-<table width="100%">
-  <tr>
-    <td valign="top" width="70%">
+<div id="contact-info">
+<div class="primary">
 
-      <formtemplate id="party_ae"></formtemplate>
+<if @attributes:rowcount@ gt 0>
+<multiple name="attributes">
+<h3 class="contact-title">@attributes.section@</h3>
+<dl class="attribute-values">
+<group column="section">
+  <dt class="attribute-name">@attributes.attribute@:</dt>
+  <dd class="attribute-value">@attributes.value;noquote@</dd>
+</group>
+</dl>
+</multiple>
+</if>
 
-<if @tasks_enabled_p@>
-	     <include src="/packages/tasks/lib/tasks" party_id="@party_id@" hide_form_p="t">
+
+<if @rels:rowcount@ gt 0>
+<multiple name="rels">
+<h3 class="contact-title">@rels.relationship@</h3>
+  <dl class="attribute-values">
+  <group column="relationship">
+      <dt class="attribute-name"><strong>@rels.relationship@:</strong></dt>
+      <dd class="attribute-value"><strong><a href="@rels.contact_url@">@rels.contact@</a></strong></dd>
+    <group column="contact_url">
+    <if @rels.attribute@ not nil>
+      <dt class="attribute-name">@rels.attribute@:</dt>
+      <dd class="attribute-value">@rels.value;noquote@</dd>
+    </dl>
+    </if>
+    </group>
+  </group>
+</multiple>
 </if>
 
-    </td>
-    <td valign="top" width="30%" style="padding: 0px 0px 0px 15px;" class="summaries">
+</div>
+<div class="secondary">
 
       <include src="/packages/contacts/lib/groups" party_id="@party_id@" hide_form_p="t">
 
-      <include src="/packages/contacts/lib/relationships" party_id="@party_id@">
+<if @tasks_enabled_p@>
+	     <include src="/packages/tasks/lib/tasks" party_id="@party_id@" hide_form_p="t">
+</if>
 
-      <include src="/packages/contacts/lib/comments" party_id="@party_id@" limit="3" truncate_len="100" size="small" recent_on_top_p="1">
+      <include src="/packages/contacts/lib/comments" party_id="@party_id@" limit="3" truncate_len="150" size="small" recent_on_top_p="1">
 
-    </td>
-  </tr>
-</table>
-<if @update_date@ not nil><p style="padding-top: 0px; margin-top: 0px;"><small>Last updated: @update_date@</small></p></if>
-
-
+</div>
+</div>
+<if @update_date@ not nil><p class="last-updated">Last updated: @update_date@</p></if>