--- loncom/interface/lonpickcourse.pm 2008/05/31 00:50:00 1.72 +++ loncom/interface/lonpickcourse.pm 2008/09/21 16:41:47 1.73.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.72 2008/05/31 00:50:00 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.73.2.4 2008/09/21 16:41:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -228,14 +228,23 @@ sub display_matched_courses { $menuchk = ' checked="checked" '; } $r->print( + ''. + ''. + ''. + ''. + ''. + '
'.&mt('Action').''. ''.(' 'x3).'
'. + ''.(' 'x3).''. + '
'. '

'); + ''. + '
'. + '
'); } } my %by_descrip; @@ -268,7 +277,7 @@ sub display_matched_courses { .''.&mt('Domain').'' .''.&mt('Course Code').'' .''.&mt('Owner/Co-owner(s)').'' - .''.&mt('Type').'' +# .''.&mt('Type').'' ); $r->print(&Apache::loncommon::end_data_table_header_row()); } @@ -309,13 +318,13 @@ sub display_matched_courses { } $r->print(''); $r->print(''.$ownerstr.''); - $r->print(''); - if ($ttype ne '') { - $r->print(&mt(&unescape($ttype))); - } else { - $r->print(' '); - } - $r->print(''); +# $r->print(''); +# if ($ttype ne '') { +# $r->print(&mt(&unescape($ttype))); +# } else { +# $r->print(' '); +# } +# $r->print(''); if ($multiple) { $r->print("\n"); } $r->print(&Apache::loncommon::end_data_table_row()); # $r->print("
\n"); @@ -427,12 +436,12 @@ sub build_filters { '15552000','31104000'])); my %lt = ( - 'cac' => &mt('[_1] Activity',$type), - 'cde' => &mt('[_1] Description',$type), - 'cdo' => &mt('[_1] Domain',$type), + 'cac' => &mt("$type Activity"), + 'cde' => &mt("$type Description"), + 'cdo' => &mt("$type Domain"), 'cin' => &mt('Course Institutional Code'), - 'cow' => &mt("[_1] Owner's Username",$type), - 'cod' => &mt("[_1] Owner's Domain", $type), + 'cow' => &mt("$type Owner's Username"), + 'cod' => &mt("$type Owner's Domain"), 'cog' => &mt('Course Type') ); @@ -444,7 +453,7 @@ sub build_filters { } foreach my $posstype ('Course','Non-standard Course') { $typeselectform.='\n"; + ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."\n"; } $typeselectform.=""; my $output = qq| @@ -478,9 +487,9 @@ $multelement if ($domainselectform) { $output .= $lt{'cdo'}.': '.$domainselectform.'
'."\n"; } - if ($typeselectform) { - $output .= $lt{'cog'}.': '.$typeselectform.'
'."\n"; - } +# if ($typeselectform) { +# $output .= $lt{'cog'}.': '.$typeselectform.'
'."\n"; +# } if ($instcodeform) { $output .= $lt{'cin'}.': '.$instcodeform.'
'."\n"; }