--- loncom/interface/lonaboutme.pm	2009/02/12 21:15:47	1.92
+++ loncom/interface/lonaboutme.pm	2009/02/25 13:05:54	1.104
@@ -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.104 2009/02/25 13:05:54 weissno Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,7 +120,7 @@ sub handler {
                 if ($target eq 'tex') {
                     $r->print('\noindent{\large\textbf{'.&mt('No user home page available').'}}\\\\\\\\');
                 } else {
-                    $r->print(&Apache::loncommon::start_page("Personal Information"));
+                    $r->print(&Apache::loncommon::start_page("Personal Information Page"));
                     $r->print('<h2>'.&mt('No user home 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>'.
@@ -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
@@ -205,11 +205,12 @@ 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 Information Page",$rss_link,$args);
 	$r->print($start_page);
-	$r->print('<h2>'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
+        $r->print('<div class="LC_ContentBoxSpecial">');
+	$r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
     } else {
 	$r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
     }
@@ -219,7 +220,8 @@ sub handler {
          '&quot;</h2>');
     }
     if ($target ne 'tex') {
-	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');#OLD SendMessage POS
+        $r->print('<blockquote>');
+	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
     } else {
 	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
@@ -232,18 +234,14 @@ sub handler {
 			       ($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('<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><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
-                     &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>'.
+		     &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><p>'.              
 		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p>');
-       } elsif ($privleged && $target ne 'tex') {
-           $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
-	   $r->print('<p><a href="'.$r->uri.$query_string.'">'.
-		     &mt('Edit').'</a></p>');
-       }
+       }     
+	
       if (($env{'form.uploaddoc.filename'}) &&
           ($env{'form.storeupl'}) && ($allowed)) {
  	  if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
@@ -281,23 +279,46 @@ my $image;
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
-	 $r->print('<br />'.&mt('Last updated').': '.$lastmod);
+ 	$r->print('<br />'.&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{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};
+	   $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
 	   
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
-	  # $r->print($image); #Print old Image
+	
        }
+	#---Print Functions
+	if( $target ne 'tex'){
+		 &Apache::lontemplate::print_start_page_functions($r);
+      		if($allowed){
+			 $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});		
+			&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));
+    		 }elsif($privleged){
+			$query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
+			 &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));
+
+		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(
 	 '<form method="post" enctype="multipart/form-data">'.
@@ -305,7 +326,7 @@ my $image;
          '<input type="file" name="uploaddoc" size="50" />'.
          '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
          '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
-	 '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>
+	 '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form><p>
 ');
 
        }
@@ -314,32 +335,28 @@ my $image;
 		$r->print('<form method="post">');
 	}
 
-	&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('<div class="LC_ContentBoxSpecial">');
-			$r->print('<h4 class="LC_hcell">'.'RSS Feeds and Blogs'.'</h4>');
-			$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
-			$r->print('</div>');
-		}
-		&Apache::lontemplate::end_ContentBox($r);
-		&Apache::lontemplate::end_columnSection($r);
-		if($allowed){
-			$r->print('<p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
-                        	&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
-		}
-       }
+		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
+
+       
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -349,14 +366,13 @@ my $image;
        }
        if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
     } else {
-	 &Apache::lontemplate::send_message($r,$cnum,$cdom);
+	# &Apache::lontemplate::send_message($r,$cnum,$cdom);
        $r->print('<p>'.&mt('No personal information provided').'.</p>');
     }
-
-    if ($target ne 'tex') {
-        # &print_portfiles_link($r,$is_course); #old Print files
-
-    }
+    if($target ne 'tex'){
+		#$r->print('</blockquote>');
+    		#$r->print('</div>');	
+	}
 
     if ($env{'request.course.id'}
 	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
@@ -368,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>');
@@ -536,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 - $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.'));
         }