--- loncom/interface/lontemplate.pm 2008/12/22 14:24:50 1.14 +++ loncom/interface/lontemplate.pm 2009/02/13 17:29:39 1.15 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.14 2008/12/22 14:24:50 ehlerst Exp $ +# $Id: lontemplate.pm,v 1.15 2009/02/13 17:29:39 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -54,11 +54,11 @@ sub end_columnSection{ $r->print(''); } -sub print_content_template{ +sub print_aboutme_content_template{ my ($r,$allowed,$target,$syllabusfields_ref,$syllabus_ref) = @_; my %syllabusfields = %{$syllabusfields_ref}; my %syllabus = %{$syllabus_ref}; - &start_ContentBox($r,$allowed); + #&start_ContentBox($r,$allowed); foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed)) { my $message=$syllabus{$field}; @@ -72,8 +72,19 @@ sub print_content_template{ if ($target ne 'tex') { if($allowed){ $r->print('

'); - } - &print_template($r,$syllabusfields{$field},$message,$allowed); + } + + if($field eq 'aaa_contactinfo') { + if($allowed){ + $r->print('

 
'); + } + &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecialContactInfo'); + $r->print('
 
'); + } + else{ + &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); + } + } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); @@ -86,16 +97,13 @@ sub print_content_template{ } } } - &end_ContentBox($r); + #&end_ContentBox($r); } sub start_ContentBox{ - my ($r,$allowed) = @_; - if($allowed){ - $r->print('
'); - }else{ - $r->print('
'); - } + my ($r,$allowed) = @_; + $r->print('
'); + } sub end_ContentBox{ @@ -113,12 +121,8 @@ sub send_message{ sub print_template { - my ($r,$topic,$content, $allowed) = @_; - if($allowed){ - $r->print('
'); - }else{ - $r->print('
'); - } + my ($r,$topic,$content, $allowed,$boxclass) = @_; + $r->print('
'); $r->print('

'.$topic.'

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