--- loncom/interface/lonsyllabus.pm 2006/03/21 21:25:33 1.49 +++ loncom/interface/lonsyllabus.pm 2006/08/16 19:40:46 1.54 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.49 2006/03/21 21:25:33 albertel Exp $ +# $Id: lonsyllabus.pm,v 1.54 2006/08/16 19:40:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,7 @@ use Apache::lonannounce; use Apache::lonlocal; use Apache::lonhtmlcommon; use Apache::lonspeller(); +use HTML::Entities(); sub handler { my $r = shift; @@ -71,59 +72,18 @@ sub handler { if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } -# ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($env{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - $r->print(&Apache::lonmenu::registerurl(1)); - } # -------------------------------------------------- Let's see who handles this my $externalsyllabus=$courseenv{'externalsyllabus'}; if ($externalsyllabus=~/\w/) { - $r->print(&Apache::loncommon::endheadtag()); + if ($env{'form.wrapperdisplay'} eq 'menu') { -# -# Producing the menu buttons -# - $r->print(''. - &Apache::lonmenu::menubuttons(1,'web',1). - &Apache::loncommon::end_page()); - } else { - if ($env{'browser.interface'} eq 'textual') { -# -# ssi-based rendering for text-based interface -# - $r->print(''. - &Apache::lonmenu::menubuttons(1). - &Apache::lonnet::ssi_body($externalsyllabus). - &Apache::loncommon::end_page()); - } elsif ($env{'environment.remote'} eq 'off') { -# -# This is inline remote -# - $r->print(< - - - - -ENDDOCUMENTINL - } else { -# -# frame-based rendering for graphical interface -# - $r->print(< - - - - -ENDDOCUMENT - } - } - return OK; + $r->print(&Apache::lonwrapper::simple_menu()); + } else { + $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu", + $externalsyllabus)); + } + return OK; } # ------------------------------ The buck stops here: internal syllabus display @@ -155,7 +115,6 @@ ENDDOCUMENT my $start_page = &Apache::loncommon::start_page("Syllabus", $rss_link, {'function' => $forcestudent, - 'add_entries' => $addentries, 'domain' => $cdom, 'force_register' => $env{'form.register'},}); @@ -170,7 +129,7 @@ ENDDOCUMENT my $day = &Apache::lonannounce::showday(time,2, &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); if ($target ne 'tex') { - $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); } else { $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); } @@ -219,7 +178,9 @@ ENDDOCUMENT # ----------------------------------------------------- Only if not public call if ($env{'user.environment'}) { # does this user have privileges to post, etc? - if ($env{'request.course.id'}) { + if ($env{'request.course.id'} + && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'} + && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) { $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); $privileged=$allowed; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { @@ -361,7 +322,7 @@ ENDDOCUMENT if ($allowed) { $r->print( '
'); } }