--- loncom/interface/coursecatalog.pm 2010/10/07 14:45:04 1.53.4.7
+++ loncom/interface/coursecatalog.pm 2012/02/14 00:29:50 1.58.4.8.2.1
@@ -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.58.4.8.2.1 2012/02/14 00:29:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -87,8 +87,9 @@ 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);
+ &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
} else {
my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
my $catjs = <<"ENDSCRIPT";
@@ -114,12 +115,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);
+ $catlinks,$catjs,\@codetitles);
if ($env{'form.state'} eq 'listing') {
- $r->print(&print_course_listing($codedom,$numtitles));
+ $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
+ \@codetitles));
}
} else {
my (%add_entries);
@@ -164,7 +165,7 @@ ENDJS
$display_button.'" />
');
}
if ($env{'form.state'} eq 'listing') {
- $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats));
+ $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles));
}
}
}
@@ -173,7 +174,7 @@ ENDJS
}
sub course_details {
- my ($r,$codedom,$formname,$domdesc,$trails,$allitems) = @_;
+ my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_;
my $output;
my %add_entries = (topmargin => "0",
marginheight => "0",);
@@ -190,7 +191,7 @@ sub course_details {
({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';
@@ -200,7 +201,6 @@ 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 +208,7 @@ sub course_details {
$r->print(&mt('Detailed course information:'));
}
$r->print('
'.
- &print_course_listing($codedom,undef,$trails,$allitems).
+ &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
'
');
$r->print('
The server encountered an internal error or misconfiguration and was unable to complete your request.
Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.
More information about this error may be available in the server error log.