--- loncom/interface/lonsyllabus.pm 2009/02/19 17:32:39 1.77 +++ loncom/interface/lonsyllabus.pm 2009/03/07 15:07:09 1.82 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.77 2009/02/19 17:32:39 neumanie Exp $ +# $Id: lonsyllabus.pm,v 1.82 2009/03/07 15:07:09 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -161,64 +161,8 @@ ENDSCRIPT ({href=>$r->uri, text=>"Course syllabus"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs()); - } - $r->print('
'.&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'
'.&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').'').'
'); - } + } if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; @@ -294,20 +229,88 @@ ENDSCRIPT &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum); } } -# ---------------------------------------------------------------- Get syllabus - if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - my $lastmod=$syllabus{'uploaded.lastmodified'}; +#-Pritn 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'))); + } +} +#--------Functions +if ($target ne 'tex') { + if($allowed || $privileged){ + &Apache::lontemplate::print_start_page_functions($r); + if($allowed){ + &Apache::lontemplate::print_functions_content($r,''.&mt('Show Public View').''.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')); + }elsif($privileged){ + &Apache::lontemplate::print_functions_content($r,''.&mt('Edit').''); + } + &Apache::lontemplate::print_end_page_functions($r); + } + } +#----------------------------Print Headtitle +if($target ne 'tex'){ + $r->print(''.&mt('Last updated').': | '. $lastmod.' | '. ($who ? &mt('by').' '.$who : '' ). - ' |
'); + ''); } else { $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '. ($who? &mt('by').'\\\\ '. @@ -315,18 +318,32 @@ ENDSCRIPT :'') .'\\\\'); } - - if ($target ne 'tex') { - &Apache::lontemplate::print_start_page_functions($r); - if($allowed){ - &Apache::lontemplate::print_functions_content($r,''.&mt('Show Public View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')); - }elsif($privileged){ - &Apache::lontemplate::print_functions_content($r,''.&mt('Edit').''); - } - &Apache::lontemplate::print_end_page_functions($r); - } - +#---------------------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_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_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); + &Apache::lontemplate::print_end_template($r); + } + + } else { + $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); + } +# ---------------------------------------------------------------- Get syllabus + if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { if ($allowed) { $r->print(''. &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids)); } - if ($target ne 'tex') {$r->print('');} else {$r->print('\\\\');} + # if ($target ne 'tex') {$r->print('');} else {$r->print('\\\\');} } else { if ($target ne 'tex') {$r->print('');} else {$r->print('\par ');} $r->print(&mt('No syllabus information provided.')); if ($target ne 'tex') {$r->print('
');} } - if ($target ne 'tex') { + if ($target ne 'tex') { if ($env{'form.backto'} eq 'coursecatalog') { $r->print('