--- loncom/interface/lonaboutme.pm 2009/03/08 21:49:33 1.111 +++ loncom/interface/lonaboutme.pm 2009/03/27 04:59:30 1.117 @@ -1,7 +1,7 @@ # The LearningOnline Network # Personal Information Page # -# $Id: lonaboutme.pm,v 1.111 2009/03/08 21:49:33 weissno Exp $ +# $Id: lonaboutme.pm,v 1.117 2009/03/27 04:59:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -221,6 +221,15 @@ sub handler { } +#Print Privacy Note + if ($allowed) { + $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.') + .'

' + ); + } + #Print Help Text if ($target ne 'tex') { if($allowed){ @@ -246,6 +255,12 @@ if ($target ne 'tex') { &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::track_student_link('View recent activity by this student', $cnum,$cdom).(' 'x2)); } + if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || + &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { + &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::slot_reservations_link('Slot reservation history', + $cnum,$cdom).(' 'x2)); + } &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)); } &Apache::lontemplate::print_end_page_functions($r); @@ -269,11 +284,6 @@ else{ my $query_string; - if ($allowed) { - $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.'). '

'); - } - - if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { @@ -391,8 +401,12 @@ my $image; && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) { if ($target ne 'tex') { - &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').' '.&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"),'LC_ContentBoxSpecial'); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial'); + $r->print(''); + $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message")); + $r->print('

'); +&Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + $r->print('

'); &Apache::lontemplate::print_end_template($r); } else { @@ -461,10 +475,10 @@ sub print_portfiles_link { 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', - ); + 'vpfi' => 'Viewable portfolio files', + 'vgpf' => 'Viewable group portfolio files', + 'difl' => 'Display file listing', + ); if ($filecounts->{'both'} > 0) { $output = '

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

'; @@ -570,10 +584,11 @@ sub display_portfolio_header { sub display_portfolio_files { my ($r,$is_course) = @_; my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); - my %lt = ( withoutpass => 'passphrase not required', - withpass => 'passphrase protected', - both => 'all access types ',); - %lt = &Apache::lonlocal::texthash(%lt); + my %lt = &Apache::lonlocal::texthash( + 'withoutpass' => 'passphrase not required', + 'withpass' => 'passphrase protected', + 'both' => 'all access types ', + ); my $portaccess = 'withoutpass'; if (exists($env{'form.portaccess'})) {