--- loncom/interface/lonsyllabus.pm 2013/05/10 17:49:11 1.122 +++ loncom/interface/lonsyllabus.pm 2013/05/15 18:45:29 1.126 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.122 2013/05/10 17:49:11 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.126 2013/05/15 18:45:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,6 +71,7 @@ sub handler { } # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); + my $crstype = &Apache::loncommon::course_type(); # ------------------------------------------------------------ Print the screen @@ -117,24 +118,26 @@ sub handler { } unless ($allowed && $forceedit) { my $file=&Apache::lonnet::filelocation("",$item); - if ($file =~ /\.(sty|css|js|txt|tex|html?)$/) { - my $filetype; - if ($file =~ /\.(sty|css|js|txt|tex)$/) { - $filetype=$1; - } else { - $filetype='html'; - } - my $result = ''; + if ($file =~ /\.(tex|x?html?)$/) { + my $filetype = $1; my $filecontents=&Apache::lonnet::getfile($file); if ($filecontents eq -1) { $r->print(&mt('Syllabus file unavailable')); - } elsif ($filetype eq 'html') { + } elsif ($filetype eq 'tex') { + my $result = &Apache::lontexconvert::converted(\$filecontents, + $env{'form.texengine'}); + my %args; + &get_breadcrumbs($cdom,$cnum,$crstype,\%args); + $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args). + $result. + &Apache::loncommon::end_page()); + } else { my %mystyle; &Apache::structuretags::reset_problem_globals(); my $oldfile = $env{'request.filename'}; $env{'request.filename'} = $item; - $result = &Apache::lonxml::xmlparse($r,'web',$filecontents, - '',%mystyle); + my $result = &Apache::lonxml::xmlparse($r,'web',$filecontents, + '',%mystyle); &Apache::structuretags::reset_problem_globals(); &Apache::lonhomework::finished_parsing(); $env{'request.filename'} = $oldfile; @@ -153,7 +156,6 @@ sub handler { } } - my $crstype = &Apache::loncommon::course_type(); # ------------------------------ The buck stops here: internal syllabus display # --------------------------------------------------------- The syllabus fields @@ -664,7 +666,26 @@ ENDSCRIPT {href=>$r->uri, text=>"Course syllabus"}); $args->{'bread_crumbs'} = $brcrum; - } elsif ($env{'form.folderpath'} =~ /^supplemental/) { + } else { + &get_breadcrumbs($cdom,$cnum,$crstype,$args); + } + if ($allowed) { + my %loaditem = ( + onload => 'setTemplateBoxes();', + ); + $args->{'add_entries'} = \%loaditem; + } + my $start_page = + &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args); + if ($start_page) { + $r->print($start_page); + } +} + +sub get_breadcrumbs{ + my ($cdom,$cnum,$crstype,$args) = @_; + return unless (ref($args) eq 'HASH'); + if ($env{'form.folderpath'} =~ /^supplemental/) { my $title = $env{'form.title'}; if ($title eq '') { $title = &mt('Syllabus'); @@ -685,17 +706,7 @@ ENDSCRIPT ]; } } - if ($allowed) { - my %loaditem = ( - onload => 'setTemplateBoxes();', - ); - $args->{'add_entries'} = \%loaditem; - } - my $start_page = - &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args); - if ($start_page) { - $r->print($start_page); - } + return; } sub chooser { @@ -817,8 +828,16 @@ sub syllabus_file_info { my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$item; my ($filename) = ($item =~ m{([^/]+)$}); my $file=&Apache::lonnet::filelocation("",$item); - my $depbutton; - if ($file =~ /\.html?$/) { + my ($depbutton,$filetype,$editable); + if ($file =~ /\.(xhtml|xml|tex|html|htm)$/) { + $filetype=$1; + } + if ($filetype) { + unless ($filetype eq 'tex') { + $filetype='html'; + } + } + if ($filetype eq 'html') { my $filecontents=&Apache::lonnet::getfile($file); unless ($filecontents eq -1) { my $mm = new File::MMagic; @@ -833,12 +852,13 @@ sub syllabus_file_info { \%codebase, {'context' => 'rewrites', 'ignore_remote_references' => 1,}); - $depbutton = (' ' x 3). - &editfile_button($item,$context). - &editbutton_js(); + $editable = 1; } } } + $depbutton = (' ' x 3). + &editfile_button($item,$context,$editable). + &editbutton_js(); return ($absurl,$filename,$depbutton); } @@ -1059,28 +1079,9 @@ sub save_changes { $syllabus->{'uploaded.lastmodified'} = $now; my $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum); if ($putres eq 'ok') { - my %storehash; - if ($courseenv->{'uploadedsyllabus'}) { - &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus'); - $storehash{'uploadedsyllabus'} = ''; - } - if ($courseenv->{'externalsyllabus'}) { - &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus'); - $storehash{'externalsyllabus'} = ''; - } - if ($courseenv->{'minimalsyllabus'}) { - &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus'); - $storehash{'minimalsyllabus'} = ''; - } - $storehash{'updatedsyllabus'} = $now; - &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); - &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now}); - if (($courseenv->{'externalsyllabus'} || $courseenv->{'uploadedsyllabus'}) || - ($courseenv->{'minimalsyllabus'})) { - undef($uploaded); - undef($external); - undef($minimal); - } + ($uploaded,$minimal,$external) = + &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded, + $minimal,$external); $output = '