--- loncom/interface/coursecatalog.pm 2010/09/30 12:01:14 1.58.4.4 +++ 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.58.4.4 2010/09/30 12:01:14 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.61 2010/05/30 14:17:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -87,9 +87,8 @@ sub handler { } &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, \%idx,\@jsarray,$subcats); - my ($numtitles,@codetitles); if ($env{'form.coursenum'} ne '' && &user_is_known()) { - &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); + &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems); } else { my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); my $catjs = <<"ENDSCRIPT"; @@ -115,12 +114,12 @@ function setCourseId(caller) { ENDSCRIPT $catjs .= &courselink_javascript(); + my $numtitles; if ($env{'form.currcat_0'} eq 'instcode::0') { $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc, - $catlinks,$catjs,\@codetitles); + $catlinks,$catjs); if ($env{'form.state'} eq 'listing') { - $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef, - \@codetitles)); + $r->print(&print_course_listing($codedom,$numtitles)); } } else { my (%add_entries); @@ -165,7 +164,7 @@ ENDJS $display_button.'" />

'); } if ($env{'form.state'} eq 'listing') { - $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles)); + $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats)); } } } @@ -174,7 +173,7 @@ ENDJS } sub course_details { - my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_; + my ($r,$codedom,$formname,$domdesc,$trails,$allitems) = @_; my $output; my %add_entries = (topmargin => "0", marginheight => "0",); @@ -182,16 +181,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 +198,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:')); @@ -208,7 +206,7 @@ sub course_details { $r->print(&mt('Detailed course information:')); } $r->print('

'. - &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles). + &print_course_listing($codedom,undef,$trails,$allitems). '

'); $r->print('
'. ''); @@ -250,9 +248,10 @@ END } sub instcode_course_selector { - my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles) = @_; + my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_; my %coursecodes = (); my %codes = (); + my @codetitles = (); my %cat_titles = (); my %cat_order = (); my %cat_items; @@ -262,7 +261,7 @@ sub instcode_course_selector { marginheight => "0",); my ($jscript,$totcodes,$numtitles,$lasttitle) = &Apache::courseclassifier::instcode_selectors_data($codedom,$formname, - \%cat_items,$codetitles,\%cat_titles,\%cat_order); + \%cat_items,\@codetitles,\%cat_titles,\%cat_order); my $js = ''; if ($totcodes) { @@ -279,7 +278,7 @@ sub instcode_course_selector { if ($numtitles > 0) { $r->print(''.&mt('Choose which course(s) to list.').'
'. &Apache::courseclassifier::build_instcode_selectors($numtitles, - $lasttitle,\%cat_items,$codetitles,\%cat_titles,\%cat_order)); + $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)); } $r->print(''."\n". ''."\n". @@ -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') { @@ -581,8 +578,8 @@ sub user_is_dc { } sub search_official_courselist { - my ($domain,$numtitles,$codetitles) = @_; - my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles,$codetitles); + my ($domain,$numtitles) = @_; + my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles); my $showhidden; if (&user_is_dc($domain)) { $showhidden = $env{'form.showhidden'}; @@ -639,7 +636,7 @@ sub search_courselist { } sub print_course_listing { - my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_; + my ($domain,$numtitles,$trails,$allitems,$subcats) = @_; my $output; my %courses; my $knownuser = &user_is_known(); @@ -656,14 +653,14 @@ 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; } } else { if ($env{'form.currcat_0'} eq 'instcode::0') { - %courses = &search_official_courselist($domain,$numtitles,$codetitles); + %courses = &search_official_courselist($domain,$numtitles); } else { %courses = &search_courselist($domain,$subcats); } @@ -1005,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.''; }