--- loncom/interface/lonaboutme.pm	2008/11/11 10:45:22	1.71
+++ loncom/interface/lonaboutme.pm	2008/12/02 09:41:07	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.71 2008/11/11 10:45:22 amueller Exp $
+# $Id: lonaboutme.pm,v 1.75 2008/12/02 09:41:07 ehlerst 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;
@@ -37,6 +84,7 @@ use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonlocal;
 use Apache::lonmsgdisplay();
+use Apache::lontemplate;
 use HTML::Entities();
 
 sub handler {
@@ -201,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'}" style="vertical-align:text-top;float:right;" />};
+
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
@@ -220,62 +269,19 @@ my $image;
 	 '</form><form method="post">');
 
        }
-
-       if($target ne 'tex')
-       {
-		$r->print('<div style="left:0;  width:75%">');
-       } 
-	
-       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') {
-		
-			# Start Neu
-		  $r->print('<fieldset><legend><b>'.$syllabusfields{$field}.'</b></legend>');
-		  $r->print($message);
-		  $r->print('</fieldset><br />');
- 		#Ende NEU	        
-  
-		  # $r->print('<h3>'.$syllabusfields{$field}. 'MESSAGE ____' .'</h3><blockquote>'.
-                  #          $message.'</blockquote>');
-	      } else {
-		     $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
-			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
-	      }
-              if ($allowed) {
-                 $r->print('<br /><textarea cols="80" rows="6" name="'.$field.'">'.
-			   &HTML::Entities::encode($syllabus{$field},'"&<>').
-           '</textarea><input type="submit" name="storesyl" value="'.
-			   &mt('Save').'" />');
-	      }
-	  }
-       }
+	&Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
        if($target ne 'tex')
        {
 		
-		         &print_portfiles_link($r,$is_course);
+		  &print_portfiles_link($r,$is_course);
  
       		 $r->print('</div>');
 			$r->print('<div style="margin:0 0 0 75">');
         $r->print($image);
 
-	$r->print('<p style="clear:both">');
-	$r->print('<div style="border:1px solid #000000;float:right">');
-	$r->print('<div style="border-bottom:1px solid #000000; background-color:#efefef;">');
 	$r->print('Kontakt');
-	$r->print('</div>');
-	$r->print('safasf@dsf.de');
 	$r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
 
-	$r->print('</div></div>');
 
        }