--- loncom/interface/lonaboutme.pm	2008/12/11 16:46:50	1.70.2.1
+++ loncom/interface/lonaboutme.pm	2008/11/18 10:34:45	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.70.2.1 2008/12/11 16:46:50 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.72 2008/11/18 10:34:45 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonlocal;
 use Apache::lonmsgdisplay();
+use Apache::lontemplate;
 use HTML::Entities();
 
 sub handler {
@@ -60,30 +61,6 @@ sub handler {
         $is_course = &Apache::lonnet::is_course($cdom,$cnum);
     }
 
-    my $candisplay = 1;
-    if (!$is_course) {
-        if ($action ne 'portfolio') {
-            $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme');
-            if ((!$candisplay) && ($env{'request.course.id'})) {
-                $candisplay = &aboutme_access($cnum,$cdom);
-            }
-            if (!$candisplay) {
-                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('<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>'.
-                              '<li>'.&mt('The domain has been configured to disable, by default, home page functionality for all users in the domain.').'</li>'.
-                              '</ul>');
-                    $r->print(&Apache::loncommon::end_page());
-                }
-                return OK;
-            }
-        }
-    }
-
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_contactinfo'   => 'Contact Information',
@@ -98,23 +75,15 @@ sub handler {
 # ----------------------------------------------- Available Portfolio file display 
     if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r,$is_course);
-        if ((!$is_course) && (!&Apache::lonnet::usertools_access($cnum,$cdom,'portfolio'))) {
-            $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
-                      &mt('This is a result of one of the following:').'<ul>'.
-                      '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
-                      '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
-                      '</ul>');
+        my ($blocked,$blocktext) = 
+           &Apache::loncommon::blocking_status('port',$cnum,$cdom);
+        if (!$blocked) {
+            &display_portfolio_files($r,$is_course);
         } else {
-            my ($blocked,$blocktext) = 
-                &Apache::loncommon::blocking_status('port',$cnum,$cdom);
-            if (!$blocked) {
-                &display_portfolio_files($r,$is_course);
-            } else {
-                $r->print($blocktext);
-            }
-            $r->print(&Apache::loncommon::end_page());
-            return OK;
+            $r->print($blocktext);
         }
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
     }
 
     if ($is_course) {
@@ -166,8 +135,7 @@ sub handler {
          '&quot;</h2>');
     }
     if ($target ne 'tex') {
-	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
-		  '<p>'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');#OLD SendMessage POS
     } else {
 	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
@@ -223,20 +191,22 @@ sub handler {
            &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
        }
 
+my $lastmod;
+my $image; 
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
-       my $lastmod=$syllabus{'uploaded.lastmodified'};
+       $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
-       $r->print(&mt('Last updated').': '.$lastmod);
+       # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
-	   my $image=
-               qq{<img src="$syllabus{'uploaded.photourl'}" align="right" />};
+	   $image=
+               qq{<img src="$syllabus{'uploaded.photourl'}" style="vertical-align:text-top;float:right;" />};
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
-	   $r->print($image);
+	  # $r->print($image); #Print old Image
        }
        if ($allowed) {
            $r->print(
@@ -251,6 +221,8 @@ sub handler {
 	 '</form><form method="post">');
 
        }
+
+	
        foreach my $field (sort(keys(%syllabusfields))) {
           if (($syllabus{$field}) || ($allowed)) {
               my $message=$syllabus{$field};
@@ -262,20 +234,35 @@ sub handler {
 	      }
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
 	      if ($target ne 'tex') {
-		  $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
-                            $message.'</blockquote>');
+				
+		Apache::lontemplate::print_template($r,$syllabusfields{$field},$message);
+				
+				
+				
 	      } 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_editbox_template($r,$syllabusfields{$field},$field);
 	      }
 	  }
        }
+       if($target ne 'tex')
+       {
+		
+		  &print_portfiles_link($r,$is_course);
+ 
+      		 $r->print('</div>');
+			$r->print('<div style="margin:0 0 0 75">');
+        $r->print($image);
+
+	$r->print('Kontakt');
+	$r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+
+
+       }
+
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -289,7 +276,8 @@ sub handler {
     }
 
     if ($target ne 'tex') {
-        &print_portfiles_link($r,$is_course);
+        # &print_portfiles_link($r,$is_course); #old Print files
+
     }
 
     if ($env{'request.course.id'}
@@ -323,10 +311,15 @@ sub handler {
         if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
         }
+	$r->print('<br />'.&mt('Last updated').': '.$lastmod);
+
 	$r->print(&Apache::loncommon::end_page());
     } else {
 	$r->print('\end{document}');
     }
+
+  
+	
     return OK;
 }
 
@@ -380,7 +373,10 @@ sub print_portfiles_link {
                          difl => 'Display file listing',
              );                     
     if ($filecounts->{'both'} > 0) {
-        $output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
+	$output = '<fieldset><legend><b>';
+	$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</b></legend><br />';
+        
+	#$output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
                    $query_string.'">'.$lt{'difl'}.
                    '</a><br /><br />';
@@ -404,6 +400,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>';
     }
     $r->print($output);
     return;
@@ -707,28 +704,5 @@ sub parse_directory {
     return $output;
 }
 
-sub aboutme_access {
-    my ($uname,$udom) = @_;
-    my $privcheck = $env{'request.course.id'};
-    my $sec;
-    if ($env{'request.course.sec'} ne '') {
-        $sec = $env{'request.course.sec'};
-        $privcheck .= '/'.$sec;
-    }
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    if (($cdom eq '') || ($cnum eq '')) {
-        my %coursehash = &coursedescription($env{'request.course.id'});
-        $cdom = $coursehash{'domain'};
-        $cnum = $coursehash{'cnum'};
-    }
-    if ((&allowed('srm',$privcheck)) || (&allowed('dff',$privcheck))) {
-        if (&in_course($uname,$udom,$cnum,$cdom)) {
-            return 1;
-        }
-    }
-    return;
-}
-
 1;
 __END__