--- loncom/interface/lonaboutme.pm 2009/02/12 21:15:47 1.92 +++ loncom/interface/lonaboutme.pm 2009/04/02 15:09:10 1.120 @@ -1,7 +1,7 @@ # The LearningOnline Network -# "About Me" Personal Information +# Personal Information Page # -# $Id: lonaboutme.pm,v 1.92 2009/02/12 21:15:47 schafran Exp $ +# $Id: lonaboutme.pm,v 1.120 2009/04/02 15:09:10 amueller 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")); - $r->print('

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

'. + $r->print(&Apache::loncommon::start_page("Personal Information Page")); + $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()); } @@ -136,7 +136,7 @@ sub handler { # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_contactinfo' => 'Contact Information', - 'bbb_aboutme' => 'About Me', + 'bbb_aboutme' => 'Personal Information', 'ccc_webreferences' => 'Web References'); # ------------------------------------------------------------ Get Query String @@ -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()); } @@ -194,9 +194,18 @@ sub handler { if ($forcestudent eq '') { $forceregister = $env{'form.register'}; } - + +#------------Get rights + 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) && + ($env{'user.domain'} eq $cdom)); + if ($forcestudent or $target eq 'tex') { $allowed=0; } + + # --------------------------------------- There is such a user, get environment - my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); + if ($target ne 'tex') { my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); my $args = {'function' => $forcestudent, @@ -205,45 +214,81 @@ sub handler { if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; } - $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information"}]; + $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information Page"}]; my $start_page = - &Apache::loncommon::start_page("Personal Information",$rss_link,$args); + &Apache::loncommon::start_page("Personal Data",$rss_link,$args); $r->print($start_page); - $r->print('

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

'); - } else { - $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); - } - if ($courseenv{'nickname'}) { - $r->print( - '

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

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

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

');#OLD SendMessage POS - } else { - $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); - } - my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); - my $allowed=0; + + } + +#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){ + $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); + } + } + +#----------------Print Functions + if ($target ne 'tex'){ + $r->print(&Apache::lontemplate::start_functionslist()); + if($allowed){ + my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); + $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'}}); + $r->print(&Apache::lontemplate::item_functionslist( + ''. &mt('Edit').'')); + } + $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 (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { + $r->print(&Apache::lontemplate::item_functionslist( + &Apache::loncommon::track_student_link('View recent activity by this student',$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))); + } + $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'}) { + $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').'}\\\\'); + } # does this user have privileges to post, etc? - my $privleged=$allowed=(($env{'user.name'} eq $cnum) && - ($env{'user.domain'} eq $cdom)); - if ($forcestudent or $target eq 'tex') { $allowed=0; } + my $query_string; - if ($allowed) { - $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); - $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.'). - '

'.&mt('Show Public View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'

'); - } elsif ($privleged && $target ne 'tex') { - $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); - $r->print('

'. - &mt('Edit').'

'); - } + if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { @@ -281,23 +326,25 @@ my $image; if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - $r->print('
'.&mt('Last updated').': '.$lastmod); + $r->print('
'.&mt('Last updated').': '.$lastmod); + + if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - #This call is to resize all "about me" images in the LonCapa System. When its done, you can remove this line. + #This call is to resize all "Personal Information" images in the LonCapa System. When its done, you can remove this line. &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'})); + #---End Resize--- -#--End Resize--- - - $image=qq{}; + $image=qq{}; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } - # $r->print($image); #Print old Image + } + if ($allowed) { $r->print( '
'. @@ -305,7 +352,7 @@ my $image; ''. ''. ''. - '
+ '

'); } @@ -314,32 +361,30 @@ my $image; $r->print('

'); } - &Apache::lontemplate::start_columnSection($r); - &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); - if($target ne 'tex') - { - &Apache::lontemplate::start_ContentBox($r); - $r->print($image); - &Apache::lontemplate::send_message($r,$cnum,$cdom); + if($target ne 'tex') #print Image + { + &Apache::lontemplate::start_ContentBox($r); &Apache::lontemplate::end_ContentBox($r); - &Apache::lontemplate::end_columnSection($r); + $r->print($image); + + }#End Print Image + + #Print Content eg. Contactinfo aboutme,... + &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); + #End Print Content - &Apache::lontemplate::start_columnSection($r); - &Apache::lontemplate::start_ContentBox($r); + if($target ne 'tex')#Begin Print RSS and portfiles + { &print_portfiles_link($r,$is_course); if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){ - $r->print('
'); - $r->print('

'.'RSS Feeds and Blogs'.'

'); - $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); - $r->print('
'); - } - &Apache::lontemplate::end_ContentBox($r); - &Apache::lontemplate::end_columnSection($r); - if($allowed){ - $r->print('

'.&mt('Show Public View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); - } - } + &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 + + if ($allowed) { if ($env{'form.popup'}) { $r->print(''); - $r->print('

'. - &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"). - '
'); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); - $r->print('
'); - if (&Apache::lonnet::allowed('vsa', - $env{'request.course.id'}) || - &Apache::lonnet::allowed('vsa', - $env{'request.course.id'}.'/'. - $env{'request.course.sec'})) { - $r->print(&Apache::loncommon::track_student_link - ('View recent activity by this student', - $cnum,$cdom).(' 'x2)); - } - $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$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 { $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::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); } } + $r->print('
'); + $r->print('
'); if ($target ne 'tex') { if ($env{'form.popup'}) { $r->print('

'.&mt('Close window').''); @@ -444,10 +481,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'}).'

'; @@ -536,10 +573,11 @@ sub display_portfolio_header { if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/$cdom/$cnum/aboutme".$query_string, - text=>"Personal information - $name", - title=>"Go to personal information page for $name"}, {href=>"/adm/$cdom/$cnum/aboutme/portfolio", - text=>"Viewable files - $name", - title=>"Viewable portfolio files for $name"} + text=>&mt('Personal Information Page - [_1]',$name), + title=>&mt('Go to personal information page for [_1]', $name)}, + {href=>"/adm/$cdom/$cnum/aboutme/portfolio", + text=>&mt('Viewable files - [_1]', $name), + title=>&mt('Viewable portfolio files for [_1]', $name)} ); $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.')); } @@ -552,10 +590,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'})) {