--- loncom/interface/lonaboutme.pm	2008/12/09 22:16:23	1.80
+++ loncom/interface/lonaboutme.pm	2009/02/17 08:24:28	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.80 2008/12/09 22:16:23 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.95 2009/02/17 08:24:28 schualex Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,6 +86,7 @@ use Apache::lonlocal;
 use Apache::lonmsgdisplay();
 use Apache::lontemplate;
 use HTML::Entities();
+use Image::Magick;
 
 sub handler {
     my $r = shift;
@@ -167,13 +168,16 @@ sub handler {
 
     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);
@@ -201,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"}];
 	my $start_page = 
 	    &Apache::loncommon::start_page("Personal Information",$rss_link,$args);
 	$r->print($start_page);
-	$r->print('<h2>'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
+        $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).'}}\\\\\\\\');
     }
@@ -214,6 +220,7 @@ sub handler {
          '&quot;</h2>');
     }
     if ($target ne 'tex') {
+        $r->print('<blockquote>');
 	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');#OLD SendMessage POS
     } else {
 	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
@@ -226,16 +233,16 @@ 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'}});
+           $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>');
+		     '</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
+                     &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>'.
+		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p>');
        } elsif ($privleged && $target ne 'tex') {
-           my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
+           $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
 	   $r->print('<p><a href="'.$r->uri.$query_string.'">'.
 		     &mt('Edit').'</a></p>');
        }
@@ -276,46 +283,70 @@ my $image;
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
-       # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos
+ 	$r->print('<br />'.&mt('Last updated').': '.$lastmod);
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
-	   $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};
+	
+           #This call is to resize all "about me" 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 old Image
+	
        }
        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>
+');
 
        }
-	&Apache::lontemplate::start_columnSection($r);
-	&Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
-       if($target ne 'tex')
-       {
-		&Apache::lontemplate::print_image($r,$image);
-		  &print_portfiles_link($r,$is_course);
-      		 $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));
 
+	if($allowed) {
+		$r->print('<form method="post">');
+	}
 
-       }
+	 if($target ne 'tex') #print Image
+     	 {	
+		&Apache::lontemplate::start_ContentBox($r);		
+		&Apache::lontemplate::send_message($r,$cnum,$cdom);
+		&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 ''){
+			$r->print('<div class="LC_ContentBoxSpecial">');
+			$r->print('<h4 class="LC_hcell">'.'RSS Feeds and Blogs'.'</h4>');
+			$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
+			$r->print('</div>');
+		}		
+		
+		if($allowed){
+			$r->print('<p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
+                        	&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+		}
+       }#End  Print RSS and portfiles
 
+       $r->print('</blockquote>');
+       $r->print('</div>');
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -325,13 +356,10 @@ my $image;
        }
        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); #old Print files
-
-    }
+    
 
     if ($env{'request.course.id'}
 	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
@@ -354,7 +382,7 @@ my $image;
 			  ('View recent activity by this student',
 			   $cnum,$cdom).('&nbsp;'x2));
 	    }
-	    $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
+	    $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$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);
@@ -364,8 +392,6 @@ my $image;
         if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
         }
-	$r->print('<br />'.&mt('Last updated').': '.$lastmod);
-	&Apache::lontemplate::end_columnSection($r);
 	$r->print(&Apache::loncommon::end_page());
     } else {
 	$r->print('\end{document}');
@@ -426,7 +452,7 @@ sub print_portfiles_link {
                          difl => 'Display file listing',
              );                     
     if ($filecounts->{'both'} > 0) {
-	$output = '<div class="ContentBoxSpecial"><h4 class="hcell">';
+	$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>';
@@ -454,6 +480,7 @@ sub print_portfiles_link {
         }
         $output .= '</ul>';
 	$output .='</p>';
+	$output .='</div>';
     }
     $r->print($output);
     return;
@@ -747,7 +774,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>';
 	    }
@@ -772,7 +799,8 @@ sub aboutme_access {
         $cdom = $coursehash{'domain'};
         $cnum = $coursehash{'cnum'};
     }
-    if ((&allowed('srm',$privcheck)) || (&allowed('dff',$privcheck))) {
+    if ((&Apache::lonnet::allowed('srm',$privcheck)) || 
+        (&Apache::lonnet::allowed('dff',$privcheck))) {
         if (&in_course($uname,$udom,$cnum,$cdom)) {
             return 1;
         }