Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	25 Mar 2007 13:23:43 -0000	1.11
+++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	25 Mar 2007 16:27:04 -0000	1.12
@@ -278,7 +278,7 @@
       set clock [clock scan $publish_date]
 
       if {$last_user == $creation_user && $last_item == $item_id && $last_clock ne ""} {
-        #my log "--clockdiff = [expr {$last_clock - $clock }] $name"
+        #my log "--clockdiff = [expr {$last_clock - $clock }] $name [clock format $clock -format {%b %d %Y %X %Z} -gmt true]"
         if {($last_clock - $clock) < 7500 } {
           #my log "--clock ignore change due to cockdiff"
           continue
@@ -309,15 +309,44 @@
 #       }
 #     }
 
-    set result <data>\n
     foreach i [items children] {
+      set key contrib([clock format [$i set clock] -format "%Y-%m-%d" -gmt true],[$i set creation_user],[$i set item_id])
+      lappend $key $i
+    }
+
+    set result <data>\n
+#    foreach i [items children] {
+#      set stamp [clock format [$i set clock] -format "%b %d %Y %X %Z" -gmt true]
+#      set user [::xo::get_user_name [$i set creation_user]]
+#      append result [my tag -atts [list \
+#                                       start $stamp \
+#                                       title [$i set title] \
+#                                       link [$package_id pretty_link [$i set name]]] \
+#                         event "$user [$i set operation] [$i set title]"] \n
+#    }
+    foreach c [lsort -decreasing [array names contrib]] {
+      if {[llength $contrib($c)] == 1} {
+         set i $contrib($c)
+         set title [$i set title]
+      set user [::xo::get_user_name [$i set creation_user]]
+         set event "$user [$i set operation] [$i set title] [$i set name]"
+      } else {
+         set i [lindex $contrib($c) 0]
+         set event "Contributions by [::xo::get_user_name [$i set creation_user]] on [clock format [$i set clock] -format {%b %d %Y} -gmt true]\n<ul>"
+         set title "[$i set title] ([llength $contrib($c)])"
+         foreach j $contrib($c) {
+            set stamp [clock format [$j set clock] -format "%X %Z" -gmt true]
+            append  event "<li>$stamp: [$j set operation]</li>" \n
+         }
+         append event "</ul>" \n
+      }
       set stamp [clock format [$i set clock] -format "%b %d %Y %X %Z" -gmt true]
       set user [::xo::get_user_name [$i set creation_user]]
       append result [my tag -atts [list \
                                        start $stamp \
-                                       title [$i set title] \
+                                       title $title \
                                        link [$package_id pretty_link [$i set name]]] \
-                         event "$user [$i set operation] [$i set title]"] \n
+                         event $event]  \n
     }
     append result </data>\n
     return $result
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -N -r1.32 -r1.33
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	24 Mar 2007 15:25:22 -0000	1.32
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	25 Mar 2007 16:27:04 -0000	1.33
@@ -1185,6 +1185,7 @@
     foreach p [lsort -index 1 -decreasing -integer $edges] {
       foreach {edge weight width} $p break
       foreach {a b} [split $edge ,] break
+      #my log "--G $a -> $b check $c > $max_edges, $weight < $cutoff"
       if {[incr c]>$max_edges} break
       if {$weight < $cutoff} continue
       append edgesHTML "g.addEdge(\$('$a'), \$('$b'), $weight, 0, $width);\n"
@@ -1250,7 +1251,10 @@
       group by item_id, creation_user} {
 
       lappend i($item_id) $creation_user $count
-      set user($creation_user) [::xo::get_user_name $creation_user]
+      set count_var user_count($creation_user)
+      if {![info exists $count_var]} {set $count_var 0}
+      incr $count_var $count
+      set user($creation_user) "[::xo::get_user_name $creation_user] ([set $count_var])"
       if {![info exists activities($creation_user)]} {set activities($creation_user) 0}
       incr activities($creation_user) $count
     }
@@ -1329,7 +1333,10 @@
     } {
       lappend i($item_id) $creation_user $count
       incr total $count
-      set user($creation_user) [::xo::get_user_name $creation_user]
+      set count_var user_count($creation_user)
+      if {![info exists $count_var]} {set $count_var 0}
+      incr $count_var $count
+      set user($creation_user) "[::xo::get_user_name $creation_user] ([set $count_var])"
     }
 
     db_dml drop_temp_table {drop table XOWIKI_TEMP_TABLE }
@@ -1391,7 +1398,7 @@
    if {[info exists user_id]} {append data "?user_id=$user_id"}
 
    return [subst -nocommands -nobackslashes {
- <div id="my-timeline" style="font-size:80%; height: 250px; border: 1px solid #aaa"></div>
+ <div id="my-timeline" style="font-size:70%; height: 350px; border: 1px solid #aaa"></div>
 <script type="text/javascript">
 var tl;
 function onLoad() {
Index: openacs-4/packages/xowiki/www/resources/xowiki.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/xowiki/www/resources/xowiki.css	13 Mar 2007 10:27:32 -0000	1.16
+++ openacs-4/packages/xowiki/www/resources/xowiki.css	25 Mar 2007 16:27:04 -0000	1.17
@@ -145,4 +145,5 @@
 strong.code {
     font-weight: bolder;
 }
-
+div.collab-graph div {font-size: 85%;}
+div.activity-graph div {font-size: 85%;}