--- loncom/interface/lonaboutme.pm	2009/02/19 12:10:44	1.98
+++ loncom/interface/lonaboutme.pm	2009/02/19 17:32:39	1.99
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.98 2009/02/19 12:10:44 weissno Exp $
+# $Id: lonaboutme.pm,v 1.99 2009/02/19 17:32:39 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -234,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) {
@@ -284,6 +280,8 @@ my $image;
        $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
  	$r->print('<br />'.&mt('Last updated').': '.$lastmod);
+
+
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
@@ -299,6 +297,18 @@ my $image;
 	   }
 	
        }
+	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));
+		 &Apache::lontemplate::print_end_page_functions($r);
+	}
        if ($allowed) {
            $r->print(
 	 '<form method="post" enctype="multipart/form-data">'.
@@ -318,7 +328,7 @@ my $image;
 	 if($target ne 'tex') #print Image
      	 {	
 		&Apache::lontemplate::start_ContentBox($r);		
-		&Apache::lontemplate::send_message($r,$cnum,$cdom);
+		#&Apache::lontemplate::send_message($r,$cnum,$cdom);
 		&Apache::lontemplate::end_ContentBox($r);
 		$r->print($image);		
 		
@@ -337,12 +347,8 @@ my $image;
 			$r->print('<h4 class="LC_hcell">'.'RSS Feeds and Blogs'.'</h4>');
 			$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
 			$r->print('</div>');
-		}		
+		}	
 		
-		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>');
-		}
        }#End  Print RSS and portfiles
 
        $r->print('</blockquote>');
@@ -356,7 +362,7 @@ 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>');
     }