--- loncom/interface/lonsyllabus.pm 2006/03/06 23:02:22 1.46 +++ loncom/interface/lonsyllabus.pm 2006/03/21 21:50:49 1.50 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.46 2006/03/06 23:02:22 www Exp $ +# $Id: lonsyllabus.pm,v 1.50 2006/03/21 21:50:49 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,29 +50,25 @@ sub handler { my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # ------------------------------------------------------------ Get query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','headermode']); + ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','wrapperdisplay']); # ----------------------------------------------------- Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); if ($homeserver eq 'no_host') { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(''.&mt('No syllabus available').''); + &Apache::loncommon::simple_error_page($r,'No syllabus available', + 'No syllabus available'); return OK; } # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); # ------------------------------------------------------------ Print the screen - my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss'; - if ($target ne 'tex') { - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -ENDDOCUMENT - } else { + + my $rss_link = + &Apache::lonrss::rss_link('http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss'); + + if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } # ----------------------------------------------------- Force menu registration @@ -80,12 +76,20 @@ ENDDOCUMENT 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{'course.'.$cdom.'_'.$cnum.'_externalsyllabus'}; + my $externalsyllabus=$courseenv{'externalsyllabus'}; + if ($externalsyllabus=~/\w/) { - } + + if ($env{'form.wrapperdisplay'} eq 'menu') { + $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 # --------------------------------------------------------- The syllabus fields @@ -113,25 +117,29 @@ ENDDOCUMENT # ----------------------------------------------------------------- Make header if ($target ne 'tex') { - $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). - ''.&Apache::loncommon::bodytag - ("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'})); - $r->print('

'.$courseenv{'description'}.'

'. + my $start_page = + &Apache::loncommon::start_page("Syllabus", $rss_link, + {'function' => $forcestudent, + 'add_entries' => $addentries, + 'domain' => $cdom, + 'force_register' => + $env{'form.register'},}); + + $r->print($start_page.'

'.$courseenv{'description'}.'

'. $Apache::lonnet::domaindescription{$cdom}.'

'); } else { $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. $Apache::lonnet::domaindescription{$cdom}.'}\\\\'); } # -------------------------------------------------------------- Announcements? + my $day = &Apache::lonannounce::showday(time,2, + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); if ($target ne 'tex') { - $r->print(&Apache::lonannounce::showday(time,2, - &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)). - &Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom)); } else { - $r->print(&Apache::lonxml::xmlparse($r,'tex', - &Apache::lonannounce::showday(time,2, - &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)))); + $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); } + # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); if ($target ne 'tex') { @@ -190,6 +198,7 @@ ENDDOCUMENT .' http://'. $Apache::lonnet::hostname{$homeserver}.$r->uri.''. &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'

'. + '

'.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'

'. '

'. &mt('Show Public View').''. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). @@ -332,7 +341,11 @@ ENDDOCUMENT $r->print('No syllabus information provided.'); if ($target ne 'tex') {$r->print('

');} } - if ($target ne 'tex') {$r->print('');} else {$r->print('\end{document}');} + if ($target ne 'tex') { + $r->print(&Apache::loncommon::end_page()); + } else { + $r->print('\end{document}'); + } return OK; }