--- loncom/interface/lonaboutme.pm	2009/06/11 16:48:33	1.138
+++ loncom/interface/lonaboutme.pm	2009/10/13 16:37:57	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.138 2009/06/11 16:48:33 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.140 2009/10/13 16:37:57 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -207,11 +207,18 @@ sub handler {
 
     if ($target ne 'tex') {
         my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
-        my $args = {'function' => $forcestudent,
+        my $args = {'function' => undef,
                     'domain'   => $cdom,
-                    'force_register' => $forceregister};
+# if this page is part of course content it looses the menu line when switching from Edit Mode to Public Mode. To avoid
+#this, I take take the value of the environment Variable $env{form.register}
+#                    'force_register' => $forceregister};
+                    'force_register' => $env{'form.register'}};
+
         if ($env{'form.popup'}) {
             $args->{'no_nav_bar'} = 1;
+		#Don't show breadcrumbs twice, when this page is part of course content and you call it  
+		} elsif ($env{'form.register'}) {
+			#do nothing
         } else { # Don't show breadcrumbs in popup window
             $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}];
         }
@@ -353,7 +360,7 @@ sub handler {
             &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
            #---End Resize---
 
-            $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
+            $image=qq|<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" alt="Photo of the user" />|;
 
             if ($target eq 'tex') {
                 $image=&Apache::lonxml::xmlparse($r,'tex',$image);
@@ -363,20 +370,20 @@ sub handler {
 
         if ($allowed) {
             $r->print(
-                '<form method="post" enctype="multipart/form-data">'.
+                '<form name="UploadPhoto" method="post" enctype="multipart/form-data" action="">'.
                 '<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>');
             if ($syllabus{'uploaded.photourl'}) {
-                $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
+                $r->print('<form name="delPhoto" method="post" action="" ><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
             }
-            $r->print('<p>');
+            $r->print('<p></p>');
         }
 
         if($allowed) {
-            $r->print('<form method="post">');
+            $r->print('<form name="lonaboutmeFields" method="post" action="" >');
         }
 
         if ($target ne 'tex') { #print Image
@@ -419,14 +426,13 @@ sub handler {
             &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_Box');
             $r->print('<span class="LC_info">');
             $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
-            $r->print('</span> <p>');
+            $r->print('</span>');
             &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
-            $r->print('</p>');
             &Apache::lontemplate::print_end_template($r);
 
         } 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);
+            &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom, 'tex');
         }
     }
     if ($target ne 'tex') {