--- loncom/interface/lonsyllabus.pm 2004/05/03 17:36:47 1.28 +++ 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.28 2004/05/03 17:36:47 sakharuk Exp $ +# $Id: lonsyllabus.pm,v 1.38 2004/07/27 23:35:34 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,8 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonannounce; use Apache::lonlocal; +use Apache::lonhtmlcommon; +use Apache::lonspeller(); sub handler { my $r = shift; @@ -45,7 +47,6 @@ sub handler { # ------------------------------------------------------------ Print the screen my $target=$ENV{'form.grade_target'}; - &Apache::lonnet::logthis("NOW TARGET IS DEFINIED AS $target"); if ($target ne 'tex') { $r->print(< @@ -99,31 +100,38 @@ 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}.'

'); } else { - $r->print('\noindent\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. + $r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'. $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(''); } else { - $r->print('\begin{tabular}{|c|c|}\hline'); + $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline'); } - foreach (sort keys %coursepersonnel) { + foreach my $element (sort keys %coursepersonnel) { 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( @@ -160,7 +168,7 @@ ENDDOCUMENT if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { $forcestudent='student'; } - if ($forcestudent) { $allowed=0; } + if ($forcestudent or $target eq 'tex') { $allowed=0; } } if ($allowed) { $r->print('

'. @@ -181,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=''; @@ -239,8 +250,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; @@ -257,7 +269,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{$_}. @@ -271,28 +287,36 @@ ENDDOCUMENT $message=~s/\n/\
/g; $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { $r->print('

'.$syllabusfields{$_}.'

'. $message.'
'); } else { $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. - &Apache::lonxml::xmlparse($r,' ',$message).'\\\\'); + &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 { - $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('');} else {$r->print('\end{document}');} return OK;