--- loncom/interface/lonaboutme.pm 2009/03/20 10:05:08 1.113 +++ loncom/interface/lonaboutme.pm 2009/03/27 13:50:36 1.118 @@ -1,7 +1,7 @@ # The LearningOnline Network # Personal Information Page # -# $Id: lonaboutme.pm,v 1.113 2009/03/20 10:05:08 bisitz Exp $ +# $Id: lonaboutme.pm,v 1.118 2009/03/27 13:50:36 bisitz 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){ @@ -230,25 +239,31 @@ if ($target ne 'tex') { #----------------Print Functions if( $target ne 'tex'){ - &Apache::lontemplate::print_start_page_functions($r); + &Apache::lontemplate::start_functionslist($r); if($allowed){ my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); - &Apache::lontemplate::print_functions_content($r,''.&mt('Show Public View').''.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')); + &Apache::lontemplate::item_functionslist($r,''.&mt('Show Public View').''.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')); }elsif($privleged){ my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); - &Apache::lontemplate::print_functions_content($r,''. &mt('Edit').''); + &Apache::lontemplate::item_functionslist($r,''. &mt('Edit').''); } - &Apache::lontemplate::print_functions_content($r,&Apache::lontemplate::send_message($r,$cnum,$cdom)); + &Apache::lontemplate::item_functionslist($r,&Apache::lontemplate::send_message($r,$cnum,$cdom)); if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) { if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'. $env{'request.course.sec'})) { - &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::track_student_link('View recent activity by this student', + &Apache::lontemplate::item_functionslist($r,&Apache::loncommon::track_student_link('View recent activity by this student', $cnum,$cdom).(' 'x2)); } - &Apache::lontemplate::print_functions_content($r,&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)); + if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || + &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { + &Apache::lontemplate::item_functionslist($r,&Apache::loncommon::slot_reservations_link('Slot reservation history', + $cnum,$cdom).(' 'x2)); + } + &Apache::lontemplate::item_functionslist($r,&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)); } - &Apache::lontemplate::print_end_page_functions($r); + &Apache::lontemplate::end_functionslist($r); } #------Print Headtitle if ($target ne 'tex') { @@ -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) { @@ -392,12 +402,11 @@ my $image; && &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'),'LC_ContentBoxSpecial'); - $r->print('
'); - $r->print('

'); + $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::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); - $r->print('
'); &Apache::lontemplate::print_end_template($r); } else {