--- loncom/interface/lonaboutme.pm 2009/03/02 22:32:19 1.108 +++ loncom/interface/lonaboutme.pm 2009/04/14 15:32:12 1.124 @@ -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.124 2009/04/14 15:32:12 neumanie 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()); } @@ -196,14 +196,14 @@ sub handler { } #------------Get rights - my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); - my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); + my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); + my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); my $allowed=0; - my $privleged=$allowed=(($env{'user.name'} eq $cnum) && + my $privleged=$allowed=(($env{'user.name'} eq $cnum) && ($env{'user.domain'} eq $cdom)); - if ($forcestudent or $target eq 'tex') { $allowed=0; } + if ($forcestudent or $target eq 'tex') { $allowed=0; } + - # --------------------------------------- There is such a user, get environment if ($target ne 'tex') { @@ -221,59 +221,84 @@ sub handler { } -#Print Help Text -if ($target ne 'tex') { - if($allowed){ - $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); +#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 last modified + + my $lastmod; + if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { + $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); + $r->print('
'); + $r->print(&mt('Last updated').': '.$lastmod . ''); + $r->print('
'); } +#Print Help Text + if ($target ne 'tex') { + if($allowed){ + $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); + } + } #----------------Print Functions - if( $target ne 'tex'){ - &Apache::lontemplate::print_start_page_functions($r); + if ($target ne 'tex'){ + $r->print(&Apache::lontemplate::start_functionslist()); 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')); + $r->print(&Apache::lontemplate::item_functionslist( + ''.&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').''); + $r->print(&Apache::lontemplate::item_functionslist( + ''. &mt('Edit').'')); } - &Apache::lontemplate::print_functions_content($r,&Apache::lontemplate::send_message($r,$cnum,$cdom)); + $r->print(&Apache::lontemplate::item_functionslist( + &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 ($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', - $cnum,$cdom).(' 'x2)); + $r->print(&Apache::lontemplate::item_functionslist( + &Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom))); } - &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'})) { + $r->print(&Apache::lontemplate::item_functionslist( + &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom))); + } + $r->print(&Apache::lontemplate::item_functionslist( + &Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom))); } - &Apache::lontemplate::print_end_page_functions($r); + $r->print(&Apache::lontemplate::end_functionslist()); } #------Print Headtitle - if ($target ne 'tex') { - $r->print('
'); - $r->print('

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

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

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

'); + $r->print('
'); + if ($courseenv{'nickname'}) { $r->print('

"'.$courseenv{'nickname'}.'"

'); } - $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

'); - } -else{ - $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); - $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); -} + $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

'); + } + else { + $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); + $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); + } # does this user have privileges to post, etc? 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) { @@ -305,15 +330,9 @@ else{ &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); } -my $lastmod; my $image; # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - $r->print('
'.&mt('Last updated').': '.$lastmod); - - if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); @@ -337,9 +356,11 @@ my $image; ''. ''. ''. - '

-'); - + ''); + if ($syllabus{'uploaded.photourl'}) { + $r->print('

') + } + $r->print('

'); } if($allowed) { @@ -361,8 +382,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 +411,14 @@ 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') { + $r->print(''); + &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,13 +487,13 @@ 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'}).'

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

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

'; $output .= '