--- loncom/interface/lontemplate.pm 2008/11/28 10:56:31 1.4 +++ loncom/interface/lontemplate.pm 2008/12/02 09:19:47 1.5 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.4 2008/11/28 10:56:31 bisitz Exp $ +# $Id: lontemplate.pm,v 1.5 2008/12/02 09:19:47 ehlerst Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,8 @@ use strict; use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; +use Apache::lonxml; +use Apache::lonspeller; use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonrss(); @@ -41,11 +43,43 @@ use Apache::lonlocal; use Apache::lonmsgdisplay(); use HTML::Entities(); +sub print_content_template{ + my ($r,$allowed,$target,$syllabusfields_ref,$syllabus_ref) = @_; + my %syllabusfields = %{$syllabusfields_ref}; + my %syllabus = %{$syllabus_ref}; + $r->print('
'); + foreach my $field (sort(keys(%syllabusfields))) { + if (($syllabus{$field}) || ($allowed)) { + my $message=$syllabus{$field}; + &Apache::lonfeedback::newline_to_br(\$message); + $message + =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } + $message=&Apache::lontexconvert::msgtexconverted($message); + if ($target ne 'tex') { + + &print_template($r,$syllabusfields{$field},$message); + + + + } else { + $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. + &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); + } + if ($allowed) { + &print_editbox_template($r,$syllabus{$field},$field); + } + } + } + $r->print('
'); +} sub print_template { my ($r,$topic,$content) = @_; - $r->print('
'); + $r->print('
'); $r->print('

'.$topic.'

'); $r->print('
'.$content.'
'); $r->print('
');