--- loncom/interface/lontemplate.pm 2008/12/16 10:41:02 1.9 +++ loncom/interface/lontemplate.pm 2009/10/12 08:01:08 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.9 2008/12/16 10:41:02 ehlerst Exp $ +# $Id: lontemplate.pm,v 1.38 2009/10/12 08:01:08 amueller Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,21 +44,21 @@ use Apache::lonmsgdisplay(); use HTML::Entities(); -sub start_columnSection{ +sub start_columnSection { my ($r) = @_; - $r->print('
'); + $r->print('
'); } -sub end_columnSection{ +sub end_columnSection { my ($r) = @_; $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}; - $r->print('
'); + foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed)) { my $message=$syllabus{$field}; @@ -70,64 +70,57 @@ sub print_content_template{ } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - - &print_template($r,$syllabusfields{$field},$message); - - - + if($field eq 'aaa_contactinfo') { + $r->print('
 
'); + &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); + } else { + &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); + } + if($allowed) { + &print_editbox_template($r,$syllabus{$field},$field); + } + } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } - if ($allowed) { - &print_editbox_template($r,$syllabus{$field},$field); - } } } - $r->print('
'); + } -sub start_ContentBox{ - my ($r,$allowed) = @_; - if($allowed){ - $r->print('
'); - }else{ - $r->print('
'); - } +sub send_message { + my ($r,$cnum,$cdom) = @_; + my $s; + my $image = qq{Send message symbol}; + $s=&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom); + return $s; } -sub end_ContentBox{ - my ($r) = @_; +sub print_template { + my ($r,$topic,$content, $allowed,$boxclass) = @_; + $r->print('
'); + $r->print('

'.$topic.'

'); + $r->print($content); $r->print('
'); } -sub send_message{ - my ($r,$cnum,$cdom) = @_; - $r->print('
'); - $r->print('

'.&mt('Contact').'

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

'.$topic.'

'); - $r->print('
'.$content.'
'); +sub print_start_template { + my ($r,$topic,$boxclass) = @_; + $r->print('
'); + $r->print('

'.$topic.'

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