--- loncom/interface/lontemplate.pm 2008/12/02 09:19:47 1.5 +++ loncom/interface/lontemplate.pm 2008/12/22 14:24:50 1.14 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.5 2008/12/02 09:19:47 ehlerst Exp $ +# $Id: lontemplate.pm,v 1.14 2008/12/22 14:24:50 ehlerst Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,11 +43,22 @@ use Apache::lonlocal; use Apache::lonmsgdisplay(); use HTML::Entities(); + +sub start_columnSection{ + my ($r) = @_; + $r->print('
'); +} + +sub end_columnSection{ + my ($r) = @_; + $r->print('
'); +} + sub print_content_template{ my ($r,$allowed,$target,$syllabusfields_ref,$syllabus_ref) = @_; my %syllabusfields = %{$syllabusfields_ref}; my %syllabus = %{$syllabus_ref}; - $r->print('
'); + &start_ContentBox($r,$allowed); foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed)) { my $message=$syllabus{$field}; @@ -59,40 +70,67 @@ sub print_content_template{ } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - - &print_template($r,$syllabusfields{$field},$message); - - - + if($allowed){ + $r->print('

'); + } + &print_template($r,$syllabusfields{$field},$message,$allowed); } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } if ($allowed) { &print_editbox_template($r,$syllabus{$field},$field); + if($target ne 'tex'){ + $r->print('

'); + } } } } - $r->print('
'); + &end_ContentBox($r); +} + +sub start_ContentBox{ + my ($r,$allowed) = @_; + if($allowed){ + $r->print('
'); + }else{ + $r->print('
'); + } +} + +sub end_ContentBox{ + my ($r) = @_; + $r->print('
'); +} + +sub send_message{ + my ($r,$cnum,$cdom) = @_; + my $image = qq{}; + $r->print('
'); + $r->print(&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom)); + $r->print('
'); } sub print_template { - my ($r,$topic,$content) = @_; - $r->print('
'); - $r->print('

'.$topic.'

'); - $r->print('
'.$content.'
'); + my ($r,$topic,$content, $allowed) = @_; + if($allowed){ + $r->print('
'); + }else{ + $r->print('
'); + } + $r->print('

'.$topic.'

'); + $r->print('
'.$content.'
'); $r->print('
'); } sub print_editbox_template { my ($r,$content,$field) = @_; - $r->print('
'); - } 1;