--- loncom/interface/lonsyllabus.pm 2004/02/13 15:01:29 1.27 +++ 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.27 2004/02/13 15:01:29 www 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; @@ -44,11 +45,16 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - $r->print(<print(< The LearningOnline Network with CAPA ENDDOCUMENT + } else { + $r->print(&Apache::lonprintout::print_latex_header($ENV{'form.latex_type'})); + } my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); # Is this even a course? my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom); @@ -92,27 +98,54 @@ ENDDOCUMENT # ------------------------------------- There is such a course, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); - $r->print(''.&Apache::loncommon::bodytag - ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'})); - $r->print('

'.$courseenv{'description'}.'

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

'); + if ($target ne 'tex') { + $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{'. + $Apache::lonnet::domaindescription{$cdom}.'}\\\\'); + } # -------------------------------------------------------------- Announcements? $r->print(&Apache::lonannounce::showday(time,2, &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))); # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); - $r->print(''); + if ($target ne 'tex') { + $r->print('
'); + } else { + $r->print('\begin{tabular}{|c|c|}\hline'); + } foreach (sort keys %coursepersonnel) { - $r->print(''); + if ($target ne 'tex') { + $r->print(''); + } else { + $r->print('\\\\ \hline'); + } + } + if ($target ne 'tex') { + $r->print('
'.$_.''); + if ($target ne 'tex') { + $r->print('
'.$_.''); + } else { + $r->print(' '.$_.'\\\\ '); + } foreach (split(/\,/,$coursepersonnel{$_})) { my ($puname,$pudom)=split(/\:/,$_); - $r->print(' '.&Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($puname, - $pudom),$puname,$pudom)); + if ($target ne 'tex') { + $r->print(' '.&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($puname, + $pudom),$puname,$pudom)); + } else { + $r->print(' '.&Apache::loncommon::plainname($puname, + $pudom).' '); + } } - $r->print('
'); + } else { + $r->print('\end{tabular}\\\\'); } - $r->print(''); # ---------------------------------------------------------- Load syllabus info my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); my $allowed=0; @@ -128,7 +161,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('

'. @@ -141,14 +174,19 @@ ENDDOCUMENT &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'). '

'); } elsif ($privileged) { - $r->print('

'. -&mt('Edit').''); + if ($target ne 'tex') { + $r->print('

'. + &mt('Edit').''); + } } 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=''; @@ -192,15 +230,22 @@ ENDDOCUMENT &Apache::loncommon::plainname($syllabus{'uploaded.name'}, $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, $syllabus{'uploaded.domain'}); - $r->print('
'.&mt('Last updated').':'. - $lastmod.''.&mt('by').' '.$who. - '

'); + if ($target ne 'tex') { + $r->print('
'.&mt('Last updated').':'. + $lastmod.''.&mt('by').' '.$who. + '

'); + } else { + $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.&mt('by').'\\\\ '. + &Apache::loncommon::plainname($syllabus{'uploaded.name'}, + $syllabus{'uploaded.domain'}).'\\\\'); + } if ($allowed) { $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; @@ -232,24 +277,32 @@ ENDDOCUMENT $message =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; $message=&Apache::lontexconvert::msgtexconverted($message); - $r->print('

'.$syllabusfields{$_}.'

'. - $message.'
'); + if ($target ne 'tex') { + $r->print('

'.$syllabusfields{$_}.'

'. + $message.'
'); + } else { + $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)); } - $r->print('

'); + if ($target ne 'tex') {$r->print('

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

No syllabus information provided.

'); } - $r->print(''); + if ($target ne 'tex') {$r->print('');} else {$r->print('\end{document}');} return OK; }