--- loncom/interface/lonsyllabus.pm 2009/03/01 13:23:12 1.81 +++ loncom/interface/lonsyllabus.pm 2009/03/31 08:49:09 1.85 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.81 2009/03/01 13:23:12 neumanie Exp $ +# $Id: lonsyllabus.pm,v 1.85 2009/03/31 08:49:09 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -229,7 +229,24 @@ ENDSCRIPT &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum); } } -#-Pritn Help Text + +#---------------------Print External URL Syllabus Info +if( ($allowed) && ($target ne 'tex') ) { + my $protocol = $Apache::lonnet::protocol{$homeserver}; + $protocol = 'http' if ($protocol ne 'https'); + $r->print('

' + .&mt('This syllabus can be publicly viewed at [_1]' + ,''.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'') + .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink') + .'

' + .'

' + .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Parameters[_2].' + ,'','') + .'

' + ); +} + +#-Print Help Text if ($target ne 'tex') { if($allowed){ $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); @@ -238,13 +255,16 @@ if ($target ne 'tex') { #--------Functions if ($target ne 'tex') { if($allowed || $privileged){ - &Apache::lontemplate::print_start_page_functions($r); + $r->print(&Apache::lontemplate::start_functionslist()); if($allowed){ - &Apache::lontemplate::print_functions_content($r,''.&mt('Show Public View').''.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')); + $r->print(&Apache::lontemplate::item_functionslist( + ''.&mt('Show Public View').'' + .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'))); }elsif($privileged){ - &Apache::lontemplate::print_functions_content($r,''.&mt('Edit').''); + $r->print(&Apache::lontemplate::item_functionslist( + ''.&mt('Edit').'')); } - &Apache::lontemplate::print_end_page_functions($r); + $r->print(&Apache::lontemplate::end_functionslist()); } } #----------------------------Print Headtitle @@ -318,21 +338,19 @@ if($target ne 'tex'){ :'') .'\\\\'); } -#---------------------Print Extern URL Course Info -if( ($allowed) && ($target ne 'tex') ) { - my $protocol = $Apache::lonnet::protocol{$homeserver}; - $protocol = 'http' if ($protocol ne 'https'); - $r->print('

'.&mt('This syllabus can be publicly viewed at').' '.$protocol.'://'.&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').'').'

'); -} # -------------------------------------------------------------- Announcements? my $day = &Apache::lonannounce::showday(time,2, &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)); if ($target ne 'tex') { - if($allowed){ - &Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit),1,'LC_ContentBoxSpecial'); + if($allowed){ + &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); + &Apache::lontemplate::print_end_template($r); } - elsif(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ - &Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit),1,'LC_ContentBoxSpecial'); + elsif(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ + &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); + &Apache::lontemplate::print_end_template($r); } } else {