--- loncom/interface/lonpickcourse.pm 2005/11/15 20:46:40 1.35 +++ loncom/interface/lonpickcourse.pm 2006/03/15 22:11:04 1.40 @@ -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.40 2006/03/15 22:11:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,13 +42,9 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -ENDDOCUMENT + $r->print(&Apache::lonxml::xmlbegin(). + &Apache::loncommon::head()); + # Get parameters from query string &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', @@ -82,7 +78,7 @@ ENDDOCUMENT unless ($coursefilter) { $coursefilter=''; } my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"'); $courseidtag = &mt('LON-CAPA course ID'); - $courseidtag .= qq| + $courseidtag .= qq|:
|; } @@ -131,7 +127,7 @@ ENDDOCUMENT '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 +145,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 +297,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 +326,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; }