--- loncom/interface/lonsyllabus.pm 2004/05/10 14:12:14 1.31 +++ loncom/interface/lonsyllabus.pm 2004/06/03 14:28:39 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.31 2004/05/10 14:12:14 sakharuk Exp $ +# $Id: lonsyllabus.pm,v 1.33 2004/06/03 14:28:39 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonannounce; use Apache::lonlocal; +use Apache::lonhtmlcommon; sub handler { my $r = shift; @@ -98,7 +99,8 @@ ENDDOCUMENT # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); if ($target ne 'tex') { - $r->print(''.&Apache::loncommon::bodytag + $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). + ''.&Apache::loncommon::bodytag ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'})); $r->print('

'.$courseenv{'description'}.'

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

'); @@ -180,8 +182,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=''; @@ -238,8 +243,9 @@ ENDDOCUMENT $r->print('
'. ''); } + my @htmlids=(); foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { + if (($syllabus{$_}=~/\w/) || ($allowed)) { my $message=$syllabus{$_}; if ($_ eq 'lll_includeurl') { # this is the "included" field my $urls=$message; @@ -278,16 +284,19 @@ ENDDOCUMENT $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } + push @htmlids,$_; } if ($allowed) { - $r->print('
'); + ' '); } } } if ($allowed) { - $r->print('
'); + $r->print(''. + &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids)); } if ($target ne 'tex') {$r->print('

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