--- loncom/interface/coursecatalog.pm 2015/06/09 21:22:55 1.88
+++ loncom/interface/coursecatalog.pm 2016/04/04 01:09:47 1.89
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for displaying the course catalog interface
#
-# $Id: coursecatalog.pm,v 1.88 2015/06/09 21:22:55 damieng Exp $
+# $Id: coursecatalog.pm,v 1.89 2016/04/04 01:09:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -319,6 +319,8 @@ ENDJS
my $display_button;
if ($env{'form.currcat_0'} eq 'communities::0') {
$display_button = &mt('Display communities');
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $display_button = &mt('Display placement tests');
} else {
$display_button = &mt('Display courses');
}
@@ -358,9 +360,18 @@ sub course_details {
}
my $brtextone = 'Course listing';
my $brtexttwo = 'Course details';
+ my $textthree = &mt('Detailed course information:');
+ my $textfour = &mt('Back to course listing');
if ($env{'form.currcat_0'} eq 'communities::0') {
$brtextone = 'Community listing';
$brtexttwo = 'Community details';
+ $textthree = &mt('Detailed community information:');
+ $textfour = &mt('Back to community listing');
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $brtextone = 'Placement test listing';
+ $brtexttwo = 'Placement test details';
+ $textthree = &mt('Detailed placement test information:');
+ $textfour = &mt('Back to placement test listing');
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:document.$formname.submit()",
@@ -368,20 +379,12 @@ sub course_details {
{text=>$brtexttwo});
$r->print(
&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog').
- '
'.
- (($env{'form.currcat_0'} eq 'communities::0') ?
- &mt('Detailed community information:') :
- &mt('Detailed course information:')).
- '
'.
+ ''.$textthree.'
'.
&print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
'
'.
'');
@@ -505,6 +508,8 @@ sub cat_header {
my $brtext = 'Course listing';
if ($env{'form.currcat_0'} eq 'communities::0') {
$brtext = 'Community listing';
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $brtext = 'Placement test listing';
}
if ($env{'form.state'} eq 'listing') {
if ($numtitles > 0) {
@@ -558,6 +563,9 @@ sub category_breadcrumbs {
} elsif ($cats[0][0] eq 'communities') {
$catlinks .= &mt('Communities');
$env{'form.currcat_0'} = 'communities::0';
+ } elsif ($cats[0][0] eq 'placement') {
+ $catlinks .= &mt('Placement Tests');
+ $env{'form.currcat_0'} = 'placement::0';
} else {
my $name = $cats[0][0];
my $item = &escape($name).'::0';
@@ -662,6 +670,8 @@ sub main_category_selector {
$maincatlinks .= &mt('Official courses (with institutional codes)');
} elsif ($name eq 'communities') {
$maincatlinks .= &mt('Communities');
+ } elsif ($name eq 'placement') {
+ $maincatlinks .= &mt('Placement Tests');
} else {
$maincatlinks .= $name;
}
@@ -724,6 +734,8 @@ sub additional_filters {
my $selfenroll_text;
if ($env{'form.currcat_0'} eq 'communities::0') {
$selfenroll_text = &mt('Only show communities which currently allow self-enrollment (or will allow it in the future)');
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $selfenroll_text = &mt('Only show placement tests which currently allow self-enrollment (or will allow it in the future)');
} else {
$selfenroll_text = &mt('Only show courses which currently allow self-enrollment (or will allow it in the future)');
}
@@ -758,6 +770,9 @@ sub additional_filters {
if ($env{'form.currcat_0'} eq 'communities::0') {
$details_text = &mt('Show full details for each community ([_1] only)',$dc_title);
$hidden_text = &mt('Include communities set to be hidden from catalog ([_1] only)',$dc_title);
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $details_text = &mt('Show full details for each placement test ([_1] only)',$dc_title);
+ $hidden_text = &mt('Include placement tests set to be hidden from catalog ([_1] only)',$dc_title);
} else {
$details_text = &mt('Show full details for each course ([_1] only)',$dc_title);
$hidden_text = &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title);
@@ -966,6 +981,8 @@ sub search_courselist {
}
if ($env{'form.currcat_0'} eq 'communities::0') {
$typefilter = 'Community';
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $typefilter = 'Placement';
} else {
$typefilter = '.';
}
@@ -997,7 +1014,9 @@ sub print_course_listing {
$output = '';
if ($env{'form.currcat_0'} eq 'communities::0') {
$output .= &mt('The courseID provided does not match a community in this domain.');
- } else {
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $output .= &mt('The courseID provided does not match a placement test in this domain.');
+ } else {
$output .= &mt('The courseID provided does not match a course in this domain.');
}
$output .= '
';
@@ -1013,6 +1032,8 @@ sub print_course_listing {
$output = '';
if ($env{'form.currcat_0'} eq 'communities::0') {
$output .= &mt('No communities match the criteria you selected.');
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $output .= &mt('No placement tests match the criteria you selected.');
} else {
$output .= &mt('No courses match the criteria you selected.');
}
@@ -1073,6 +1094,10 @@ sub construct_data_table {
if ($env{'form.currcat_0'} eq 'communities::0') {
$output .= '
'.&mt('Default Access Dates for Members').' | '.
''.&mt('Member Counts').' | ';
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $output .=
+ ''.&mt('Default Access Dates for Students').' | '.
+ ''.&mt('Student Counts').' | ';
} else {
$output .=
''.&mt('Default Access Dates for Students').' | '.
@@ -1120,7 +1145,7 @@ sub construct_data_table {
my (%numbers,%creditsum);
my ($showcredits,$defofficial,$defunofficial,$deftextbook);
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
- unless ($env{'form.currcat_0'} eq 'communities::0') {
+ unless (($env{'form.currcat_0'} eq 'communities::0') || ($env{'form.currcat_0'} eq 'placement::0')) {
if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
$showcredits = 1;
$defofficial = $domdefaults{'officialcredits'};
@@ -1186,6 +1211,8 @@ sub construct_data_table {
$lt{'Active'} = &mt('Total current members');
$lt{'Future'} = &mt('Total future members');
$lt{'Previous'} = &mt('Total previous members');
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $lt{'courses'} = &mt('Total placement tests');
}
my $colspan = 8;
if ($showcredits) {
@@ -1534,7 +1561,7 @@ sub courseinfo_row {
$output .=
''.$accessdates.' | '.
''.$counts.' | ';
- unless ($env{'form.currcat_0'} eq 'communities::0') {
+ unless (($env{'form.currcat_0'} eq 'communities::0') || ($env{'form.currcat_0'} eq 'placement::0')) {
$output .= ''.$autoenrollment.' | ';
}
} else {