--- loncom/interface/coursecatalog.pm 2010/09/14 03:10:00 1.58.4.3 +++ loncom/interface/coursecatalog.pm 2010/12/22 04:14:09 1.58.4.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.58.4.3 2010/09/14 03:10:00 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.58.4.6 2010/12/22 04:14:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -89,7 +89,6 @@ sub handler { \%idx,\@jsarray,$subcats); my ($numtitles,@codetitles); if ($env{'form.coursenum'} ne '' && &user_is_known()) { - if ($env{'form.currcat_0'} eq 'instcode::0') { &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); } else { my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); @@ -402,7 +401,7 @@ sub category_breadcrumbs { $catlinks .= ''; for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) { my $name = $cats[$shallower]{$container}[$j]; - my $item = &escape($name).':'.$container.':'.$shallower; + my $item = &escape($name).':'.&escape($container).':'.$shallower; my $selected = ''; if ($item eq $env{'form.currcat_'.$shallower}) { $selected = ' selected="selected"'; @@ -1024,7 +1023,13 @@ sub courseinfo_row { if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) { $output .= ''.&mt('Starts: [_1]',''.$showstart.'').'
'.&mt('Ends: [_1]',''.$showend.'').''; } else { - $output .= ''.&mt('Enroll in course').''; + $output .= ''.&mt('Enroll in course').'
'; + if ($info->{'selfenroll_end'} == 0) { + $output .= &mt('Available permanently'); + } elsif ($info->{'selfenroll_end'} > $now) { + $output .= &mt('Self-enrollment ends: [_1]',''.$showend.''); + } + $output .= ''; } $selfenroll = 1; }