--- loncom/interface/lonpickcourse.pm 2008/05/19 21:40:26 1.71 +++ loncom/interface/lonpickcourse.pm 2008/05/31 00:50:00 1.72 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.71 2008/05/19 21:40:26 bisitz Exp $ +# $Id: lonpickcourse.pm,v 1.72 2008/05/31 00:50:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -267,14 +267,14 @@ sub display_matched_courses { .''.&mt('Course Description').'' .''.&mt('Domain').'' .''.&mt('Course Code').'' - .''.&mt('Owner:Domain').'' + .''.&mt('Owner/Co-owner(s)').'' .''.&mt('Type').'' ); $r->print(&Apache::loncommon::end_data_table_header_row()); } foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) { - $r->print(&Apache::loncommon::start_data_table_row()); foreach my $course (@{$by_descrip{$description}}) { + $r->print(&Apache::loncommon::start_data_table_row()); my $cleandesc=&HTML::Entities::encode($description,'<>&"'); $cleandesc=~s/'/\\'/g; my ($cdom,$cnum)=split(/\_/,$course); @@ -294,7 +294,7 @@ sub display_matched_courses { ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course}); push(@owners,&unescape($singleowner)); } - my $owner = join(', ',@owners); + my $ownerstr = join(', ',@owners); $r->print(''.&course_chooser($multiple,$cdom,$cnum,$cleandesc).''); $r->print(''.$description.''); $r->print(''); @@ -308,15 +308,7 @@ sub display_matched_courses { $r->print(' '); } $r->print(''); - $r->print(''); - if (@owners > 1) { -# $r->print(', '.&mt('owners').' - ',join(', ',@owners)); - $r->print(join(', ',@owners)); - } elsif (@owners == 1) { -# $r->print(', '.&mt('owner').' - '.$owner); - $r->print($owner); - } - $r->print(''); + $r->print(''.$ownerstr.''); $r->print(''); if ($ttype ne '') { $r->print(&mt(&unescape($ttype))); @@ -325,11 +317,13 @@ sub display_matched_courses { } $r->print(''); if ($multiple) { $r->print("\n"); } + $r->print(&Apache::loncommon::end_data_table_row()); # $r->print("
\n"); } - $r->print(&Apache::loncommon::end_data_table_row()); } - $r->print(&Apache::loncommon::end_data_table()); + if (%courses) { + $r->print(&Apache::loncommon::end_data_table()); + } if (!%courses) { $r->print(&mt('None found')); @@ -449,8 +443,8 @@ sub build_filters { $list->{'instcodefilter'}.'" />'; } foreach my $posstype ('Course','Non-standard Course') { - $typeselectform.='\n"; + $typeselectform.='\n"; } $typeselectform.=""; my $output = qq|