--- loncom/interface/loncoursegroups.pm	2006/02/21 18:56:00	1.6
+++ loncom/interface/loncoursegroups.pm	2006/05/18 22:13:48	1.20
@@ -30,6 +30,7 @@ use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::lonnavmaps;
+use Apache::longroup;
 use Apache::Constants qw(:common :http);
 
 sub handler {
@@ -37,7 +38,7 @@ sub handler {
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-                                                                                
+
     if ($r->header_only) {
         return OK;
     }
@@ -102,13 +103,11 @@ sub handler {
 sub print_main_menu {
     my ($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,$view_permission,
         $manage_permission,$action,$rowColor1,$rowColor2) = @_;
-    $r->print(&header('Course Groups',&mt('LON-CAPA Course Groups'),
-              undef,undef,undef,undef,$function));
+    $r->print(&header('Course Groups',undef,undef,undef,undef,$function));
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/coursegroups",
           text=>"Course Groups",});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs
-              (undef,'Course Groups'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Groups'));
     &display_groups($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,
                     $view_permission,$manage_permission,$action,$rowColor1,
                     $rowColor2);
@@ -145,14 +144,20 @@ sub display_groups {
                           file   => 'Files',
                           dibd   => 'Discussion Boards',
                           dius   => 'Disk Use',
-                     );  
-    $r->print('<br /><br />');
+                          nogr   => 'No groups exist.',
+                          crng   => 'Create a new group',
+                          alth   => 'Although your current role has privileges'.
+                                    ' to view any existing groups in this course,'.
+                                    ' you do not have privileges to create new'.
+                                    ' groups.',
+                     );
     if ($view_permission) {
         if (!defined($action)) {
             $action = 'view';
         }
-        my %curr_groups;
-        if (&Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum)) {
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+        if (%curr_groups) {
+            $r->print('<br /><br />');
             $r->print(&Apache::lonhtmlcommon::start_pick_box());
             $r->print(<<"END");
       <table border="0" cellpadding="4" cellspacing="1">
@@ -178,7 +183,7 @@ END
             my %Sortby = ();
             foreach my $group (sort(keys(%curr_groups))) {
                 %{$grp_info{$group}} = 
-                                  &Apache::loncommon::get_group_settings(
+                                  &Apache::longroup::get_group_settings(
                                                          $curr_groups{$group});
                 my $members_result = &group_members($cdom,$cnum,$group,
                                                     \%grp_info);
@@ -241,7 +246,7 @@ END
                     if ($action eq 'modify' || $action eq 'delete') {
                         $link .= $group;
                     } else {
-                        $link .= $group.'/grppg?register=1';
+                        $link .= $group.'/grppg';
                     }
                     $link .= '">'.$lt{$action}.'</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>'.$totalfiles.'</small></td><td><small>'.$boards.'</small></td><td><small>'.$diskuse.'</small></td></tr>');
@@ -251,20 +256,27 @@ END
             $r->print('</table>');
             $r->print(&Apache::lonhtmlcommon::end_pick_box());
         } else {
-            $r->print('No groups exist');
+            $r->print($lt{'nogr'});
+            if ($manage_permission) {
+                $r->print('<br /><br /><a href="/adm/coursegroups?action=create&refpage='.$env{'form.refpage'}.'">'.$lt{'crng'}.'</a>');
+            } else {
+                $r->print('<br /><br />'.$lt{'crng'});
+
+            }
         }
     } else {
         my @coursegroups = split(/:/,$env{'request.course.groups'});
         if (@coursegroups > 0) {
-            my %curr_groups;
-            if (&Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum)) {
+            $r->print('<br /><br />');
+            my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+            if (%curr_groups) {
                 foreach my $group (@coursegroups) {
-                    my %group_info =  &Apache::loncommon::get_group_settings(
+                    my %group_info =  &Apache::longroup::get_group_settings(
                                         $curr_groups{$group});
                     my $description = &Apache::lonnet::unescape(
                                         $group_info{description});
                     my ($uname,$udom) = split(/:/,$group_info{creator});
-                    $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg?register=1">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
+                    $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
                 }
             }
         } else {
@@ -422,7 +434,10 @@ sub group_administration {
                                    );
     if (ref($stored{'autorole'}) eq 'ARRAY') {
         foreach my $role (@{$stored{'autorole'}}) {
-            $elements{'modify'}{'change_settings'}{'sec_'.$role} = 'selectbox'; 
+            unless ($role eq 'cc') {
+                $elements{'modify'}{'change_settings'}{'sec_'.$role} = 
+                                                                   'selectbox';
+            }
         }
     }
     %{$elements{'create'}{'pick_members'}} = (
@@ -443,16 +458,16 @@ sub group_administration {
         (($state eq 'pick_name') || ($state eq 'pick_privs'))) ||
        (($action eq 'modify') && (($state eq 'change_settings') ||
                                   ($state eq 'add_members')))) {
-        my $numsections = &Apache::loncommon::get_sections($cdom,$cnum,
-                                                           \%sectioncount);
-        if ($numsections > 0) {
+        %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
+        if (%sectioncount) {
             $elements{'create'}{'pick_name'}{'sectionpick'} = 'selectbox';
             $elements{'modify'}{'change_mapping'}{'sectionpick'} = 'selectbox';
             $elements{'modify'}{'add_members'}{'sectionpick'} = 'selectbox';
         }
     }
 
-    if ($action eq 'create') {
+    if (($action eq 'create') || 
+        ($action eq 'modify' && $state eq 'pick_members')) {
         if (defined($env{'form.types'})) {
             @types=&Apache::loncommon::get_env_multiple('form.types');
         }
@@ -461,7 +476,7 @@ sub group_administration {
         }
         if (defined($env{'form.sectionpick'})) {
             @sections=&Apache::loncommon::get_env_multiple('form.sectionpick');
-            if (grep/^_all$/,@sections) {
+            if (grep/^all$/,@sections) {
                 @sections = sort {$a cmp $b} keys(%sectioncount);
             }
         }
@@ -473,6 +488,9 @@ sub group_administration {
     }
     if ($state eq 'pick_members') {
         if ((keys(%users) > 0) && (@tools > 0)) {
+            if ($granularity eq 'Yes') {
+                $elements{$action}{'pick_members'}{'togglefunc'} = 'checkbox';
+            }
             foreach my $tool (@tools) {
                 if ($granularity eq 'Yes') {
                     $elements{$action}{'pick_members'}{'user_'.$tool} = 'checkbox';
@@ -527,6 +545,9 @@ sub group_administration {
             $elements{$action}{'change_members'}{'reenable'} = 'checkbox';
         }
         if ($numusers) {
+            if ($granularity eq 'Yes') {
+                $elements{$action}{'change_members'}{'togglefunc'} = 'checkbox';
+            }
             foreach my $tool (@tools) {
                 if ($granularity eq 'Yes') {
                     $elements{$action}{'change_members'}{'user_'.$tool} = 'checkbox';
@@ -540,7 +561,7 @@ sub group_administration {
 
     if (($state eq 'pick_privs') || ($state eq 'change_privs') ||
         (($specificity eq 'No') && 
-         (($state eq 'result') || ($state eq 'memresult')))) {
+         (($state eq 'addresult') || ($state eq 'memresult')))) {
         foreach my $tool (@tools) {
             my @values = &Apache::loncommon::get_env_multiple('form.user_'.$tool);
             foreach my $user (@values) {
@@ -670,7 +691,7 @@ function changeSort(caller) {
     document.$state.sortby.value = caller;
     document.$state.submit();
 } 
-                                                                                      
+
 |;
     $jscript .= &Apache::lonhtmlcommon::set_form_elements(
                            \%{$elements{$action}{$state}},\%stored);
@@ -702,8 +723,8 @@ function changeSort(caller) {
     }
 
     my $loaditems =  &onload_action($action,$state);
-    $r->print(&header('Course Groups Manager',&mt('LON-CAPA Groups Manager'),
-                          $jscript,$action,$state,$page,$function,$loaditems));
+    $r->print(&header('Course Groups Manager',
+		      $jscript,$action,$state,$page,$function,$loaditems));
 
     if ($env{'form.refpage'} eq 'enrl') {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -753,7 +774,7 @@ function changeSort(caller) {
                 &Apache::lonhtmlcommon::add_breadcrumb(
                    {text=>"$trail{$action}{$state}"});
                 $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                     (undef,'Course Groups Manager'));
+			  ('Course Groups Manager'));
                 &display_control($r,$cdom,$cnum,$tabcol,$action,$state,$page,
                        \%sectioncount,$groupname,$description,$functions,
                        \@tools,\%toolprivs,\%fixedprivs,$startdate,$enddate,
@@ -763,7 +784,7 @@ function changeSort(caller) {
                        \@sections,\%states,\%navbuttons,$rowColor1,$rowColor2);
                 last;
             } else {
-                if (($state  =~ /^\w+result$/) && ($i > 0)) {
+                if (($state eq 'result') && ($i > 0)) {
                     &Apache::lonhtmlcommon::add_breadcrumb(
     {href=>"javascript:backPage(document.$state,'$states{$action}[0]')",
       text=>"$trail{$action}{$states{$action}[$i]}"});
@@ -778,7 +799,7 @@ function changeSort(caller) {
                         &Apache::lonhtmlcommon::add_breadcrumb(
                    {text=>"View groups"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                     (undef,'Course Groups Manager'));
+		  ('Course Groups Manager'));
         &display_groups($r,$cdom,$cnum,$function,$tabcol,$functions,$idx,
                         $view_permission,$manage_permission,$action,
                         $rowColor1,$rowColor2);
@@ -790,55 +811,57 @@ function changeSort(caller) {
 
 sub retrieve_settings {
     my ($cdom,$cnum,$groupname) = @_;
-    my %groupinfo;
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$groupname);
+
+    return if (!%curr_groups);
+
+    my %groupinfo = 
+	&Apache::longroup::get_group_settings($curr_groups{$groupname});
+
     my %stored;
-    my %curr_groups;
-    my $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,
-                                                             $cnum,$groupname);
-    if ($numgroups > 0) {
-        %groupinfo = &Apache::loncommon::get_group_settings(
-                                                     $curr_groups{$groupname});
-        $stored{'description'} = &Apache::lonnet::unescape(
-                                                    $groupinfo{'description'});
-        $stored{'startdate'} = $groupinfo{'startdate'};
-        $stored{'enddate'} = $groupinfo{'enddate'};
-        if ($stored{'enddate'} == 0) {
-            $stored{'no_end_date'} = 1;
-        }
-        $stored{'granularity'} = $groupinfo{'granularity'};
-        $stored{'specificity'} = $groupinfo{'specificity'};
-        $stored{'creation'} = $groupinfo{'creation'};
-        $stored{'creator'} = $groupinfo{'creator'};
-
-        foreach my $tool (sort(keys(%{$groupinfo{'functions'}}))) {
-            if ($groupinfo{functions}{$tool} eq 'on') {
-                push(@{$stored{tool}},$tool);
-            }
-        }
-        foreach my $role (@{$groupinfo{'roles'}}) {
-            push(@{$stored{roles}},$role);
-        }
-        foreach my $type (@{$groupinfo{'types'}}) {
-            push(@{$stored{types}},$type);
-        }
-        foreach my $section (@{$groupinfo{'sectionpick'}}) {
-            push(@{$stored{sectionpick}},$section);
-        }
-        foreach my $defpriv (@{$groupinfo{'defpriv'}}) {
-            push(@{$stored{defpriv}},$defpriv);
-        }
-        $stored{'autoadd'} = $groupinfo{'autoadd'};
-        $stored{'autodrop'} = $groupinfo{'autodrop'};
-        if (exists($groupinfo{'autosec'})) {
-            foreach my $role (sort(keys(%{$groupinfo{'autosec'}}))) {
-                foreach my $section (@{$groupinfo{'autosec'}{$role}}) {
-                    push (@{$stored{'sec_'.$role}},$section);
-                }
-                if (@{$groupinfo{'autosec'}{$role}} > 0) {
-                    push(@{$stored{'autorole'}},$role);
-                }
+
+    $stored{'description'} = 
+	&Apache::lonnet::unescape($groupinfo{'description'});
+    $stored{'startdate'} = $groupinfo{'startdate'};
+    $stored{'enddate'} = $groupinfo{'enddate'};
+    if ($stored{'enddate'} == 0) {
+	$stored{'no_end_date'} = 1;
+    }
+    $stored{'granularity'} = $groupinfo{'granularity'};
+    $stored{'specificity'} = $groupinfo{'specificity'};
+    $stored{'creation'} = $groupinfo{'creation'};
+    $stored{'creator'} = $groupinfo{'creator'};
+
+    foreach my $tool (sort(keys(%{$groupinfo{'functions'}}))) {
+	if ($groupinfo{functions}{$tool} eq 'on') {
+	    push(@{$stored{tool}},$tool);
+	}
+    }
+    foreach my $role (@{$groupinfo{'roles'}}) {
+	push(@{$stored{roles}},$role);
+    }
+    foreach my $type (@{$groupinfo{'types'}}) {
+	push(@{$stored{types}},$type);
+    }
+    foreach my $section (@{$groupinfo{'sectionpick'}}) {
+	push(@{$stored{sectionpick}},$section);
+    }
+    foreach my $defpriv (@{$groupinfo{'defpriv'}}) {
+	push(@{$stored{defpriv}},$defpriv);
+    }
+    $stored{'autoadd'} = $groupinfo{'autoadd'};
+    $stored{'autodrop'} = $groupinfo{'autodrop'};
+    if (exists($groupinfo{'autosec'})) {
+	foreach my $role (sort(keys(%{$groupinfo{'autosec'}}))) {
+            if (ref($groupinfo{'autosec'}{$role}) eq 'ARRAY') {
+	        foreach my $section (@{$groupinfo{'autosec'}{$role}}) {
+	            push (@{$stored{'sec_'.$role}},$section);
+	        }
+	        if (@{$groupinfo{'autosec'}{$role}} > 0) {
+		    push(@{$stored{'autorole'}},$role);
+	        }
             }
-        }
+	}
     }
     return %stored;
 }
@@ -932,19 +955,16 @@ sub display_control {
 }
 
 sub header {
-    my ($bodytitle,$title,$jscript,$action,$state,$page,$function,$loaditems) = @_;
-    my $html=&Apache::lonxml::xmlbegin();
-    my $bodytag=&Apache::loncommon::bodytag($bodytitle,$function,$loaditems);
+    my ($bodytitle,$jscript,$action,$state,$page,$function,$loaditems) = @_;
+    my $start_page=
+	&Apache::loncommon::start_page($bodytitle,
+				       '<script type="text/javascript">'.
+				       $jscript.'</script>',
+				       {'function'    => $function,
+					'add_entries' => $loaditems,});
     my $output = <<"END";
-$html
-<head>
-<title>$title</title>
-<script type="text/javascript">
-$jscript
-</script>
-</head>
-$bodytag
-<form method="post" name="$state">
+$start_page
+<form method="POST" name="$state">
 
 END
     if ($action eq 'create' || $action eq 'modify') {
@@ -960,30 +980,31 @@ END
 
 sub onload_action {
     my ($action,$state) = @_;
-    my $loaditems;
+    my %loaditems;
     if ((defined($env{'form.origin'})) && ($action eq 'create') &&
                 ($state eq 'pick_name' || $state eq 'pick_members' || 
                  $state eq 'pick_privs')) {
         unless ($env{'form.origin'} eq '') {
-            $loaditems = 
-             'onload="javascript:setFormElements(document.'.$state.')"';
+	    $loaditems{'onload'} = 
+		'javascript:setFormElements(document.'.$state.')';
         }
     }
     if (($action eq 'modify') &&
                 ($state eq 'change_settings' || $state eq 'change_members' ||
-                 $state eq 'change_privs') || $state eq 'add_members') {
-            $loaditems =
-             'onload="javascript:setFormElements(document.'.$state.')"';
+                 $state eq 'change_privs' || $state eq 'add_members' ||
+                 $state eq 'pick_members')) {
+	$loaditems{'onload'} = 
+	    'javascript:setFormElements(document.'.$state.')';
     }
-    return $loaditems;
+    return \%loaditems;
 }
 
 sub footer {
+    my $end_page = &Apache::loncommon::end_page();
        return(<<ENDFOOT);
    <input type="hidden" name="sortby" value="$env{'form.sortby'}" />
   </form>
- </body>
-</html>
+$end_page
 ENDFOOT
 }
 
@@ -1136,18 +1157,18 @@ END
     }
     my @allfunctions = sort(keys (%{$functions}));
     for (my $i=0; $i<$halfnum; $i++) {
-        $r->print('<td><input type="checkbox" name="tool" value="'.
+        $r->print('<td><label><input type="checkbox" name="tool" value="'.
                   $allfunctions[$i].'" />&nbsp;'.
-                   $$functions{$allfunctions[$i]}.'</td>
+                   $$functions{$allfunctions[$i]}.'</label></td>
                    <td>&nbsp;</td><td>&nbsp;</td>');
     }
     $r->print('<td><input type="button" value="check all" '.
               'onclick="javascript:checkAll(document.'.$formname.'.tool)" />'.
               '</td></tr><tr><td>&nbsp;</td>');
     for (my $j=$halfnum; $j<@allfunctions; $j++) {
-        $r->print('<td><input type="checkbox" name="tool" value="'.
+        $r->print('<td><label><input type="checkbox" name="tool" value="'.
                   $allfunctions[$j].'" />&nbsp;'.
-                  $$functions{$allfunctions[$j]}.'</td>
+                  $$functions{$allfunctions[$j]}.'</label></td>
                   <td>&nbsp;</td><td>&nbsp;</td>');
     }
     if ($remnum) {
@@ -1161,7 +1182,7 @@ END
       </tr>
       <tr>
        <td><b>Granularity:</b></td>
-       <td colspan="9">'.$lt{'doyo'}.'&nbsp;<input type="radio" name="granularity" value="Yes" />'.&mt('Yes').'&nbsp;<input type="radio" name="granularity" value="No" checked="checked" />'.&mt('No'));
+       <td colspan="9">'.$lt{'doyo'}.'&nbsp;<label><input type="radio" name="granularity" value="Yes" />'.&mt('Yes').'</label>&nbsp;<label><input type="radio" name="granularity" value="No" checked="checked" />'.&mt('No').'</label>');
     if ($action eq 'modify') {
         $r->print('&nbsp;&nbsp;('.&mt('Currently set to "[_1]"',
                                       $$stored{'granularity'}).')');
@@ -1196,7 +1217,7 @@ sub membership_options {
                    previous => &mt('Previously had access'),
                    future => &mt('Will have future access'),
                    );
-                                                                                 
+
     my @roles = ('st','cc','in','ta','ep','cr');
 
     my @sections = keys(%{$sectioncount});
@@ -1232,8 +1253,8 @@ sub membership_options {
     $r->print(&Apache::lonhtmlcommon::role_select_row(\@roles));
     if (@sections > 0) {
         @sections = sort {$a cmp $b} @sections;
-        unshift(@sections,'_all'); # Put 'all' at the front of the list
-        unshift(@sections,'_nosec'); # Put 'no sections' next
+        unshift(@sections,'all'); # Put 'all' at the front of the list
+        unshift(@sections,'none'); # Put 'no sections' next
         $r->print('<td>&nbsp;</td>
                    <td colspan="3" align="center" valign="top">'.
         &sections_selection(\@sections,'sectionpick').'</td>');
@@ -1254,9 +1275,9 @@ sub sections_selection {
         $numvisible = @{$sections};
     }
     foreach my $sec (@{$sections}) {
-        if ($sec eq '_all') {
+        if ($sec eq 'all') {
             $section_sel .= '  <option value="'.$sec.'" />all sections'."\n";
-        } elsif ($sec eq '_nosec') {
+        } elsif ($sec eq 'none') {
             $section_sel .= '  <option value="'.$sec.'" />no section'."\n"; 
         } else {
             $section_sel .= '  <option value="'.$sec.'" />'.$sec."\n";
@@ -1309,7 +1330,7 @@ sub choose_members_form {
     my %origmembers;
     $r->print(&Apache::lonhtmlcommon::echo_form_input(
          ['origin','action','state','page','member','specificity','branch',
-          'defpriv','autorole','autoadd','autodrop','sortby'],
+          'defpriv','autorole','autoadd','autodrop','sortby','togglefunc'],
          \@regexps));
     my $earlyout = &validate_groupname($groupname,$action,$cdom,$cnum);
     $r->print('
@@ -1599,11 +1620,11 @@ sub pick_new_members {
             if ($granularity eq 'Yes') {
                 $r->print('<tr bgcolor="#cccccc">
  <td colspan="5">&nbsp;</td>
- <td align="center"><small><nobr><b>All:</b>&nbsp;');
+ <td align="center"><small><nobr><b>'.&mt('All:').'</b>&nbsp;');
                 foreach my $tool (@{$available}) {
-                    $r->print('<input type="checkbox" name="togglefunc" '.
-   'onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);">'.
-   '<b>'.$tool.'</b>&nbsp;&nbsp;&nbsp;');
+                    $r->print('<label><input type="checkbox" name="togglefunc" '.
+   'onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
+   ' value="'.$tool.'">'.'<b>'.$tool.'</b></label>&nbsp;&nbsp;&nbsp;');
                 }
                 $r->print('</nobr></small></td></tr>');
             }
@@ -1753,8 +1774,8 @@ sub privilege_specificity {
         }
         if ($totaloptionalprivs) {
             $r->print('
-<br /><br /><nobr><input type="radio" name="specificity" value="No" '.$specific{'No'}.' />&nbsp;'.$lt{'algm'}.'</nobr><br/>
-<nobr><input type="radio" name="specificity" value="Yes" '.$specific{'Yes'}.' />&nbsp;'.$lt{'smgp'}.'</nobr>
+<br /><br /><label><nobr><input type="radio" name="specificity" value="No" '.$specific{'No'}.' />&nbsp;'.$lt{'algm'}.'</nobr></label><br/>
+<label><nobr><input type="radio" name="specificity" value="Yes" '.$specific{'Yes'}.' />&nbsp;'.$lt{'smgp'}.'</nobr></label>
   </td>
  </tr>
  <tr>
@@ -1876,7 +1897,7 @@ sub default_privileges {
                     $dynamic .= '</tr>
                                  <tr bgcolor="'.$rowColor1.'">'."\n";
                 }
-                $dynamic .= '<td><input type="checkbox" name="defpriv" value="'.$priv.'" />'.$$toolprivs{$tool}{$priv}.'</td>'."\n";
+                $dynamic .= '<td><label><input type="checkbox" name="defpriv" value="'.$priv.'" />'.$$toolprivs{$tool}{$priv}.'</label></td>'."\n";
             }
         }
         if ($dynamic eq '') {
@@ -1982,8 +2003,8 @@ sub change_members_form {
     my @regexps = ('user_','userpriv_');
     $r->print(&Apache::lonhtmlcommon::echo_form_input(
                          ['origin','action','state','page','expire','deletion',
-                          'reenable','activate','changepriv','sortby'],
-                          \@regexps));
+                          'reenable','activate','changepriv','sortby',
+                          'togglefunc'],\@regexps));
     my $rowimg = 1;
     my @available = ();
     my @unavailable = ();
@@ -2204,9 +2225,9 @@ END
  <td colspan="'.$colspan.'" align="center"><small><nobr><b>'.&mt('All:').
   '</b>&nbsp;');
                     foreach my $tool (@{$available}) {
-                        $r->print('<input type="checkbox" name="togglefunc" '.
-   'onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);">'.
-   '<b>'.$tool.'</b>&nbsp;&nbsp;&nbsp;');
+                        $r->print('<label><input type="checkbox" name="togglefunc"'.
+   ' onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
+   ' value="'.$tool.'">'.'<b>'.$tool.'</b></label>&nbsp;&nbsp;&nbsp;');
                     }
                     $r->print('</nobr></small></td></tr>');
                 }
@@ -2243,25 +2264,25 @@ END
                     $r->print('<tr bgcolor="'.$rowColor.'">
                                 <td><small>');
                     if ($current{$user}{changestate} eq 'reenable') {
-                        $r->print('<nobr>'. 
+                        $r->print('<nobr><label>'. 
    '<input type="checkbox" name="reenable" value="'.$user.'" />'.
-   $lt{'reen'}.'</nobr><br />');
+   $lt{'reen'}.'</label></nobr><br />');
                     } elsif ($current{$user}{changestate} eq 'expire') {
-                        $r->print('<nobr>'.
+                        $r->print('<nobr><label>'.
    '<input type="checkbox" name="expire" value="'.$user.'" />'.
-   $lt{'expi'}.'</nobr><br />');
+   $lt{'expi'}.'</label></nobr><br />');
                     } elsif ($current{$user}{changestate} eq 'activate') {
-                        $r->print('<nobr>'.
+                        $r->print('<nobr><label>'.
    '<input type="checkbox" name="activate" value="'.$user.'" />'.
-   $lt{'acti'}.'</nobr><br />');
+   $lt{'acti'}.'</label></nobr><br />');
                     }
-                    $r->print('<nobr>'.
+                    $r->print('<nobr><label>'.
    '<input type="checkbox" name="deletion" value="'.$user.'" />'.
-   $lt{'dele'}.'</nobr>');
+   $lt{'dele'}.'</label></nobr>');
                     if ($specificity eq 'Yes') {
-                        $r->print('<br /><nobr>'.
+                        $r->print('<br /><nobr><label>'.
    '<input type="checkbox" name="changepriv" value="'.$user.'" />'.$lt{'chpr'}.
-   '</nobr>');
+   '</label></nobr>');
                     }
                     $r->print('
    </td>
@@ -2274,17 +2295,17 @@ END
                                   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
                         foreach my $tool (@{$current{$user}{currtools}}) {
                             if ($granularity eq 'Yes') {
-                                $r->print('<input type="checkbox" 
-                                       checked="checked"  
-                                       name="user_'.$tool.'" value="'.
-                                       $user.'" />');
+                                $r->print('<label><input type="checkbox" '. 
+                                       'checked="checked" '. 
+                                       'name="user_'.$tool.'" value="'.
+                                       $user.'" />'.$tool.'</label>');
                              } else {
-                               $r->print('<input type="hidden"
-                                       checked="checked"
-                                       name="user_'.$tool.'" value="'.
-                                       $user.'" />');
+                               $r->print('<input type="hidden" '.
+                                       'checked="checked" '.
+                                       'name="user_'.$tool.'" value="'.
+                                       $user.'" />'.$tool);
                              }
-                             $r->print($tool.'&nbsp;&nbsp;&nbsp;');
+                             $r->print('&nbsp;&nbsp;&nbsp;');
                         }
                         $r->print('</nobr></small></td>');
                     }
@@ -2292,10 +2313,10 @@ END
                         $r->print('<td align="left"><small>');
                         if ($granularity eq 'Yes') {
                             foreach my $tool (@{$current{$user}{newtools}}) {
-                                $r->print('<nobr><input type="checkbox"  
+                                $r->print('<nobr><label><input type="checkbox"
                                           name="user_'.$tool.'" value="'.
                                           $user.'" />'.$tool.
-                                                  '</nobr>&nbsp;&nbsp;&nbsp;');
+                                          '</label></nobr>&nbsp;&nbsp;&nbsp;');
                             }
                         } else {
                             foreach my $tool (@{$current{$user}{newtools}}) {
@@ -2573,7 +2594,9 @@ sub member_privileges_form {
         }
         $specificity = $env{'form.specificity'};
     } else {
-        @defprivs = @{$$stored{'defpriv'}};
+        if (defined($$stored{'defpriv'})) {
+            @defprivs = @{$$stored{'defpriv'}};
+        }
         $specificity = $$stored{'specificity'};
     }
     my @showtools;
@@ -2695,7 +2718,6 @@ END
                           '<br />');
                 &display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools,
                             $toolprivs,\@defprivs);
-                                                                                      
             }
         } else {
             if (keys(%{$usertools}) > 0) {
@@ -2758,7 +2780,9 @@ sub process_request {
             @defprivs = @temp; 
         }
     } else {
-        @defprivs = @{$$stored{'defpriv'}};
+        if (defined($$stored{'defpriv'})) {
+            @defprivs = @{$$stored{'defpriv'}};
+        }
     }
 
     my $outcome;
@@ -2794,7 +2818,7 @@ sub write_group_data {
                              'creation','modified','creator','granularity',
                              'specificity','autoadd','autodrop');
     my @mult_attributes = ('roles','types','sectionpick','defpriv');
-                                                                                    
+
     my %groupinfo = (
                      description => $esc_description,
                      startdate => $startdate,
@@ -2833,14 +2857,11 @@ sub write_group_data {
     }
     my $autosec;
     my @autorole = &Apache::loncommon::get_env_multiple('form.autorole');
-                                                                                    
+
     foreach my $role (@autorole) {
         if (defined($env{'form.sec_'.$role})) {
             my @autosections=&Apache::loncommon::get_env_multiple('form.sec_'.
                                                                   $role);
-            if (grep/^_all$/,@autosections) {
-                @autosections = sort {$a cmp $b} keys(%{$sectioncount});
-            }
             $autosec .= '<role id="'.$role.'">';
             foreach my $sec (@autosections) {
                 $autosec .= '<section>'.$sec.'</section>';
@@ -2884,6 +2905,7 @@ sub process_membership {
     my $num_ok = 0;
     my $num_fail = 0;
     my %group_privs = ();
+    my %curr_privs = ();
     my %tooltype = ();
 
     foreach my $tool (@{$tools}) {
@@ -2894,6 +2916,11 @@ sub process_membership {
                   &Apache::loncommon::get_env_multiple('form.userpriv_'.$priv);
                 foreach my $user (@users) {
                     $group_privs{$user} .= $priv.':';
+                    if ($state eq 'memresult') { 
+                        unless (exists($$usertools{$user}{$tool})) {
+                            $$usertools{$user}{$tool} = 1;
+                        }
+                    }
                 }
             } else {
                 if (@{$defprivs} > 0) {
@@ -2917,6 +2944,7 @@ sub process_membership {
     my @expire = ();
     my @deletion = ();
     my @reenable = ();
+    my @unchanged = ();
     if ($state eq 'memresult') {
         if (ref($$memchg{'activate'}) eq 'ARRAY') {
             @activate = @{$$memchg{'activate'}};
@@ -2930,21 +2958,25 @@ sub process_membership {
         if (ref($$memchg{'reenable'}) eq 'ARRAY') {
             @reenable = @{$$memchg{'reenable'}};
         }
+        my %membership = &Apache::lonnet::get_group_membership($cdom,$cnum,
+                                                                 $groupname);
+        foreach my $key (sort(keys(%membership))) {
+            if ($key =~ /^\Q$groupname\E:([^:]+:[^:]+)$/) {
+                (undef,undef,$curr_privs{$1})=split(/:/,$membership{$key},3);
+            }
+        }
         if (@expire + @deletion > 0) {
-            my %membership = &Apache::lonnet::get_group_membership($cdom,$cnum,
-                                                                   $groupname);
             foreach my $user (@expire) {
-                my ($currend,$currstart,@userprivs) = 
-                                  split(/:/,$membership{$groupname.':'.$user});
-                $group_privs{$user} = join(':',@userprivs); 
+                my ($currend,$currstart,$grp_privs) = 
+                              split(/:/,$membership{$groupname.':'.$user},3);
                 if ($currstart > $now) {
                     $currstart = $now;
                 }
                 $usersettings{$groupname.':'.$user} = $now.':'.$currstart.':'.
-                                                      $group_privs{$user};
+                                                      $grp_privs;
                 if (&Apache::lonnet::modify_group_roles($cdom,$cnum,$groupname,
                                                        $user,$now,$currstart,
-                                                       $group_privs{$user}) eq 'ok') {
+                                                       $grp_privs) eq 'ok') {
                     push(@{$added{'expired'}},$user);
                     $num_ok ++;
                 } else {
@@ -2965,13 +2997,20 @@ sub process_membership {
                 }
             }
         }
-    }   
+    }
 
     foreach my $user (sort(keys(%{$usertools}))) {
+        if ((grep(/^$user$/,@expire)) || (grep(/^$user$/,@deletion))) {
+            next;
+        }
         my $type;
         my $start = $startdate;
         my $end = $enddate;
         if ($state eq 'memresult') {
+            if ($curr_privs{$user} eq $group_privs{$user}) {
+               push(@unchanged,$user);
+               next;
+            }
             $type = 'modified';
             if (@activate > 0) {
                 if (grep/^$user$/,@activate) {
@@ -3004,13 +3043,14 @@ sub process_membership {
     if ($num_ok) {
         foreach my $type (sort(keys(%added))) { 
             $r->print(&mt('The following users were successfully [_1]',$type));
-            if ($type eq 'activated' || $type eq 'added' || $type eq 'reenabled') {
+            if (!($type eq 'deleted' || $type eq 'expired')) {   
                 $r->print(&mt(' with the following privileges'));
             }
             $r->print(':<br />');
             foreach my $user (@{$added{$type}}) {
-                my $privlist;
-                if ($type eq 'activated' || $type eq 'added') {
+                my $privlist = '';
+                if (!($type eq 'deleted' ||  $type eq 'expired')) {
+                    $privlist = ': ';
                     my @privs = split(/:/,$group_privs{$user});
                     my $curr_tool = '';
                     foreach my $priv (@privs) {
@@ -3022,8 +3062,9 @@ sub process_membership {
                     }
                     $privlist =~ s/, $//;
                 }
-                $r->print($$userdata{$user}[$$idx{fullname}].'&nbsp;-&nbsp;'.$user.': '.$privlist.'<br />');
+                $r->print($$userdata{$user}[$$idx{fullname}].'&nbsp;-&nbsp;'.$user.$privlist.'<br />');
             }
+            $r->print('<br />');
         }
     }
     if ($num_fail) {
@@ -3033,11 +3074,19 @@ sub process_membership {
                 $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'<br />');
             }
         }
+        $r->print('<br />');
+    }
+    if (@unchanged > 0) {
+        $r->print(&mt('No change occurred for the following users:<br />'));
+        foreach my $user (sort(@unchanged)) {
+            $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'<br />');
+        }
+        $r->print('<br />');
     }
     if ($roster_result eq 'ok') {
-        $r->print('<br />Group membership list updated.');
+        $r->print('<br />'.&mt('Group membership list updated.'));
     } else {
-        $r->print('<br />An error occurred while updating the group membership list -'.$roster_result.'<br />');
+        $r->print('<br />'.&mt('An error occurred while updating the group membership list -').$roster_result.'<br />');
     }
     return;
 }
@@ -3095,7 +3144,7 @@ sub automapping {
    <td>&nbsp;</td>
    <td colspan="3">
    <nobr>'.$$lt{'auad'}.':&nbsp;
-    <input type="radio" name="autoadd" value="on" />on&nbsp;&nbsp;<input type="radio" name="autoadd" value="off" />off');
+    <label><input type="radio" name="autoadd" value="on" />on&nbsp;&nbsp;</label><label><input type="radio" name="autoadd" value="off" checked="checked" />off</label>');
     if ($action eq 'modify') {
         $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$add}.'</b>)');
     }
@@ -3107,7 +3156,7 @@ sub automapping {
    <td>&nbsp;</td>
    <td colspan="3">
     <nobr>'.$$lt{'auex'}.':&nbsp;
-    <input type="radio" name="autodrop" value="on" />on&nbsp;&nbsp;<input type="radio" name="autodrop" value="off" />off');
+    <label><input type="radio" name="autodrop" value="on" />on&nbsp;&nbsp;</label><label><input type="radio" name="autodrop" value="off" checked="checked" />off</label>');
     if ($action eq 'modify') {
         $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$drop}.'</b>)');
     }
@@ -3130,8 +3179,8 @@ sub mapping_settings {
     my @sections = keys(%{$sectioncount});
     if (@sections > 0) {
         @sections = sort {$a cmp $b} @sections;
-        unshift(@sections,'_nosec'); # Put 'no sections' next
-        unshift(@sections,'_all'); # Put 'all' at the front of the list
+        unshift(@sections,'none'); # Put 'no sections' next
+        unshift(@sections,'all'); # Put 'all' at the front of the list
     }
     &topic_bar($r,$tabcol,$image,$$lt{'pirs'});
     $r->print('
@@ -3155,8 +3204,15 @@ sub mapping_settings {
         my $plrole=&Apache::lonnet::plaintext($role);
         my $sections_sel;
         if (@sections > 0) {
-            $sections_sel='<td>'.&sections_selection(\@sections,'sec_'.$role).
-                                                                       '</td>';
+            if ($role eq 'cc') {
+                $sections_sel = '<td align="right">'.
+                                &mt('all sections').'<input type="hidden" '. 
+                                'name="sec_cc" value="all" /></td>';
+            } else { 
+                $sections_sel='<td align="right">'.
+                              &sections_selection(\@sections,'sec_'.$role).
+                              '</td>';
+            }
         }
         if ($rowNum %2 == 1) {
             $rowColor = $rowColor1;
@@ -3189,7 +3245,7 @@ sub mapping_settings {
 }
 
 sub standard_roles {
-    my @roles = ('st','ep','ta','in','cc');
+    my @roles = ('cc','in','ta','ep','st');
     return @roles;
 }
 
@@ -3278,13 +3334,13 @@ sub member_privs_entries {
                         if ($privcount == 3) {
                             $dynamic .= '</tr><tr>';
                         }
-                        $dynamic .='<td><nobr><input type="checkbox" '.
+                        $dynamic .='<td><nobr><label><input type="checkbox" '.
                                'name="userpriv_'.$priv.'" value="'.$user.'"';
                         if (grep/^\Q$priv\E$/,@{$defprivs}) {
                             $dynamic .= ' checked="checked" ';
                         }
                         $dynamic .= ' />'.$$toolprivs{$tool}{$priv}.
-                                    '</nobr></td>';
+                                    '</label></nobr></td>';
                     }
                 }
                 $r->print('<tr><td colspan="2"><nobr>'.$fixed.'</nobr></td></tr><tr>'.$dynamic.'</tr></table></td>');
@@ -3313,8 +3369,8 @@ sub date_setting_table {
                                                       'startdate',$starttime);
     my $endform = &Apache::lonhtmlcommon::date_setter($formname,
                                                       'enddate',$endtime);
-    my $perpetual = '<nobr><input type="checkbox" name="no_end_date" />
-                                                  no ending date</nobr>';
+    my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date" />
+                                                no ending date</label></nobr>';
     my $start_table = '';
     $start_table .= "<table>\n";
     $start_table .= '<tr><td align="right">Default starting date for 
@@ -3389,11 +3445,9 @@ function toggleTools(field,caller) {
 
 sub validate_groupname {
     my ($groupname,$action,$cdom,$cnum) = @_;
-    my %sectioncount;
-    my $numsec=&Apache::loncommon::get_sections($cdom,$cnum,\%sectioncount);
-    my %curr_groups;
-    my $numgroups=&Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum);
-                                                                                         
+    my %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum);
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+
     my %lt = &Apache::lonlocal::texthash (
                       igna => 'Invalid group name',
                       tgne => 'The group name entered ',
@@ -3407,7 +3461,7 @@ sub validate_groupname {
                       thgr => '- does not correspond to the name of an existing'.  
                               ' group ',    
     );
-                                                                                         
+
     my $exitmsg = '<b>'.$lt{'igna'}.'</b><br /><br />'.$lt{'tgne'}.' "'.
                   $groupname.'" ';
     my $dupmsg = $lt{'grna'};
@@ -3416,21 +3470,16 @@ sub validate_groupname {
         $earlyout = $exitmsg.$lt{'isno'}.'<br />'.$lt{'gnmo'};
         return $earlyout;
     }
-    if ($numsec) {
-        if (exists($sectioncount{$groupname})) {
-            $earlyout = $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}.
-                        '<br />'.$lt{'grna'};
-            return $earlyout;
-        }
+    if (exists($sectioncount{$groupname})) {
+	return $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}.
+	    '<br />'.$lt{'grna'};
     }
-    if ($action eq 'create') {
-        if ($numgroups) {
-            if (exists($curr_groups{$groupname})) {
-                $earlyout = $exitmsg.$lt{'cnnb'}.&mt('an existing group').
-                            $lt{'inth'}.'<br />'.$lt{'grna'};
-                return $earlyout;
-            }
-        }
+    if ($action eq 'create' 
+	&& exists($curr_groups{$groupname})) {
+
+	return $exitmsg.$lt{'cnnb'}.&mt('an existing group').
+	    $lt{'inth'}.'<br />'.$lt{'grna'};
+
     } elsif ($action eq 'modify') {
         unless(exists($curr_groups{$groupname})) {
             $earlyout = &mt('Group name:').' '.$groupname.$lt{'thgr'}.$lt{'inth'};