--- loncom/interface/lonaboutme.pm 2005/06/06 02:29:46 1.38 +++ loncom/interface/lonaboutme.pm 2006/08/18 13:49:34 1.53 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.38 2005/06/06 02:29:46 albertel Exp $ +# $Id: lonaboutme.pm,v 1.53 2006/08/18 13:49:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,7 +34,10 @@ use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; +use Apache::lonrss(); use Apache::lonlocal; +use Apache::lonmsgdisplay(); +use HTML::Entities(); sub handler { my $r = shift; @@ -43,21 +46,14 @@ sub handler { return OK if $r->header_only; my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - if ($target ne 'tex') { - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA -ENDDOCUMENT - } else { + if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } - my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); + my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri); # Is this even a user? if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { - $r->print(''. - &mt('No user information available').''); + &Apache::loncommon::simple_error_page($r,'No info', + 'No user information available'); return OK; } # --------------------------------------------------------- The syllabus fields @@ -67,25 +63,37 @@ ENDDOCUMENT 'ccc_webreferences' => 'Web References'); # ------------------------------------------------------------ Get Query String - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register']); -# ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($env{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - $r->print(&Apache::lonmenu::registerurl(1)); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['forceedit','forcestudent', + 'register']); + +# ----------------------------------------------- Available Portfolio file display + if (($target ne 'tex') && ($action eq 'portfolio')) { + &display_portfolio_header($r); + &display_portfolio_files($r); + $r->print(&Apache::loncommon::end_page()); + return OK; } + # --------------------------------------------------------------- Force Student my $forcestudent=''; if ($env{'form.forcestudent'}) { $forcestudent='student'; }; + + my $forceregister = ''; + if ($forcestudent eq '') { + $forceregister = $env{'form.register'}; + } # --------------------------------------- There is such a user, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); if ($target ne 'tex') { - $r->print(''.&Apache::loncommon::bodytag - ("Personal Information",$forcestudent,$addentries,'',$cdom, - $env{'form.register'})); + my $start_page = + &Apache::loncommon::start_page("Personal Information",undef, + {'function' => $forcestudent, + 'domain' => $cdom, + 'force_register' => + $forceregister,}); + $r->print($start_page); $r->print('

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

'); } else { $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); @@ -97,7 +105,7 @@ ENDDOCUMENT } if ($target ne 'tex') { $r->print('

'.$Apache::lonnet::domaindescription{$cdom}.'

'. - '

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

'); + '

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

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); } else { $r->print('\textbf{'.$Apache::lonnet::domaindescription{$cdom}.'}\\\\'); } @@ -111,13 +119,15 @@ ENDDOCUMENT if ($forcestudent or $target eq 'tex') { $allowed=0; } if ($allowed) { + my $query_string = &build_query_string({'forcestudent' => '1',}); $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').'

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

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

'); } elsif ($privleged && $target ne 'tex') { - $r->print('

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

'. &mt('Edit').'

'); } if (($env{'form.uploaddoc.filename'}) && @@ -197,7 +207,7 @@ ENDDOCUMENT } if ($allowed) { $r->print('
'); } @@ -206,10 +216,15 @@ ENDDOCUMENT if ($allowed) { $r->print(''); } - if ($target ne 'tex') {$r->print('

');} else {$r->print('\\\\');} + if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} } else { $r->print('

'.&mt('No personal information provided').'.

'); } + + if ($target ne 'tex') { + &print_portfiles_link($r); + } + if ($env{'request.course.id'}) { if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { if ($target ne 'tex') { @@ -219,7 +234,7 @@ ENDDOCUMENT &mt('Shared by course faculty and staff'). &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"). '
'); - &Apache::lonmsg::disfacetoface($r,$cnum,$cdom); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); $r->print('
'); if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || @@ -233,13 +248,307 @@ ENDDOCUMENT $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom)); } else { $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); - &Apache::lonmsg::disfacetoface($r,$cnum,$cdom); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); } } } - if ($target ne 'tex') {$r->print('');} else {$r->print('\end{document}');} + if ($target ne 'tex') { + $r->print(&Apache::loncommon::end_page()); + } else { + $r->print('\end{document}'); + } return OK; -} +} + +sub aboutme_info { + my ($r) = @_; + my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); + my $name = &Apache::loncommon::plainname($cnum,$cdom); + return ($cdom,$cnum,$name); +} + +sub print_portfiles_link { + my ($r) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r); + my $filecounts = &portfolio_files($r,'showlink'); + my $query_string = &build_query_string(); + my $output; + if ($filecounts->{'both'} > 0) { + $output = &mt('

Viewable portfolio files

'); + $output .= ''.&mt('Display file listing'). + '

'; + if ($filecounts->{'both'} == 1) { + $output .= &mt('One portfolio file owned by [_2] is available.',$filecounts->{'both'},$name).'