Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/contacts/www/contact.adp	3 Jun 2005 19:58:15 -0000	1.8
+++ openacs-4/packages/contacts/www/contact.adp	5 Jun 2005 18:19:37 -0000	1.9
@@ -1,61 +1,76 @@
-<master src="/packages/contacts/lib/contact-master">
+<master src="/packages/contacts/lib/contact-master" />
 <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>
-    </dl>
+  <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>
-    </group>
+    <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>
-</multiple>
-</if>
-
-</div>
-<div class="secondary">
-
-      <include src="/packages/contacts/lib/groups" party_id="@party_id@" hide_form_p="t">
-
-      <include src="/packages/contacts/lib/comments"
-      party_id="@party_id@" limit="3" truncate_len="100" size="small"
-      recent_on_top_p="1"> 
-<if @projects_enabled_p@>
+  </group>
+  </multiple>
+  </if>
+  </div>
+  <div class="secondary">
+    <include
+      src="/packages/contacts/lib/groups"
+      party_id="@party_id@"
+      hide_form_p="t" />
+    <include
+      src="/packages/contacts/lib/comments"
+      party_id="@party_id@"
+      limit="3"
+      truncate_len="100"
+      size="small"
+      recent_on_top_p="1" />
+    <if @project_url@ ne "">
       <br />
-      <h3><a href="@project_url@">#contacts.PROJECT#</a>
-      <if @project_url@ ne "">
-          <include src="/packages/project-manager/lib/subprojects" project_item_id="@project_id@" base_url="@base_url@">
-      </if>
-      <if @update_date@ not nil><p style="padding-top: 0px; margin-top: 0px;"><small>#contacts.lt_Last_updated_update_d#</small></p></if>
-</if>
-<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="150" size="small" recent_on_top_p="1">
-
+      <h3>
+	<a href="@project_url@">#contacts.PROJECT#</a>
+	<include
+	  src="/packages/project-manager/lib/subprojects"
+	  project_item_id="@project_id@"
+	  base_url="@base_url@" />
+    </if>
+    <if @tasks_enabled_p@>
+      <include
+	src="/packages/tasks/lib/tasks"
+	party_id="@party_id@"
+	hide_form_p="t" />
+    </if>
+    <if @update_date@ not nil>
+      <p style="padding-top: 0px; margin-top: 0px;">
+	<small>#contacts.lt_Last_updated_update_d#</small>
+      </p>
+    </if>
+  </div>
 </div>
-</div>
-<if @update_date@ not nil><p class="last-updated">Last updated: @update_date@</p></if>
+<if @update_date@ not nil>
+  <p class="last-updated">Last updated: @update_date@</p>
+</if>