--- loncom/interface/lonpickcourse.pm 2006/01/10 21:36:45 1.37 +++ loncom/interface/lonpickcourse.pm 2006/03/16 21:54:40 1.41 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.37 2006/01/10 21:36:45 albertel Exp $ +# $Id: lonpickcourse.pm,v 1.41 2006/03/16 21:54:40 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', @@ -125,13 +119,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;"; @@ -287,12 +283,12 @@ ENDSCRIPT my $numcourses = keys(%courses); foreach my $course (keys(%courses)) { my $descr; - if ($courses{$course} =~ m/^([^:]*):/) { + if ($courses{$course} =~ m/^([^:]*):/i) { $descr = &Apache::lonnet::unescape($1); } else { $descr = &Apache::lonnet::unescape($courses{$course}); } - my $description = lc($descr); + my $description = $descr; push (@{$by_descrip{$description}}, $course); } if ($numcourses > 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; @@ -335,7 +332,7 @@ ENDSCRIPT } $r->print("\n"); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; }