--- loncom/interface/lonsyllabus.pm 2004/06/02 00:42:15 1.32 +++ loncom/interface/lonsyllabus.pm 2004/06/11 15:41:36 1.35 @@ -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.35 2004/06/11 15:41:36 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -109,8 +109,14 @@ 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') { @@ -182,8 +188,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 +249,7 @@ ENDDOCUMENT $r->print('
'. ''); } + my @htmlids=(); foreach (sort keys %syllabusfields) { if (($syllabus{$_}=~/\w/) || ($allowed)) { my $message=$syllabus{$_}; @@ -258,7 +268,11 @@ ENDDOCUMENT # embed as an image $output=''; } - $message.='

'.$output.'

'; + if ($target ne 'tex') { + $message.='

'.$output.'

'; + } else { + $message.=' '.&Apache::lonxml::xmlparse($r,'tex','

'.$output.'

').' '; + } } if ($allowed) { $r->print('

'.$syllabusfields{$_}. @@ -280,17 +294,19 @@ ENDDOCUMENT $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } + push @htmlids,$_; } if ($allowed) { - $r->print('
'); + ' '); } } } if ($allowed) { $r->print(''. - &Apache::lonhtmlcommon::htmlareaactive()); + &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids)); } if ($target ne 'tex') {$r->print('

');} else {$r->print('\\\\');} } else {