Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/contacts/www/contact.adp	21 Jun 2005 11:45:13 -0000	1.19
+++ openacs-4/packages/contacts/www/contact.adp	21 Jun 2005 12:24:53 -0000	1.20
@@ -2,40 +2,8 @@
 <property name="party_id">@party_id@</property>
 <div id="contact-info">
   <div class="primary">
-    <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 @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>
-	      </if>
-	    </group>
-	  </group>
-	</dl>
-      </multiple>
-    </if>
+    <include src="/packages/contacts/lib/contact-attributes" party_id="@party_id@" />
+    <include src="/packages/contacts/lib/contact-relationships" party_id="@party_id@" />
     <dl>
       <dd class="attribute-value">
 	<if @employee_url@ ne "">