--- loncom/interface/lonaboutme.pm	2008/12/08 23:13:52	1.77
+++ loncom/interface/lonaboutme.pm	2008/12/10 15:58:36	1.81
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.77 2008/12/08 23:13:52 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.81 2008/12/10 15:58:36 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,23 +110,25 @@ sub handler {
 
     my $candisplay = 1;
     if (!$is_course) {
-        $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());
+        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;
             }
-            return OK;
         }
     }
 
@@ -144,12 +146,20 @@ sub handler {
 # ----------------------------------------------- Available Portfolio file display 
     if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r,$is_course);
-        my ($blocked,$blocktext) = 
-           &Apache::loncommon::blocking_status('port',$cnum,$cdom);
-        if (!$blocked) {
-            &display_portfolio_files($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>');
         } else {
-            $r->print($blocktext);
+            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;
@@ -236,7 +246,7 @@ sub handler {
 		  &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
 	      }
 	      $syllabus{'uploaded.photourl'}=
-                 &Apache::lonnet::userfileupload('uploaddoc',undef,'aboutme');
+                 &Apache::lonnet::userphotoupload('uploaddoc','aboutme');
  	  }
           $syllabus{'uploaded.lastmodified'}=time;
           &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
@@ -270,8 +280,7 @@ my $image;
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
-	   $image=
-               qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};
+	   $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};
 
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
@@ -291,22 +300,26 @@ my $image;
 	 '</form><form method="post">');
 
        }
+	&Apache::lontemplate::start_columnSection($r);
 	&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('<p>');
-        
-
-	$r->print('Kontakt');
-	$r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
-
-
+		&Apache::lontemplate::start_ContentBox($r);
+		$r->print($image);
+		&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);
+		&print_portfiles_link($r,$is_course);
+		if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){
+			$r->print('<div class="ContentBoxSpecial">');
+			$r->print('<h4 class="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) {
@@ -358,7 +371,6 @@ my $image;
             $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}');
@@ -447,6 +459,7 @@ sub print_portfiles_link {
         }
         $output .= '</ul>';
 	$output .='</p>';
+	$output .='</div>';
     }
     $r->print($output);
     return;