Index: openacs-4/packages/acs-admin/www/users/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/acs-admin/www/users/merge.tcl	8 Jun 2005 17:52:31 -0000	1.1.2.3
+++ openacs-4/packages/acs-admin/www/users/merge.tcl	13 Jun 2005 20:43:09 -0000	1.1.2.4
@@ -40,9 +40,14 @@
 
 set user_id_one_items [callback MergeShowUserInfo -user_id $user_id ]
 if { ![empty_string_p $user_id_one_items] } {
-    set user_id_one_items_html "<ul><li>User Items<ul>"
-    foreach item $user_id_one_items {
-	append user_one_items_html "<li>$item</li>"
+    set user_id_one_items_html "<ul><li><b>Packages User Information </b><ul>"
+    foreach pkg_list $user_id_one_items {
+	append user_id_one_items_html "<li><i>[lindex $pkg_list 0]</i><ul>"
+	set length [llength $pkg_list]
+	for { set idx 1} { $idx < $length } { incr idx } {
+	    append user_id_one_items_html "<li>[lindex $pkg_list $idx]</li>"
+	}
+	append user_id_one_items_html "</ul></li>"
     }
     append user_id_one_items_html "</ul></li></ul>"
 } else {
@@ -66,9 +71,14 @@
 
 set user_id_two_items [callback MergeShowUserInfo -user_id $user_id_from_search ]
 if { ![empty_string_p $user_id_two_items] } {
-    set user_id_two_items_html "<ul><li>User Items<ul>"
-    foreach item $user_id_two_items {
-	append user_two_items_html "<li>$item</li>"
+    set user_id_two_items_html "<ul><li><b>Packages User Information </b><ul>"
+    foreach pkg_list $user_id_two_items {
+	append user_id_two_items_html "<li><i>[lindex $pkg_list 0]</i><ul>"
+	set length [llength $pkg_list]
+	for { set idx 1} { $idx < $length } { incr idx } {
+	    append user_id_two_items_html "<li>[lindex $pkg_list $idx]</li>"
+	}
+	append user_id_two_items_html "</ul></li>"
     }
     append user_id_two_items_html "</ul></li></ul>"
 } else {