--- loncom/interface/lonaboutme.pm 2008/01/16 12:19:39 1.66 +++ loncom/interface/lonaboutme.pm 2008/12/02 23:35:21 1.76 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.66 2008/01/16 12:19:39 bisitz Exp $ +# $Id: lonaboutme.pm,v 1.76 2008/12/02 23:35:21 harmsja Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,53 @@ # http://www.lon-capa.org/ # +=pod + +=head1 NAME + +pache::lonaboutme + +=head1 SYNOPSIS + +(empty) + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 OVERVIEW + +(empty) + + +=head1 SUBROUTINES + +=over + +=item handler() + +=item in_course() + +=item aboutme_info() + +=item print_portfiles_link() + +=item build_query_string() + +=item display_portfolio_header() + +=item display_portfolio_files() + +=item portfolio_files() + +=item build_hierarchy() + +=item parse_directory() + +=back + +=cut + + package Apache::lonaboutme; use strict; @@ -37,6 +84,7 @@ use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonlocal; use Apache::lonmsgdisplay(); +use Apache::lontemplate; use HTML::Entities(); sub handler { @@ -69,7 +117,7 @@ sub handler { # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['forceedit','forcestudent', - 'register']); + 'register','popup']); # ----------------------------------------------- Available Portfolio file display if (($target ne 'tex') && ($action eq 'portfolio')) { @@ -115,14 +163,16 @@ sub handler { my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); if ($target ne 'tex') { my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); + my $args = {'function' => $forcestudent, + 'domain' => $cdom, + 'force_register' => $forceregister}; + if ($env{'form.popup'}) { + $args->{'no_nav_bar'} = 1; + } my $start_page = - &Apache::loncommon::start_page("Personal Information", $rss_link, - {'function' => $forcestudent, - 'domain' => $cdom, - 'force_register' => - $forceregister,}); + &Apache::loncommon::start_page("Personal Information",$rss_link,$args); $r->print($start_page); - $r->print('

'.&Apache::loncommon::plainname($cnum,$cdom).'

'); + $r->print('

'.&Apache::loncommon::plainname($cnum,$cdom).'

'); } else { $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); } @@ -132,8 +182,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').'}\\\\'); } @@ -147,16 +196,16 @@ sub handler { if ($forcestudent or $target eq 'tex') { $allowed=0; } if ($allowed) { - my $query_string = &build_query_string({'forcestudent' => '1',}); + my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); $r->print('

'.&mt('Privacy Note').': '. &mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.'). '

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'

'.&mt('Show Public View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'

'.&mt('Show Public View').''. &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); } elsif ($privleged && $target ne 'tex') { - my $query_string = &build_query_string({'forceedit' => '1',}); - $r->print('

'. - &mt('Edit').'

'); + my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); + $r->print('

'. + &mt('Edit').'

'); } if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { @@ -189,20 +238,23 @@ 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( @@ -211,37 +263,35 @@ sub handler { '. '
'. '

'.&mt('Upload a Photo').'

'. - ''. - ''. + ''. + ''. + ''. '
'); } - foreach my $field (sort(keys(%syllabusfields))) { - if (($syllabus{$field}) || ($allowed)) { - my $message=$syllabus{$field}; - &Apache::lonfeedback::newline_to_br(\$message); - $message - =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

'. - $message.'
'); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - if ($allowed) { - $r->print('
'); - } - } + &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); + if($target ne 'tex') + { + + &print_portfiles_link($r,$is_course); + $r->print('
'); + $r->print($image); + $r->print('
'); + $r->print(''); + $r->print('

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

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + + } + if ($allowed) { + if ($env{'form.popup'}) { + $r->print(''); + } $r->print(''); } if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} @@ -250,7 +300,8 @@ sub handler { } if ($target ne 'tex') { - &print_portfiles_link($r,$is_course); + # &print_portfiles_link($r,$is_course); #old Print files + } if ($env{'request.course.id'} @@ -281,10 +332,18 @@ sub handler { } } if ($target ne 'tex') { + 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; } @@ -338,7 +397,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'}. '

'; @@ -362,6 +424,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; @@ -610,9 +673,10 @@ sub parse_directory { my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum, $group); + my $getpropath = 1; my %dirlist = map { ((split('&',$_,2))[0],1) - } &Apache::lonnet::dirlist($path,$cdom,$cnum,$portfolio_root); + } &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath); foreach my $item (sort(keys(%{$currhash}))) { $output .= &portfolio_row_start(); $output .= '';