--- loncom/interface/loncoursegroups.pm	2006/07/07 21:20:25	1.48
+++ loncom/interface/loncoursegroups.pm	2006/07/17 15:07:26	1.52
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.48 2006/07/07 21:20:25 albertel Exp $
+# $Id: loncoursegroups.pm,v 1.52 2006/07/17 15:07:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,9 +63,9 @@ sub handler {
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $view_permission =
-          &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+          &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
     my $manage_permission =
-          &Apache::lonnet::allowed('mdg',$env{'request.course.id'});
+          &Apache::lonnet::allowed('mdg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
     my $gpterm = &Apache::loncommon::group_term();
@@ -273,7 +273,7 @@ END
                     if ($action eq 'modify' || $action eq 'delete') {
                         $link .= $group;
                     } else {
-                        $link .= $group.'/grppg';
+                        $link .= $group.'/smppg?ref=grouplist';
                     }
                     $link .= '">'.$lt{$action}.'</a>';
                     if ($action eq 'view') { 
@@ -329,8 +329,7 @@ END
                                         $curr_groups{$group});
                     my $description = &unescape(
                                         $group_info{description});
-                    my ($uname,$udom) = split(/:/,$group_info{creator});
-                    $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
+                    $r->print('<font size="+1"><a href="/adm/'.$cdom.'/'.$cnum.'/'.$group.'/smppg?ref=grouplist">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
                 }
             }
         } else {
@@ -556,7 +555,7 @@ sub group_administration {
                         $num_reenable ++;
                         next;
                     } elsif (($start > $now)) {
-                        $num_activate = 1;
+                        $num_activate ++;
                         next;
                     } else {
                         $num_expire ++;
@@ -1288,7 +1287,7 @@ END
     $r->print('&nbsp;<input type="text" name="quota" size="4" />Mb');
     if ($action eq 'create') {
         $r->print('<br />'.
-                  &mt('A total of [_1] Mb is shared between all [_2]s in the '.
+                  &mt('A total of [_1] Mb can be divided amongst all [_2]s in the '.
                   '[_3], and [_4] Mb are currently unallocated.',$crsquota,
                   $gpterm,lc($crstype),$freespace));
     } else {
@@ -2076,20 +2075,20 @@ sub current_membership {
                                           'curf' => 'Current Functionality',
                                           'chpr' => 'Change Privileges' 
                                         );
-    my ($current,$hastools,$addtools,$num_reenable,$num_activate,$num_expire) =
+    my ($current,$num_items,$hastools,$addtools) =
         &Apache::longroup::group_memberlist($cdom,$cnum,$groupname,$fixedprivs,
                                             $available);
     if (keys(%{$current}) > 0) {
         $r->print('
    <table>
     <tr>');
-        if ($num_expire) {
+        if ($num_items->{'active'}) {
             &check_uncheck_buttons($r,$formname,'expire',$lt{'expi'});
         }
-        if ($num_reenable) {
+        if ($num_items->{'previous'}) {
             &check_uncheck_buttons($r,$formname,'reenable',$lt{'reen'});
         }
-        if ($num_activate) {
+        if ($num_items->{'future'}) {
             &check_uncheck_buttons($r,$formname,'activate',$lt{'acti'});
         }
         &check_uncheck_buttons($r,$formname,'deletion',$lt{'dele'});
@@ -2295,7 +2294,7 @@ sub change_privs_form {
     my $exp_or_del = 0;
     if (ref($$memchg{'deletion'}) eq 'ARRAY') {
         if (@{$$memchg{'deletion'}} > 0) {
-            $r->print('<tr><td>&nbsp;</td><td colspan="3"><b>'.$lt{'tode'}.':</b><br /><ul>');
+            $r->print('<b>'.$lt{'tode'}.':</b><br /><ul>');
             foreach my $user (@{$$memchg{'deletion'}}) {
                 $r->print('<li>'.$$userdata{$user}[$$idx{fullname}].
                           '&nbsp;('.$user.')</li>');
@@ -2306,7 +2305,7 @@ sub change_privs_form {
     }
     if (ref($$memchg{'expire'}) eq 'ARRAY') {
         if (@{$$memchg{'expire'}} > 0) {
-            $r->print('<tr><td>&nbsp;</td><td colspan="3"><b>'.$lt{'toex'}.':</b><br /><ul>');
+            $r->print('<b>'.$lt{'toex'}.':</b><br /><ul>');
             foreach my $user (@{$$memchg{'expire'}}) {
                 $r->print('<li>'.$$userdata{$user}[$$idx{fullname}].
                           '&nbsp;('.$user.')</li>');
@@ -3261,7 +3260,7 @@ sub add_group_folder {
     if ($action eq 'create') {
     # check if group_allfolders.sequence exists.
         if (!$topmap) {
-            my $grpstitle = &mt('[_1] [_2]',$crstype,$ucgpterm);
+            my $grpstitle = &mt('[_1] [_2]s',$crstype,$ucgpterm);
             my $topmap_url = '/'.$env{'course.'.$env{'request.course.id'}.'.url'};
             $topmap_url =~ s|/+|/|g;
             if ($topmap_url =~ m|^/uploaded|) {
@@ -3276,7 +3275,7 @@ sub add_group_folder {
             }
         }
         my $grpfolder = &mt('[_1] Folder -',$ucgpterm,).$description;
-        $grppage='/adm/'.$cdom.'/'.$cnum.'/'.$groupname.'/grppg';
+        $grppage='/adm/'.$cdom.'/'.$cnum.'/'.$groupname.'/smppg';
         my $grptitle = &mt('Group homepage').' - '.$description;
         my ($seqid,$discussions,$disctitle);
         my $outcome = &map_updater($cdom,$cnum,'group_folder_'.$groupname.'.sequence',