--- loncom/interface/lonaboutme.pm 2009/03/02 22:32:19 1.108 +++ 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.108 2009/03/02 22:32:19 schualex Exp $ +# $Id: lonaboutme.pm,v 1.118 2009/03/27 13:50:36 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -118,13 +118,13 @@ sub handler { } if (!$candisplay) { if ($target eq 'tex') { - $r->print('\noindent{\large\textbf{'.&mt('No user home page available').'}}\\\\\\\\'); + $r->print('\noindent{\large\textbf{'.&mt('No user personal information page available').'}}\\\\\\\\'); } else { $r->print(&Apache::loncommon::start_page("Personal Information Page")); - $r->print('

'.&mt('No user home page available') .'

'. + $r->print('

'.&mt('No user personal information page available') .'

'. &mt('This is a result of one of the following:').''); $r->print(&Apache::loncommon::end_page()); } @@ -179,7 +179,7 @@ sub handler { 'force_register' => $env{'forceregister'}, 'bread_crumbs' => $brcrum}); $r->print($start_page); - $r->print('

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

'); + $r->print('

'.&mt('Group Portfolio').'

'); &print_portfiles_link($r,$is_course); $r->print(&Apache::loncommon::end_page()); } @@ -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) { @@ -361,8 +371,10 @@ my $image; if($target ne 'tex')#Begin Print RSS and portfiles { &print_portfiles_link($r,$is_course); - if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ - &Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom),1,'LC_ContentBoxSpecial'); + if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ + &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); + &Apache::lontemplate::print_end_template($r); } } #End Print RSS and portfiles @@ -388,10 +400,13 @@ my $image; if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) { - if ($target ne 'tex') { - $r->print(''); - &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); + 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(&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 { @@ -460,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'}).'

'; @@ -569,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'})) {