--- loncom/interface/lonaboutme.pm	2008/12/17 23:05:11	1.70.2.2
+++ loncom/interface/lonaboutme.pm	2009/02/25 13:05:54	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network
-# "About Me" Personal Information
+# Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.70.2.2 2008/12/17 23:05:11 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.104 2009/02/25 13:05:54 weissno 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,7 +84,9 @@ use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonlocal;
 use Apache::lonmsgdisplay();
+use Apache::lontemplate;
 use HTML::Entities();
+use Image::Magick;
 
 sub handler {
     my $r = shift;
@@ -71,7 +120,7 @@ sub handler {
                 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(&Apache::loncommon::start_page("Personal Information Page"));
                     $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>'.
@@ -87,7 +136,7 @@ sub handler {
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_contactinfo'   => 'Contact Information',
-       'bbb_aboutme'       => 'About Me',
+       'bbb_aboutme'       => 'Personal Information',
        'ccc_webreferences' => 'Web References');
 
 # ------------------------------------------------------------ Get Query String
@@ -112,20 +161,23 @@ sub handler {
             } else {
                 $r->print($blocktext);
             }
-            $r->print(&Apache::loncommon::end_page());
-            return OK;
         }
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
     }
 
     if ($is_course) {
         if ($target ne 'tex') {
+	    my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
+			  {href=>"/adm/aboutme",text=>"Course Information"}];
             my $start_page =
                 &Apache::loncommon::start_page(
                     "Course Information",
                      undef,
                      {'function' => $env{'forcestudent'},
                       'domain'   => $cdom,
-                      'force_register' => $env{'forceregister'},});
+                      'force_register' => $env{'forceregister'},
+                      'bread_crumbs' => $brcrum});
             $r->print($start_page);
             $r->print('<h2>'.&mt('Group files').'</h2>');
             &print_portfiles_link($r,$is_course);
@@ -153,10 +205,12 @@ sub handler {
         if ($env{'form.popup'}) {
             $args->{'no_nav_bar'} = 1;
         }
+	$args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information Page"}];
 	my $start_page = 
-	    &Apache::loncommon::start_page("Personal Information",$rss_link,$args);
+	    &Apache::loncommon::start_page("Personal Information Page",$rss_link,$args);
 	$r->print($start_page);
-	$r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');
+        $r->print('<div class="LC_ContentBoxSpecial">');
+	$r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
     } else {
 	$r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
     }
@@ -166,8 +220,8 @@ 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('<blockquote>');
+	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
     } else {
 	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
@@ -179,19 +233,15 @@ sub handler {
        my $privleged=$allowed=(($env{'user.name'} eq $cnum) && 
 			       ($env{'user.domain'} eq $cdom));
        if ($forcestudent or $target eq 'tex') { $allowed=0; }
- 
+	my $query_string; 
+	
        if ($allowed) {
-           my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
+          
 	   $r->print('<p><b>'.&mt('Privacy Note').':</b> '.
-		     &mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.').
-		     '</p>'.
-		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
-		     &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>');
-       }
+		     &mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.'). '</p><p>'.              
+		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p>');
+       }     
+	
       if (($env{'form.uploaddoc.filename'}) &&
           ($env{'form.storeupl'}) && ($allowed)) {
  	  if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
@@ -199,7 +249,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);
@@ -223,59 +273,90 @@ 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('<br />'.&mt('Last updated').': '.$lastmod);
+
+
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
-	   my $image=
-               qq{<img src="$syllabus{'uploaded.photourl'}" align="right" />};
+	
+           #This call is to resize all "Personal Information" images in the LonCapa System. When its done, you can remove this line.
+	   &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
+	   #---End Resize---
+
+	   $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
+	   
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
-	   $r->print($image);
+	
        }
+	#---Print Functions
+	if( $target ne 'tex'){
+		 &Apache::lontemplate::print_start_page_functions($r);
+      		if($allowed){
+			 $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});		
+			&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));
+    		 }elsif($privleged){
+			$query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
+			 &Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>');
+		}
+		&Apache::lontemplate::print_functions_content($r,&Apache::lontemplate::send_message($r,$cnum,$cdom));
+
+		if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'})	&& &in_course($cdom,$cnum)) {
+			if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.
+					 $env{'request.course.sec'})) {
+				&Apache::lontemplate::print_functions_content($r,&Apache::loncommon::track_student_link('View recent activity by this student',
+			  	 	$cnum,$cdom).('&nbsp;'x2));
+	    		}
+	    		&Apache::lontemplate::print_functions_content($r,&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));
+		}
+	&Apache::lontemplate::print_end_page_functions($r);
+	}
        if ($allowed) {
            $r->print(
-	 '<form method="post">
-               <input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />
-          </form>'.
 	 '<form method="post" enctype="multipart/form-data">'.
          '<h3>'.&mt('Upload a Photo').'</h3>'.
          '<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">');
+	 '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form><p>
+');
 
        }
