--- loncom/interface/lonpickcourse.pm 2005/11/15 20:46:40 1.35 +++ loncom/interface/lonpickcourse.pm 2006/05/09 14:38:10 1.44 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.35 2005/11/15 20:46:40 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.44 2006/05/09 14:38:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,13 +42,7 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -ENDDOCUMENT + # Get parameters from query string &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', @@ -82,7 +76,7 @@ ENDDOCUMENT unless ($coursefilter) { $coursefilter=''; } my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"'); $courseidtag = &mt('LON-CAPA course ID'); - $courseidtag .= qq| + $courseidtag .= qq|:
|; } @@ -102,10 +96,10 @@ ENDDOCUMENT ['-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); @@ -114,6 +108,8 @@ ENDDOCUMENT @sections = (sort {$a <=> $b} keys(%sections_count)); $seclist = join('","',@sections); } + my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum); + $groupslist = join(',',sort(keys(%curr_groups))); } my $jscript; my $title = 'Selecting a course'; @@ -125,13 +121,15 @@ ENDDOCUMENT $jscript = &Apache::loncommon::check_uncheck_jscript(); $multelement = ''; } - $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', 'cdo' => 'Course Domain', 'cin' => 'Course Institutional Code', - 'cow' => "Course Owner's usename"); + 'cow' => "Course Owner's Username"); my ($name_code,$name_input); if (defined($env{'form.cnameelement'}) && $env{'form.cnameelement'} ne '') { $name_code = "opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=cdesc;"; @@ -149,7 +147,7 @@ ENDDOCUMENT my $roledom = $env{'form.roleelement'}; if ($roledom) { $roleelement = ''; - $submitopener = &Apache::lonroles::processpick($roledom); + $submitopener = &Apache::lonroles::processpick(); $autosubmit = 'process_pick("'.$roledom.'")'; } $r->print(< 1 && $multiple) { @@ -301,7 +300,8 @@ ENDSCRIPT onclick="javascript:uncheckAll(document.courselist.course_id)" />

'); } - foreach my $description (sort(keys(%by_descrip))) { + foreach my $description (sort + { lc($a) cmp lc($b) } (keys(%by_descrip))) { foreach my $course (@{$by_descrip{$description}}) { my $cleandesc=&HTML::Entities::encode($description,'<>&"'); $cleandesc=~s/'/\\'/g; @@ -329,10 +329,13 @@ ENDSCRIPT $r->print(''."\n". ''."\n". ''."\n". - ''."\n". - ''); + ''."\n"); + if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) { + $r->print(''."\n"); + } + $r->print("\n"); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; }