--- loncom/interface/lonaboutme.pm	2008/11/18 10:34:45	1.72
+++ loncom/interface/lonaboutme.pm	2008/12/02 23:35:21	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.72 2008/11/18 10:34:45 amueller Exp $
+# $Id: lonaboutme.pm,v 1.76 2008/12/02 23:35:21 harmsja Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,53 @@
 # http://www.lon-capa.org/
 #
 
+=pod
+
+=head1 NAME
+
+pache::lonaboutme
+
+=head1 SYNOPSIS
+
+(empty)
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+(empty)
+
+
+=head1 SUBROUTINES
+
+=over
+
+=item handler()
+
+=item in_course()
+
+=item aboutme_info()
+
+=item print_portfiles_link()
+
+=item build_query_string()
+
+=item display_portfolio_header()
+
+=item display_portfolio_files()
+
+=item portfolio_files()
+
+=item build_hierarchy()
+
+=item parse_directory()
+
+=back
+
+=cut
+
+
 package Apache::lonaboutme;
 
 use strict;
@@ -125,7 +172,7 @@ sub handler {
 	my $start_page = 
 	    &Apache::loncommon::start_page("Personal Information",$rss_link,$args);
 	$r->print($start_page);
-	$r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');
+	$r->print('<h2>'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
     } else {
 	$r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
     }
@@ -157,8 +204,8 @@ sub handler {
 		     &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
        } elsif ($privleged && $target ne 'tex') {
            my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
-	   $r->print('<p><a href="'.$r->uri.$query_string.'"><font size="+1">'.
-		     &mt('Edit').'</font></a></p>');
+	   $r->print('<p><a href="'.$r->uri.$query_string.'">'.
+		     &mt('Edit').'</a></p>');
        }
       if (($env{'form.uploaddoc.filename'}) &&
           ($env{'form.storeupl'}) && ($allowed)) {
@@ -202,7 +249,8 @@ my $image;
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
 	   $image=
-               qq{<img src="$syllabus{'uploaded.photourl'}" style="vertical-align:text-top;float:right;" />};
+               qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};
+
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
@@ -221,41 +269,17 @@ my $image;
 	 '</form><form method="post">');
 
        }
-
-	
-       foreach my $field (sort(keys(%syllabusfields))) {
-          if (($syllabus{$field}) || ($allowed)) {
-              my $message=$syllabus{$field};
-	      &Apache::lonfeedback::newline_to_br(\$message);
-              $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
-	      if ($allowed) {
-		  $message=&Apache::lonspeller::markeduptext($message);
-	      }
-	      $message=&Apache::lontexconvert::msgtexconverted($message);
-	      if ($target ne 'tex') {
-				
-		Apache::lontemplate::print_template($r,$syllabusfields{$field},$message);
-				
-				
-				
-	      } else {
-		     $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
-			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
-	      }
-              if ($allowed) {
-		Apache::lontemplate::print_editbox_template($r,$syllabusfields{$field},$field);
-	      }
-	  }
-       }
+	&Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
        if($target ne 'tex')
        {
 		
 		  &print_portfiles_link($r,$is_course);
- 
+		$r->print('<div class="ContentBox">');
+		$r->print($image); 
+		$r->print('</div>');
       		 $r->print('</div>');
-			$r->print('<div style="margin:0 0 0 75">');
-        $r->print($image);
+			$r->print('<p>');
+        
 
 	$r->print('Kontakt');
 	$r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
@@ -373,10 +397,10 @@ sub print_portfiles_link {
                          difl => 'Display file listing',
              );                     
     if ($filecounts->{'both'} > 0) {
-	$output = '<fieldset><legend><b>';
-	$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</b></legend><br />';
+	$output = '<div class="ContentBoxSpecial"><h4 class="hcell">';
+	$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
         
-	#$output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
+	#$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
                    $query_string.'">'.$lt{'difl'}.
                    '</a><br /><br />';
@@ -400,7 +424,7 @@ sub print_portfiles_link {
 	    $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
         }
         $output .= '</ul>';
-	$output .='</fieldset>';
+	$output .='</p>';
     }
     $r->print($output);
     return;