--- loncom/interface/lonaboutme.pm 2006/03/21 21:14:43 1.40 +++ loncom/interface/lonaboutme.pm 2006/12/09 23:33:55 1.58 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.40 2006/03/21 21:14:43 albertel Exp $ +# $Id: lonaboutme.pm,v 1.58 2006/12/09 23:33:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,8 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonlocal; +use Apache::lonmsgdisplay(); +use HTML::Entities(); sub handler { my $r = shift; @@ -47,13 +49,17 @@ sub handler { 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); + my $is_course; # Is this even a user? if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { &Apache::loncommon::simple_error_page($r,'No info', 'No user information available'); return OK; + } else { + $is_course = &is_course($cdom,$cnum); } + # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_contactinfo' => 'Contact Information', @@ -61,18 +67,43 @@ sub handler { '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,$is_course); + &display_portfolio_files($r,$is_course); + $r->print(&Apache::loncommon::end_page()); + return OK; } + + if ($is_course) { + if ($target ne 'tex') { + my $start_page = + &Apache::loncommon::start_page( + "Course Information", + undef, + {'function' => $env{'forcestudent'}, + 'domain' => $cdom, + 'force_register' => $env{'forceregister'},}); + $r->print($start_page); + $r->print('

'.&mt('Group files').'

'); + &print_portfiles_link($r,$is_course); + $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); @@ -80,10 +111,9 @@ sub handler { my $start_page = &Apache::loncommon::start_page("Personal Information",undef, {'function' => $forcestudent, - 'add_entries' => $addentries, - 'domain' => $cdom, + 'domain' => $cdom, 'force_register' => - $env{'form.register'},}); + $forceregister,}); $r->print($start_page); $r->print('

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

'); } else { @@ -110,13 +140,15 @@ sub handler { 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'}) && @@ -139,12 +171,12 @@ sub handler { } } if (($allowed) && ($env{'form.storesyl'})) { - foreach (keys %syllabusfields) { - my $field=$env{'form.'.$_}; + foreach my $syl_field (keys(%syllabusfields)) { + my $field=$env{'form.'.$syl_field}; $field=~s/\s+$//s; $field=&Apache::lonfeedback::clear_out_html($field, $env{'user.adv'}); - $syllabus{$_}=$field; + $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); @@ -177,9 +209,9 @@ sub handler { '
'); } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { - my $message=$syllabus{$_}; + 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; @@ -188,15 +220,15 @@ sub handler { } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

'. + $r->print('

'.$syllabusfields{$field}.'

'. $message.'
'); } else { - $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. + $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } if ($allowed) { - $r->print('
'); } @@ -205,10 +237,15 @@ sub handler { 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,$is_course); + } + if ($env{'request.course.id'}) { if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { if ($target ne 'tex') { @@ -218,7 +255,7 @@ sub handler { &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'}) || @@ -232,7 +269,7 @@ sub handler { $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); } } } @@ -242,7 +279,355 @@ sub handler { $r->print('\end{document}'); } return OK; -} +} + +sub aboutme_info { + my ($r,$is_course) = @_; + my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); + my $name; + if (!$is_course) { + $name = &Apache::loncommon::plainname($cnum,$cdom); + } + return ($cdom,$cnum,$name); +} + +sub print_portfiles_link { + my ($r,$is_course) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); + my $filecounts = &portfolio_files($r,'showlink',undef,$is_course); + my $query_string = &build_query_string(); + my $output; + my %lt = &Apache::lonlocal::texthash( + vpfi => 'Viewable portfolio files', + vgpf => 'Viewable group portfolio files', + difl => 'Display file listing', + ); + if ($filecounts->{'both'} > 0) { + $output = '

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

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

'; + if ($filecounts->{'both'} == 1) { + if ($is_course) { + $output .= &mt('One group portfolio file is available.').'