--- loncom/interface/coursecatalog.pm 2010/10/07 14:45:04 1.53.4.7 +++ loncom/interface/coursecatalog.pm 2010/05/30 14:17:04 1.61 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.53.4.7 2010/10/07 14:45:04 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.61 2010/05/30 14:17:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -181,9 +181,7 @@ sub course_details { &courselink_javascript().''."\n"; my $start_page = &Apache::loncommon::start_page('Course/Community Catalog',$js, - { - 'add_entries' => \%add_entries, - 'no_inline_link' => 1,}); + {'add_entries' => \%add_entries, }); $r->print($start_page); if ($env{'form.numtitles'} > 0) { &Apache::lonhtmlcommon::add_breadcrumb @@ -306,10 +304,8 @@ sub instcode_course_selector { sub cat_header { my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_; my $start_page = - &Apache::loncommon::start_page('Course/Community Catalog',$js, - { - 'add_entries' => $add_entries, - 'no_inline_link' => 1,}); + &Apache::loncommon::start_page('Other',$js, + { 'add_entries' => $add_entries, }); $r->print($start_page); my $brtext = 'Course listing'; if ($env{'form.currcat_0'} eq 'communities::0') { @@ -332,7 +328,7 @@ sub cat_header { } $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); my $onchange; - unless (($env{'browser.interface'} eq 'textual') || ($env{'form.interface'} eq 'textual')) { + unless ($env{'form.interface'} eq 'textual') { $onchange = 'this.form.submit()'; } $r->print('
'. @@ -387,7 +383,7 @@ sub category_breadcrumbs { } else { $catlinks .= &mt('Official courses (with institutional codes)'); $env{'form.currcat_0'} = 'instcode::0'; - $currcat_str .= ''; + $currcat_str .= ''; } if ($deeper) { for (my $i=1; $i<=$deeper; $i++) { @@ -402,7 +398,7 @@ sub category_breadcrumbs { $catlinks .= ''; for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) { my $name = $cats[$shallower]{$container}[$j]; - my $item = &escape($name).':'.&escape($container).':'.$shallower; + my $item = &escape($name).':'.$container.':'.$shallower; my $selected = ''; if ($item eq $env{'form.currcat_'.$shallower}) { $selected = ' selected="selected"'; @@ -657,7 +653,7 @@ sub print_course_listing { if (keys(%courses) == 0) { if ($env{'form.currcat_0'} eq 'communities::0') { $output .= &mt('The courseID provided does not match a community in this domain.'); - } else { + } else { $output .= &mt('The courseID provided does not match a course in this domain.'); } return $output; @@ -1006,9 +1002,9 @@ sub courseinfo_row { if ($details) { if ($env{'form.currcat_0'} eq 'communities::0') { $output .= ''.$accessdates.''; - } else { + } else { $output .= - ''.$accessdates.''. + ''.$accessdates.''. ''.$counts.''. ''.$autoenrollment.''; }