--- loncom/interface/lonaboutme.pm	2009/03/07 15:07:09	1.109
+++ loncom/interface/lonaboutme.pm	2009/03/21 22:18:29	1.116
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.109 2009/03/07 15:07:09 neumanie Exp $
+# $Id: lonaboutme.pm,v 1.116 2009/03/21 22:18:29 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('<h2>'.&mt('No user home page available') .'</h2>'.
+                    $r->print('<h2>'.&mt('No user personal information page available') .'</h2>'.
                               &mt('This is a result of one of the following:').'<ul>'.
-                              '<li>'.&mt('The administrator of this domain has disabled home page functionality for this specific user.').'</li>'.
-                              '<li>'.&mt('The domain has been configured to disable, by default, home page functionality for all users in the domain.').'</li>'.
+                              '<li>'.&mt('The administrator of this domain has disabled personal information page functionality for this specific user.').'</li>'.
+                              '<li>'.&mt('The domain has been configured to disable, by default, personal information page functionality for all users in the domain.').'</li>'.
                               '</ul>');
                     $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('<h2>'.&mt('Group files').'</h2>');
+            $r->print('<h2>'.&mt('Group Portfolio').'</h2>');
             &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('<p class="LC_info">'
+                    .'<b>'.&mt('Privacy Note:').'</b> '
+                    .&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.')
+                    .'</p>'
+           );
+	} 
+
 #Print Help Text
 if  ($target ne 'tex') {
 	if($allowed){
@@ -269,11 +278,6 @@ else{
      
 	my $query_string; 
 	
-       if ($allowed) {          
-	   $r->print('<p><b>'.&mt('Privacy Note').':</b> '.&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.'). '</p>');
-	} 
-       
-	
       if (($env{'form.uploaddoc.filename'}) &&
           ($env{'form.storeupl'}) && ($allowed)) {
  	  if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
@@ -391,8 +395,12 @@ my $image;
 	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	&& &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').' '.&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);
+	   &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial');
+	   $r->print('<span class="LC_info">');
+	   $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
+		$r->print('</span> <p>');	   
+&Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
+	   $r->print('</p>');
 	   &Apache::lontemplate::print_end_template($r);
 	    
 	} else {
@@ -461,10 +469,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 = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
 	$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
@@ -570,10 +578,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'})) {