');
return;
@@ -250,9 +231,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 +244,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,11 +261,12 @@ 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".
''."\n".
+ ''."\n".
''.
'"Course/Community Catalog"},
- {text=>$brtext});
+ {text=>"Course listing"});
} else {
&Apache::lonhtmlcommon::add_breadcrumb
- ({text=>$brtext});
+ ({text=>"Course listing"});
}
} else {
&Apache::lonhtmlcommon::add_breadcrumb
@@ -333,16 +310,14 @@ sub cat_header {
unless ($env{'form.interface'} eq 'textual') {
$onchange = 'this.form.submit()';
}
- unless ($codedom eq 'relate') {
- $r->print('');
+ $r->print(''.
+ '
'.
'
'.$catlinks.'
');
return;
@@ -402,7 +377,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"';
@@ -582,8 +557,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'};
@@ -640,7 +615,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();
@@ -655,16 +630,12 @@ sub print_course_listing {
$env{'form.coursenum'},
undef,undef,'.',1);
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 {
- $output .= &mt('The courseID provided does not match a course in this domain.');
- }
+ $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);
}
@@ -728,14 +699,10 @@ sub construct_data_table {
}
if ($knownuser) {
if ($details) {
- if ($env{'form.currcat_0'} eq 'communities::0') {
- $output .= '