--- loncom/interface/loncoursegroups.pm	2006/03/19 22:31:41	1.9
+++ loncom/interface/loncoursegroups.pm	2006/05/01 19:37:33	1.14
@@ -106,8 +106,7 @@ sub print_main_menu {
     &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);
@@ -464,7 +463,8 @@ sub group_administration {
         }
     }
 
-    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');
         }
@@ -771,7 +771,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,
@@ -796,7 +796,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);
@@ -952,11 +952,13 @@ sub display_control {
 sub header {
     my ($bodytitle,$jscript,$action,$state,$page,$function,$loaditems) = @_;
     my $start_page=
-	&Apache::loncommon::start_page($bodytitle,$jscript,
-				       {'function' => $function,
+	&Apache::loncommon::start_page($bodytitle,
+				       '<script type="text/javascript">'.
+				       $jscript.'</script>',
+				       {'function'    => $function,
 					'add_entries' => $loaditems,});
     my $output = <<"END";
-$bodytag
+$start_page
 <form method="POST" name="$state">
 
 END
@@ -973,23 +975,23 @@ 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' ||
                  $state eq 'pick_members')) {
-            $loaditems =
-             'onload="javascript:setFormElements(document.'.$state.')"';
+	$loaditems{'onload'} = 
+	    'javascript:setFormElements(document.'.$state.')';
     }
-    return $loaditems;
+    return \%loaditems;
 }
 
 sub footer {