--- loncom/interface/loncoursegroups.pm	2006/06/30 08:14:31	1.32
+++ loncom/interface/loncoursegroups.pm	2006/07/02 12:46:06	1.35
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.32 2006/06/30 08:14:31 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.35 2006/07/02 12:46:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -230,7 +230,10 @@ END
                     $grp_info{$group}{'diskuse'} = sprintf("%.0f",$pct_use);
                 } else {
                     $grp_info{$group}{'diskuse'} = 'N/A';
-                }     
+                }
+                my ($groupboards,$boardshash)=&Apache::longroup::get_group_bbinfo(
+                                                               $cdom,$cnum,$group);
+                $grp_info{$group}{'boards'} = scalar(@{$groupboards});
                 if ($env{'form.sortby'} eq 'groupname') {
                     push(@{$Sortby{$group}},$group);
                 } elsif ($env{'form.sortby'} eq 'description') {
@@ -299,7 +302,7 @@ END
                                       $group.'">'.$lt{'modify'}.'</a>';
                         }
                     }
-                    $r->print('<tr bgcolor="'.$rowColor.'"><td><small>'.$link.'</small></td><td><small>'.$group.'</small></td><td><small>'.$description.'</small></td><td><small>'.$creator.'</small></td><td><small>'. &Apache::lonnavmaps::timeToHumanString($creation).'</small></td><td><small>'. &Apache::lonnavmaps::timeToHumanString($modified).'</small></td><td><small>'.$functionality.'</small></td><td><small>'.$quota.'</small></td><td><small>'.$totalmembers.'</small></td><td><small><nobr>'.&mt('Files: ').$totalfiles.'</nobr><br /><nobr>'.&mt('Folders: ').$totaldirs.'</nobr></small></td><td><small>'.$boards.'</small></td><td><small>'.$diskuse.'</small></td></tr>');
+                    $r->print('<tr bgcolor="'.$rowColor.'"><td><small>'.$link.'</small></td><td><small>'.$group.'</small></td><td><small>'.$description.'</small></td><td><small>'.$creator.'</small></td><td><small>'. &Apache::lonnavmaps::timeToHumanString($creation).'</small></td><td><small>'. &Apache::lonnavmaps::timeToHumanString($modified).'</small></td><td><small>'.$functionality.'</small></td><td align="right"><small>'.$quota.'</small></td><td align="right"><small>'.$totalmembers.'</small></td><td align="right"><small><nobr>'.&mt('Files: ').$totalfiles.'</nobr><br /><nobr>'.&mt('Folders: ').$totaldirs.'</nobr></small></td><td align="right"><small>'.$boards.'</small></td><td align="right"><small>'.$diskuse.'</small></td></tr>');
                     $rowNum ++;
                 }
             }
@@ -1368,7 +1371,8 @@ sub membership_options {
                    future => &mt('Will have future access'),
                    );
 
-    my @roles = ('st','cc','in','ta','ep','cr');
+    #FIXME need to plumb around for the various cr roles defined by the user
+    my @roles = ('st','cc','in','ta','ep');
 
     my @sections = keys(%{$sectioncount});
 
@@ -1776,7 +1780,7 @@ sub pick_new_members {
         if (@{$available} > 0) {
             if ($granularity eq 'Yes') {
                 $r->print('<tr bgcolor="#cccccc">
- <td colspan="5">&nbsp;</td>
+ <td colspan="6">&nbsp;</td>
  <td align="center"><small><nobr><b>'.&mt('All:').'</b>&nbsp;');
                 foreach my $tool (@{$available}) {
                     $r->print('<label><input type="checkbox" name="togglefunc" '.
@@ -3638,7 +3642,7 @@ sub add_group_folder {
         #modify group folder if status of discussions tools is changed
     }
     my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-    my $navmap = Apache::lonnavmaps::navmap->new();
+    $navmap = Apache::lonnavmaps::navmap->new();
     # modify parameters
     my $parm_result;
     if ($action eq 'create') {