--- loncom/interface/lonsyllabus.pm 2004/06/02 00:42:15 1.32 +++ loncom/interface/lonsyllabus.pm 2004/07/27 23:35:34 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.32 2004/06/02 00:42:15 www Exp $ +# $Id: lonsyllabus.pm,v 1.38 2004/07/27 23:35:34 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::lonfeedback; use Apache::lonannounce; use Apache::lonlocal; use Apache::lonhtmlcommon; +use Apache::lonspeller(); sub handler { my $r = shift; @@ -109,22 +110,28 @@ ENDDOCUMENT $Apache::lonnet::domaindescription{$cdom}.'}\\\\'); } # -------------------------------------------------------------- Announcements? - $r->print(&Apache::lonannounce::showday(time,2, + if ($target ne 'tex') { + $r->print(&Apache::lonannounce::showday(time,2, &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))); + } else { + $r->print(&Apache::lonxml::xmlparse($r,'tex', + &Apache::lonannounce::showday(time,2, + &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)))); + } # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); if ($target ne 'tex') { $r->print('
'.$_.' | '); + $r->print(' |
'.$element.' | ');
} else {
- $r->print(' '.$_.'\\\\ ');
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
- foreach (split(/\,/,$coursepersonnel{$_})) {
+ foreach (split(/\,/,$coursepersonnel{$element})) {
my ($puname,$pudom)=split(/\:/,$_);
if ($target ne 'tex') {
$r->print(' '.&Apache::loncommon::aboutmewrapper(
@@ -182,8 +189,11 @@ ENDDOCUMENT
if (($allowed) && ($ENV{'form.storesyl'})) {
foreach (keys %syllabusfields) {
my $field=$ENV{'form.'.$_};
+ chomp($field);
$field=~s/\s+$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
+ $field=~s/^\s+//s;
+ $field=~s/\ $//s; + $field=&Apache::lonfeedback::clear_out_html($field,1); $syllabus{$_}=$field; if ($_ eq 'lll_includeurl') { # clean up included URLs my $field=''; @@ -240,6 +250,7 @@ ENDDOCUMENT $r->print(''. - &Apache::lonhtmlcommon::htmlareaactive()); + &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids)); } if ($target ne 'tex') {$r->print('');} else {$r->print('\\\\');} } else { - $r->print(' No syllabus information provided. '); + if ($target ne 'tex') {$r->print('');} else {$r->print('\par ');} + $r->print('No syllabus information provided.'); + if ($target ne 'tex') {$r->print(' ');} } if ($target ne 'tex') {$r->print(' |