--- loncom/interface/coursecatalog.pm 2010/09/30 12:01:14 1.58.4.4 +++ loncom/interface/coursecatalog.pm 2010/10/07 14:41:49 1.65 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.58.4.4 2010/09/30 12:01:14 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.65 2010/10/07 14:41:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -182,16 +182,14 @@ 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 ({href=>"/adm/coursecatalog", text=>"Course/Community Catalog"}); } - my $brtextone = 'Course listing'; + my $brtextone = 'Course listing'; my $brtexttwo = 'Course details'; if ($env{'form.currcat_0'} eq 'communities::0') { $brtextone = 'Community listing'; @@ -201,6 +199,7 @@ sub course_details { ({href=>"javascript:document.$formname.submit()", text=>$brtextone}, {text=>$brtexttwo}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); $r->print('
'); if ($env{'form.currcat_0'} eq 'communities::0') { $r->print(&mt('Detailed community information:')); @@ -306,9 +305,7 @@ sub cat_header { my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_; my $start_page = &Apache::loncommon::start_page('Other',$js, - { - 'add_entries' => $add_entries, - 'no_inline_link' => 1,}); + { 'add_entries' => $add_entries, }); $r->print($start_page); my $brtext = 'Course listing'; if ($env{'form.currcat_0'} eq 'communities::0') { @@ -330,10 +327,7 @@ sub cat_header { text=>"Course/Community Catalog"}); } $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); - my $onchange; - unless ($env{'form.interface'} eq 'textual') { - $onchange = 'this.form.submit()'; - } + my $onchange = 'this.form.submit()'; $r->print('
'. ''; - } else { + } else { $output .= - ''. + ''. ''. ''; }
'.&mt('Domain:').''. &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange)); @@ -401,7 +395,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"'; @@ -656,7 +650,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; @@ -1005,9 +999,9 @@ sub courseinfo_row { if ($details) { if ($env{'form.currcat_0'} eq 'communities::0') { $output .= ''.$accessdates.''.$accessdates.''.$accessdates.''.$counts.''.$autoenrollment.'