-       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') {
-		  $r->print('<h3>'.$syllabusfields{$field}.'</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').'" />');
-	      }
-	  }
-       }
+
+	if($allowed) {
+		$r->print('<form method="post">');
+	}
+
+	 if($target ne 'tex') #print Image
+     	 {	
+		&Apache::lontemplate::start_ContentBox($r);			
+		&Apache::lontemplate::end_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 ''){			
+			&Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom),1,'LC_ContentBoxSpecial');
+		}		
+		
+       } #End  Print RSS and portfiles
+
+       
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -285,12 +366,13 @@ sub handler {
        }
        if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
     } else {
+	# &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);
-    }
+    if($target ne 'tex'){
+		#$r->print('</blockquote>');
+    		#$r->print('</div>');	
+	}
 
     if ($env{'request.course.id'}
 	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
@@ -302,23 +384,15 @@ sub handler {
 		      &mt('Shared by course faculty and staff').
 		      &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
 		      '<br />');
-	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
-	    $r->print('<hr />');
-	    if (&Apache::lonnet::allowed('vsa',
-					 $env{'request.course.id'}) ||
-		&Apache::lonnet::allowed('vsa',
-					 $env{'request.course.id'}.'/'.
-					 $env{'request.course.sec'})) {
-		$r->print(&Apache::loncommon::track_student_link
-			  ('View recent activity by this student',
-			   $cnum,$cdom).('&nbsp;'x2));
-	    }
-	    $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
+	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);	   
+	    
 	} else {
 	    $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');
 	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
 	}
     }
+    $r->print('</blockquote>');
+    $r->print('</div>');
     if ($target ne 'tex') {
         if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
@@ -327,6 +401,9 @@ sub handler {
     } else {
 	$r->print('\end{document}');
     }
+
+  
+	
     return OK;
 }
 
@@ -380,7 +457,10 @@ sub print_portfiles_link {
                          difl => 'Display file listing',
              );                     
     if ($filecounts->{'both'} > 0) {
-        $output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
+	$output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
+	$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
+        
+	#$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
                    $query_string.'">'.$lt{'difl'}.
                    '</a><br /><br />';
@@ -404,6 +484,8 @@ sub print_portfiles_link {
 	    $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
         }
         $output .= '</ul>';
+	$output .='</p>';
+	$output .='</div>';
     }
     $r->print($output);
     return;
@@ -462,10 +544,11 @@ sub display_portfolio_header {
         if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/$cdom/$cnum/aboutme".$query_string,
-                  text=>"Personal information - $name",
-                  title=>"Go to personal information page for $name"},                 {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
-                  text=>"Viewable files - $name",
-                  title=>"Viewable portfolio files for $name"}
+                  text=>&mt('Personal Information Page - [_1]',$name),
+                  title=>&mt('Go to personal information page for [_1]',$name)},                 
+                 {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
+                  text=>&mt('Viewable files - [_1]',$name),
+                  title=>&mt('Viewable portfolio files for [_1]',$name)}
             );
             $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.'));
         }
@@ -697,7 +780,7 @@ sub parse_directory {
 		'&nbsp;'.$showname.'</a>';
 	    $output.='</td><td>';
 	    if ($have_meta) {
-		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Catalog Information').'" src="'.
+		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
 		&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
 		'" class="LC_icon" /></a>';
 	    }