--- loncom/interface/lonsyllabus.pm 2004/05/10 14:12:14 1.31 +++ loncom/interface/lonsyllabus.pm 2005/06/06 02:29:46 1.41 @@ -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.41 2005/06/06 02:29:46 albertel 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; @@ -44,15 +46,16 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - my $target=$ENV{'form.grade_target'}; + my $target=$env{'form.grade_target'}; if ($target ne 'tex') { + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html The LearningOnline Network with CAPA ENDDOCUMENT } else { - $r->print(&Apache::lonprintout::print_latex_header($ENV{'form.latex_type'})); + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # Is this even a course? @@ -84,22 +87,23 @@ ENDDOCUMENT ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']); # ----------------------------------------------------- Force menu registration my $addentries=''; - if ($ENV{'form.register'}) { + if ($env{'form.register'}) { $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; $r->print(&Apache::lonmenu::registerurl(1)); } # --------------------------------------------------------------- Force Student my $forcestudent=''; - if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }; + if ($env{'form.forcestudent'}) { $forcestudent='student'; }; my $forceedit=''; - if ($ENV{'form.forceedit'}) { $forceedit='edit'; } + if ($env{'form.forceedit'}) { $forceedit='edit'; } # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); if ($target ne 'tex') { - $r->print(''.&Apache::loncommon::bodytag - ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'})); + $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). + ''.&Apache::loncommon::bodytag + ("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'})); $r->print('

'.$courseenv{'description'}.'

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

'); } else { @@ -107,22 +111,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(''); } 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( @@ -151,10 +161,10 @@ ENDDOCUMENT # This handler might be called anonymously ... # ----------------------------------------------------- Only if not public call - if ($ENV{'user.environment'}) { + if ($env{'user.environment'}) { # does this user have privileges to post, etc? - if ($ENV{'request.course.id'}) { - $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); + if ($env{'request.course.id'}) { + $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); $privileged=$allowed; if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { $forcestudent='student'; @@ -177,11 +187,14 @@ ENDDOCUMENT &mt('Edit').''); } } - if (($allowed) && ($ENV{'form.storesyl'})) { + if (($allowed) && ($env{'form.storesyl'})) { foreach (keys %syllabusfields) { - my $field=$ENV{'form.'.$_}; + 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=''; @@ -211,8 +224,8 @@ ENDDOCUMENT $syllabus{$_}=$field; } } - $syllabus{'uploaded.domain'}=$ENV{'user.domain'}; - $syllabus{'uploaded.name'}=$ENV{'user.name'}; + $syllabus{'uploaded.domain'}=$env{'user.domain'}; + $syllabus{'uploaded.name'}=$env{'user.name'}; $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum); } @@ -238,8 +251,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; @@ -256,7 +270,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{$_}. @@ -267,9 +285,12 @@ ENDDOCUMENT $r->print($message); } } else { - $message=~s/\n/\
/g; + &Apache::lonfeedback::newline_to_br(\$message); $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{$_}.'

'. @@ -278,20 +299,25 @@ 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 { - $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;