--- loncom/interface/lonaboutme.pm 2008/09/11 02:07:27 1.70 +++ loncom/interface/lonaboutme.pm 2008/11/11 10:45:22 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.70 2008/09/11 02:07:27 raeburn Exp $ +# $Id: lonaboutme.pm,v 1.71 2008/11/11 10:45:22 amueller Exp $ # # Copyright Michigan State University Board of Trustees # @@ -134,8 +134,7 @@ sub handler { '"'); } if ($target ne 'tex') { - $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

'. - '

'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

');#OLD SendMessage POS } else { $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); } @@ -191,20 +190,22 @@ sub handler { &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); } +my $lastmod; +my $image; # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - my $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - $r->print(&mt('Last updated').': '.$lastmod); + # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - my $image= - qq{}; + $image= + qq{}; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } - $r->print($image); + # $r->print($image); #Print old Image } if ($allowed) { $r->print( @@ -219,6 +220,12 @@ sub handler { '
'); } + + if($target ne 'tex') + { + $r->print('
'); + } + foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed)) { my $message=$syllabus{$field}; @@ -230,8 +237,15 @@ sub handler { } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

'. - $message.'
'); + + # Start Neu + $r->print('
'.$syllabusfields{$field}.''); + $r->print($message); + $r->print('

'); + #Ende NEU + + # $r->print('

'.$syllabusfields{$field}. 'MESSAGE ____' .'

'. + # $message.'
'); } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); @@ -244,6 +258,27 @@ sub handler { } } } + if($target ne 'tex') + { + + &print_portfiles_link($r,$is_course); + + $r->print('
'); + $r->print('
'); + $r->print($image); + + $r->print('

'); + $r->print('

'); + $r->print('
'); + $r->print('Kontakt'); + $r->print('
'); + $r->print('safasf@dsf.de'); + $r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + + $r->print('
'); + + } + if ($allowed) { if ($env{'form.popup'}) { $r->print(''.&mt('Close window').''); } + $r->print('
'.&mt('Last updated').': '.$lastmod); + $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}'); } + + + return OK; } @@ -348,7 +389,10 @@ sub print_portfiles_link { difl => 'Display file listing', ); if ($filecounts->{'both'} > 0) { - $output = '

'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; + $output = '
'; + $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
'; + + #$output = '

'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; $output .= ''.$lt{'difl'}. '

'; @@ -372,6 +416,7 @@ sub print_portfiles_link { $output .= '
  • '.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'
  • '; } $output .= ''; + $output .='
    '; } $r->print($output); return;