--- loncom/interface/lontemplate.pm 2008/12/16 10:41:02 1.9 +++ loncom/interface/lontemplate.pm 2009/04/14 15:32:12 1.30 @@ -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.30 2009/04/14 15:32:12 neumanie Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,7 +46,7 @@ use HTML::Entities(); sub start_columnSection{ my ($r) = @_; - $r->print('
'); + $r->print('
'); } sub end_columnSection{ @@ -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}; - $r->print('
'); + foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed)) { my $message=$syllabus{$field}; @@ -70,30 +70,37 @@ sub print_content_template{ } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - - &print_template($r,$syllabusfields{$field},$message); - - - + if($allowed){ + $r->print('

'); + } + + if($field eq 'aaa_contactinfo') { + $r->print('

 
'); + &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); + } + else{ + &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); + } + } 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('
'); + } sub start_ContentBox{ my ($r,$allowed) = @_; - if($allowed){ - $r->print('
'); - }else{ - $r->print('
'); - } + $r->print('
'); + } sub end_ContentBox{ @@ -103,32 +110,59 @@ sub end_ContentBox{ 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('
'); + my $s; + my $image = qq{}; + $s=&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom); + return $s; } sub print_template -{ - my ($r,$topic,$content, $allowed) = @_; - if($allowed){ - $r->print('
'); - }else{ - $r->print('
'); - } - $r->print('

'.$topic.'

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

'.$topic.'

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

'.$topic.'

'); + $r->print('
' ); +} +sub print_end_template +{ + my ($r) = @_; + $r->print('
'); $r->print('
'); } - sub print_editbox_template { my ($r,$content,$field) = @_; - $r->print('
'); } +# Functionslist: List of functions +# Typically used to display a list of available functions at top of page +sub start_functionslist { + my($legendtext)=@_; + $legendtext=&mt('Functions') if !$legendtext; + return '
'.$legendtext.'' + .'
    '; +} + +sub item_functionslist { + my($content) = @_; + return '
  • '.$content.'
  • '; +} + +sub end_functionslist { + my($r)=@_; + return '
'; +} + 1;