--- loncom/interface/lonaboutme.pm	2009/02/19 18:55:53	1.100
+++ loncom/interface/lonaboutme.pm	2009/02/25 13:05:54	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.100 2009/02/19 18:55:53 neumanie Exp $
+# $Id: lonaboutme.pm,v 1.104 2009/02/25 13:05:54 weissno Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -136,7 +136,7 @@ sub handler {
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_contactinfo'   => 'Contact Information',
-       'bbb_aboutme'       => 'Personal Information Page',
+       'bbb_aboutme'       => 'Personal Information',
        'ccc_webreferences' => 'Web References');
 
 # ------------------------------------------------------------ Get Query String
@@ -221,7 +221,7 @@ sub handler {
     }
     if ($target ne 'tex') {
         $r->print('<blockquote>');
-	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');#OLD SendMessage POS
+	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
     } else {
 	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
@@ -297,6 +297,7 @@ my $image;
 	   }
 	
        }
+	#---Print Functions
 	if( $target ne 'tex'){
 		 &Apache::lontemplate::print_start_page_functions($r);
       		if($allowed){
@@ -307,7 +308,16 @@ my $image;
 			 &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>');
 		}
 		&Apache::lontemplate::print_functions_content($r,&Apache::lontemplate::send_message($r,$cnum,$cdom));
-		 &Apache::lontemplate::print_end_page_functions($r);
+
+		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).('&nbsp;'x2));
+	    		}
+	    		&Apache::lontemplate::print_functions_content($r,&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));
+		}
+	&Apache::lontemplate::print_end_page_functions($r);
 	}
        if ($allowed) {
            $r->print(
@@ -327,8 +337,7 @@ my $image;
 
 	 if($target ne 'tex') #print Image
      	 {	
-		&Apache::lontemplate::start_ContentBox($r);		
-		#&Apache::lontemplate::send_message($r,$cnum,$cdom);
+		&Apache::lontemplate::start_ContentBox($r);			
 		&Apache::lontemplate::end_ContentBox($r);
 		$r->print($image);		
 		
@@ -339,17 +348,15 @@ my $image;
         #End Print Content
 
        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');
-		}	
+		}		
 		
-       }#End  Print RSS and portfiles
+       } #End  Print RSS and portfiles
 
-       $r->print('</blockquote>');
-       $r->print('</div>');
+       
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -362,7 +369,10 @@ my $image;
 	# &Apache::lontemplate::send_message($r,$cnum,$cdom);
        $r->print('<p>'.&mt('No personal information provided').'.</p>');
     }
-    
+    if($target ne 'tex'){
+		#$r->print('</blockquote>');
+    		#$r->print('</div>');	
+	}
 
     if ($env{'request.course.id'}
 	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
@@ -374,23 +384,15 @@ my $image;
 		      &mt('Shared by course faculty and staff').
 		      &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
 		      '<br />');
-	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
-	    $r->print('<hr />');
-	    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).('&nbsp;'x2));
-	    }
-	    $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));
+	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);	   
+	    
 	} 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('</blockquote>');
+    $r->print('</div>');
     if ($target ne 'tex') {
         if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
@@ -542,10 +544,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 Page - $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.'));
         }