--- loncom/interface/lonpickcourse.pm	2006/03/15 22:11:04	1.40
+++ loncom/interface/lonpickcourse.pm	2006/05/18 01:08:50	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.40 2006/03/15 22:11:04 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.46 2006/05/18 01:08:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,7 @@ use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::longroup;
 
 sub handler {
     my $r = shift;
@@ -42,8 +43,6 @@ sub handler {
     return OK if $r->header_only;
 
 # ------------------------------------------------------------ Print the screen
-    $r->print(&Apache::lonxml::xmlbegin().
-	      &Apache::loncommon::head());
 
 # Get parameters from query string
     &Apache::loncommon::get_unprocessed_cgi
@@ -98,18 +97,18 @@ sub handler {
                       ['-1','86400','604800','2592000','7776000',
 		      '15552000','31104000']));
 # if called from loncreateuser, report sections, then close
-    my ($loaditem,$seclist);
+    my (%loaditem,$seclist,$groupslist);
     my $num_sections = 0;
     if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) {
-        $loaditem = 'onLoad="setSections()"';
+        $loaditem{'onload'} ="setSections()";
         my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'};
-        my %sections_count = ();
-        $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count);
-        my @sections = ();
-        if ($num_sections > 0) {
-            @sections = (sort {$a <=> $b} keys(%sections_count));
-            $seclist = join('","',@sections);
-        }
+
+        my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+        my @sections =  (sort {$a <=> $b} keys(%sections_count));
+	$seclist = join('","',@sections);
+
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+	$groupslist = join(',',sort(keys(%curr_groups)));
     }
     my $jscript;
     my $title = 'Selecting a course';
@@ -121,7 +120,9 @@ sub handler {
         $jscript = &Apache::loncommon::check_uncheck_jscript();
         $multelement = '<input type="hidden" name="multiple" value="'.$multiple.'" />';
     }
-    $r->print(&Apache::loncommon::bodytag($title,undef,$loaditem,undef,undef,undef,undef,1));
+    $r->print(&Apache::loncommon::start_page($title,undef,
+					     {'add_entries' => \%loaditem,
+					      'no_nav_bar'  => 1, }));
     my %lt=&Apache::lonlocal::texthash(
 				       'cac' => 'Course Activity',
 				       'cde' => 'Course Description',
@@ -236,6 +237,7 @@ function setSections() {
             opener.document.$env{"form.form"}.currsec.options[0].selected = false
         }
     }
+    opener.document.$env{"form.form"}.groups.value='$groupslist';
     self.close()
 }