Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -N -r1.32 -r1.33
--- openacs-4/packages/contacts/www/contact.adp	7 Oct 2005 22:57:12 -0000	1.32
+++ openacs-4/packages/contacts/www/contact.adp	12 Oct 2005 22:36:28 -0000	1.33
@@ -1,84 +1,105 @@
-<master src="/packages/contacts/lib/contact-master" />
+<master src="@master_src@" />
 <property name="party_id">@party_id@</property>
 <div id="contact-info">
   <div class="primary">
-    <include src="/packages/contacts/lib/contact-attributes" party_id="@party_id@" />
-    <include src="/packages/contacts/lib/contact-relationships" party_id="@party_id@" />
+    <include src="/packages/contacts/lib/contact-attributes-portlet" party_id="@party_id@" /> <br />
+    <include src="/packages/contacts/lib/contact-relationships-portlet" party_id="@party_id@" />
   </div>
   <div class="secondary">
     <if @dotlrn_club_enabled_p@>
       <h3 class="contact-title"><a href="@club_url@">#contacts.Visit_Club#</a></h3>
       </if>
     <include
-      src="/packages/contacts/lib/searches"
+      src="/packages/contacts/lib/searches-portlet"
       party_id="@party_id@"
       hide_form_p="t" />
+      <br />
     <if @tasks_enabled_p@>
       <include
-	src="/packages/tasks/lib/tasks"
+	src="/packages/contacts/lib/tasks-tasks-portlet"
 	party_id="@party_id@"
 	hide_form_p="t" />
+	<br />
     </if>
     <include
-      src="/packages/contacts/lib/history"
+      src="/packages/contacts/lib/history-portlet"
       party_id="@party_id@"
       limit="3"
       truncate_len="100"
       size="small"
       recent_on_top_p="1" />
+      <br />
     <if @pm_package_id@>
-      <include src=/packages/project-manager/lib/projects orderby=@orderby;noquote@ elements="planned_end_date category_id" package_id=@pm_package_id@ actions_p="1" bulk_p="1" assignee_id="" filter_p="0" base_url="@pm_base_url@" customer_id="@party_id@" status_id="1" fmt="%x %r">
+      <include src="/packages/contacts/lib/projects-portlet"
+	orderby=@orderby;noquote@ 
+	elements="planned_end_date category_id" 
+	package_id=@pm_package_id@ 
+	actions_p="1" 
+	bulk_p="1" 
+	assignee_id="" 
+	filter_p="0" 
+	base_url="@pm_base_url@" 
+	customer_id="@party_id@" 
+	status_id="1" 
+	fmt="%x %r">
+	<br />
 </if>
     <if @projects_enabled_p@>
       <if @project_url@ ne "">
-	<br />
-	<h3>
-	  <a href="@project_url@">#contacts.PROJECT#</a></h3>
 	  <include
-	    src="/packages/project-manager/lib/subprojects"
+	    src="/packages/contacts/lib/subprojects-portlet"
 	    project_item_id="@project_id@"
 	    base_url="@base_url@" />
+	<br />
       </if>
     </if>
     <if @object_type@ eq "organization">
       <if @invoices_enabled_p@>
-	<include src="/packages/invoices/lib/offer-list" organization_id="@party_id@" elements="offer_nr title amount_total" package_id="@iv_package_id@" base_url="@iv_base_url@" />
-	
-	<h3 class="contact-title"><a href="/invoices">#invoices.Billable_Projects#</a></h3>
-	<include src="/packages/invoices/lib/projects-billable" organization_id="@party_id@" elements="checkbox project_id title amount_open" package_id="@iv_package_id@" base_url="@iv_base_url@" />
-	<include src="/packages/glossar/lib/glossar-list" owner_id=@party_id@ orderby=@orderby@ customer_id=@party_id@ format=table></include>
+	<include src="/packages/contacts/lib/offers-portlet" 
+		organization_id="@party_id@" 
+		elements="offer_nr title amount_total" 
+		package_id="@iv_package_id@" 
+		base_url="@iv_base_url@" />
+	<br />
+
+	<include src="/packages/contacts/lib/projects-billable-portlet" 
+		organization_id="@party_id@" 
+		elements="checkbox project_id title amount_open" 
+		package_id="@iv_package_id@" 
+		base_url="@iv_base_url@" />
+	<br />
+
+	<include src="/packages/contacts/lib/glossar-list-portlet" 
+		owner_id=@party_id@ 
+		orderby=@orderby@ 
+		customer_id=@party_id@ 
+		format=table />
+	<br />
       </if>
       <if @pm_installed_p@>
-	<br>
-	<h3 class="contact-title">#contacts.Complaints#:</h3>
-	<include src="/packages/contacts/lib/contact-complaint-list" 
+	<include src="/packages/contacts/lib/contact-complaint-list-portlet" 
 	    customer_id=@party_id@
 	    elements="title supplier state description"
-	>
-	<form action="/contacts/add-edit-complaint">
-	#contacts.Add_complaint_to#: @select_menu;noquote@
-	     <input type="hidden" name="customer_id" value="@party_id@">
-	     <input type="submit" value="#contacts.Add_1#">
-	</form>
-	<br>
-	<h3 class="contact-title">#contacts.Freelancers#:</h3>
-	<include src="/packages/project-manager/lib/customer-group-list" 
+	    select_menu="@select_menu;noquote@" />
+	<br />
+
+	<include src="/packages/contacts/lib/customer-group-portlet" 
 	    customer_id=@party_id@
 	    group_name="Freelancer"
 	    elements="name project_name deadline"
 	    cgl_orderby=@cgl_orderby;noquote@
 	    page=@page@
 	>
-	<br>
-        <include src="/packages/project-manager/lib/tasks"
+	<br />
+
+        <include src="/packages/contacts/lib/pm-tasks-portlet"
 		display_mode="list"
 		elements="task_item_id title slack_time project_item_id percent_complete"
 		is_observer_p="f"
 		orderby="title,asc"
 		status_id="1"
 		party_id=@dotlrn_club_id@
-		assign_group_p="1"
-	>
+		assign_group_p="1" />
       </if>
     </if>
     <if @update_date@ not nil>
Index: openacs-4/packages/contacts/www/contact.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.tcl,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/contacts/www/contact.tcl	5 Oct 2005 18:42:57 -0000	1.26
+++ openacs-4/packages/contacts/www/contact.tcl	12 Oct 2005 22:36:28 -0000	1.27
@@ -22,6 +22,7 @@
 set user_id [ad_conn user_id]
 set package_url [ad_conn package_url]
 
+set master_src [parameter::get -parameter "ContactMaster"]
 
 # Code for quickly adding an employee