--- loncom/interface/lonaboutme.pm	2009/02/12 21:15:47	1.92
+++ loncom/interface/lonaboutme.pm	2009/02/13 17:26:55	1.93
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.92 2009/02/12 21:15:47 schafran Exp $
+# $Id: lonaboutme.pm,v 1.93 2009/02/13 17:26:55 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -281,22 +281,21 @@ 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.
 	   &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'} " style="float:left;margin-right:10px;" />};
 	   
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
-	  # $r->print($image); #Print old Image
+	
        }
        if ($allowed) {
            $r->print(
@@ -305,7 +304,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 +313,35 @@ 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);
+	 if($target ne 'tex') #print Image
+     	 {	
+		&Apache::lontemplate::start_ContentBox($r);		
 		&Apache::lontemplate::send_message($r,$cnum,$cdom);
 		&Apache::lontemplate::end_ContentBox($r);
-		&Apache::lontemplate::end_columnSection($r);
-
-		&Apache::lontemplate::start_columnSection($r);
-		&Apache::lontemplate::start_ContentBox($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
+
+       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>');
 		}
-       }
+       }#End  Print RSS and portfiles
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -352,11 +354,7 @@ my $image;
 	 &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 ($env{'request.course.id'}
 	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})