--- loncom/interface/coursecatalog.pm 2016/10/23 21:21:56 1.88.2.1 +++ loncom/interface/coursecatalog.pm 2017/08/07 20:22:12 1.93 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.88.2.1 2016/10/23 21:21:56 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.93 2017/08/07 20:22:12 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,7 +57,8 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['sortby','showdom']); - my $codedom = &Apache::lonnet::default_login_domain(); + my $serverdefdom = &Apache::lonnet::default_login_domain(); + my $codedom = $serverdefdom; if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { $codedom = $env{'user.domain'}; @@ -74,9 +75,20 @@ sub handler { $env{'form.showdom'} = ''; } } - my $domdesc = &Apache::lonnet::domain($codedom,'description'); + my $domdesc = &Apache::lonnet::domain($serverdefdom,'description'); &Apache::lonhtmlcommon::clear_breadcrumbs(); - + if (&Apache::lonnet::notcallable('catalog',$codedom)) { + my $serverdomdesc = &Apache::lonnet::domain($serverdefdom,'description'); + $r->print(&Apache::loncommon::start_page('Course/Community Catalog')); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursecatalog", + text=>"Course/Community Catalog"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); + $r->print('
'.&mt('Access to catalog LON-CAPA courses/communities unavailable for: "[_1]" on servers run by: "[_2]".', + $domdesc,$serverdomdesc).'
'); + $r->print(&Apache::loncommon::end_page()); + return OK; + } my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom); my $knownuser = &user_is_known(); @@ -125,7 +137,7 @@ sub handler { } my $js = ''."\n"; $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js)); @@ -176,8 +188,12 @@ sub handler { $courseinfo{$codedom.'_'.$cnum}{$item}); if ($item eq 'title') { if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) { + my $usehttp = 0; + if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) { + $usehttp = 1; + } $r->print(' '. - ''. + ''. &mt('Syllabus').''); } } @@ -250,7 +266,7 @@ function setCourseId(caller) { } ENDSCRIPT - $catjs .= &courselink_javascript(); + $catjs .= &courselink_javascript($r); if (&user_is_dc($codedom) || $canviewall) { $catjs .= < "0", marginheight => "0",); my $js = ''."\n"; + &courselink_javascript($r).''."\n"; my $start_page = &Apache::loncommon::start_page('Course/Community Catalog',$js, {'add_entries' => \%add_entries, }); @@ -358,9 +376,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 +395,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). '
'. '
'. &Apache::lonhtmlcommon::actionbox([ - ''. - (($env{'form.currcat_0'} eq 'communities::0') ? - &mt('Back to community listing') : &mt('Back to course listing')). - '' - ]). + ''.$textfour.'']). &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter', 'showdetails','courseid']). '
'); @@ -409,9 +428,11 @@ END } sub courselink_javascript { + my ($r) = @_; + my $hostname = $r->hostname(); return <<"END"; -function ToSyllabus(cdom,cnum) { +function ToSyllabus(cdom,cnum,usehttp) { if (cdom == '' || cdom == null) { return; } @@ -419,6 +440,13 @@ function ToSyllabus(cdom,cnum) { return; } document.linklaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus"; + if (usehttp == 1) { + var hostname = '$hostname'; + if (hostname != '') { + document.linklaunch.action = 'http://'+hostname+document.linklaunch.action; + } + document.linklaunch.action += '?usehttp=1'; + } document.linklaunch.submit(); } @@ -505,6 +533,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 +588,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 +695,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 +759,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)'); } @@ -757,6 +794,9 @@ sub additional_filters { if ($env{'form.currcat_0'} eq 'communities::0') { $details_text = &mt('Show full details for each community (domain staff only)'); $hidden_text = &mt('Include communities set to be hidden from catalog (domain staff only)'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $details_text = &mt('Show full details for each placement test (domain staff only)'); + $hidden_text = &mt('Include placement tests set to be hidden from catalog (domain staff only)'); } else { $details_text = &mt('Show full details for each course (domain staff only)'); $hidden_text = &mt('Include courses set to be hidden from catalog (domain staff only)'); @@ -970,6 +1010,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 = '.'; } @@ -1001,7 +1043,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 .= '

'; @@ -1017,6 +1061,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.'); } @@ -1077,6 +1123,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').''. @@ -1124,7 +1174,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'}; @@ -1190,6 +1240,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) { @@ -1248,7 +1300,7 @@ sub build_courseinfo_hash { $cleandesc=~s/'/\\'/g; $cleandesc =~ s/^\s+//; my ($cdom,$cnum)=split(/\_/,$course); - my ($instcode,$singleowner,$ttype,$selfenroll_types, + my ($instcode,$singleowner,$ttype,$selfenroll_types,$extsyllplain, $selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories); if (ref($courses->{$course}) eq 'HASH') { $descr = $courses->{$course}{'description'}; @@ -1259,6 +1311,7 @@ sub build_courseinfo_hash { $selfenroll_start = $courses->{$course}{'selfenroll_start_date'}; $selfenroll_end = $courses->{$course}{'selfenroll_end_date'}; $categories = $courses->{$course}{'categories'}; + $extsyllplain = $courses->{$course}{'extsyllplain'}; push(@owners,$singleowner); if ($courses->{$course}{'co-owners'} ne '') { foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) { @@ -1302,6 +1355,7 @@ sub build_courseinfo_hash { $courseinfo{$course}{'selfenroll_start'} = $selfenroll_start; $courseinfo{$course}{'selfenroll_end'} = $selfenroll_end; $courseinfo{$course}{'categories'} = $categories; + $courseinfo{$course}{'extsyllplain'} = $extsyllplain; my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); my @classids; @@ -1486,7 +1540,8 @@ sub count_students { sub courseinfo_row { my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_; my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, - $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories); + $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories, + $extsyllplain); if (ref($info) eq 'HASH') { $cdom = $info->{'cdom'}; $cnum = $info->{'cnum'}; @@ -1500,6 +1555,7 @@ sub courseinfo_row { $counts = $info->{'counts'}; $autoenrollment = $info->{'autoenrollment'}; $showsyllabus = $info->{'showsyllabus'}; + $extsyllplain = $info->{'extsyllplain'}; $categories = $info->{'categories'}; } else { $output = ''.&mt('No information available for [_1].', @@ -1527,7 +1583,11 @@ sub courseinfo_row { ''.$xlist_items.''. ''.$title.' '; if ($showsyllabus) { - $output .= ''.&mt('Syllabus').''; + my $usehttp = 0; + if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) { + $usehttp = 1; + } + $output .= ''.&mt('Syllabus').''; } else { $output .= ' '; } @@ -1538,7 +1598,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 {