--- loncom/interface/lonsyllabus.pm 2016/01/26 14:30:25 1.139 +++ loncom/interface/lonsyllabus.pm 2017/02/18 19:05:51 1.141 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.139 2016/01/26 14:30:25 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.141 2017/02/18 19:05:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -116,7 +116,7 @@ sub handler { } unless ($allowed && $forceedit) { my $file=&Apache::lonnet::filelocation("",$item); - if ($file =~ /\.(tex|x?html?)$/) { + if ($file =~ /\.(tex|x?html?)$/) { my $filetype = $1; my $filecontents=&Apache::lonnet::getfile($file); if ($filecontents eq -1) { @@ -125,8 +125,13 @@ sub handler { if ($target eq 'tex') { $r->print($filecontents); } else { - my $result = &Apache::lontexconvert::converted(\$filecontents, - $env{'form.texengine'}); + my $texengine = $env{'form.texengine'}; + if ($texengine eq '') { + $texengine = 'tth'; + } elsif (lc($texengine) eq 'jsmath') { + $texengine = 'MathJax'; + } + my $result = &Apache::lontexconvert::converted(\$filecontents,$texengine); my %args; &get_breadcrumbs($cdom,$cnum,$crstype,\%args); if ($env{'form.only_body'}) { @@ -163,7 +168,16 @@ sub handler { &mt('Print the syllabus directly from your web browser'). '\end{document}'); } else { - $r->print(&Apache::lonwrapper::wrapper($item,undef,$env{'request.use_absolute'}, + my $brcrum; + if ($env{'form.folderpath'} =~ /^supplemental/) { + my $title = $env{'form.title'}; + if ($title eq '') { + $title = &mt('Syllabus'); + } + $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + } + $r->print(&Apache::lonwrapper::wrapper($item,$brcrum,$env{'request.use_absolute'}, undef,$is_pdf,undef,&mt('Syllabus'))); } } @@ -178,11 +192,19 @@ sub handler { '\end{document}'); } else { my $is_ext = 1; - my $is_pdf; + my ($is_pdf,$brcrum); if ($external =~ /\.pdf$/i) { $is_pdf = 1; } - $r->print(&Apache::lonwrapper::wrapper($external,undef,$env{'request.use_absolute'}, + if ($env{'form.folderpath'} =~ /^supplemental/) { + my $title = $env{'form.title'}; + if ($title eq '') { + $title = &mt('Syllabus'); + } + $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + } + $r->print(&Apache::lonwrapper::wrapper($external,$brcrum,$env{'request.use_absolute'}, $is_ext,$is_pdf,undef,&mt('Syllabus'))); } return OK;