--- loncom/interface/lonaboutme.pm	2009/03/20 10:05:08	1.113
+++ loncom/interface/lonaboutme.pm	2009/04/03 10:46:13	1.122
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.113 2009/03/20 10:05:08 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.122 2009/04/03 10:46:13 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -196,14 +196,14 @@ sub handler {
     }
 
 #------------Get rights
- my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
- my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
+	my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
+ 	my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
     my $allowed=0;
-  my $privleged=$allowed=(($env{'user.name'} eq $cnum) && 
+  	my $privleged=$allowed=(($env{'user.name'} eq $cnum) && 
 			       ($env{'user.domain'} eq $cdom));
-       if ($forcestudent or $target eq 'tex') { $allowed=0; } 
+    if ($forcestudent or $target eq 'tex') { $allowed=0; } 
+	
  
-
 # --------------------------------------- There is such a user, get environment
   
     if ($target ne 'tex') {
@@ -221,59 +221,74 @@ sub handler {
         
     }   
 
+#Print Privacy Note
+    if ($allowed) {          
+           $r->print('<p class="LC_info">'
+                    .'<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>'
+           );
+	}
+
 #Print Help Text
-if  ($target ne 'tex') {
-	if($allowed){
-		$r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
+	if ($target ne 'tex') {
+		if($allowed){
+			$r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
+		}	
 	}
-}
 
 #----------------Print Functions
-	if( $target ne 'tex'){
-		 &Apache::lontemplate::print_start_page_functions($r);
+	if ($target ne 'tex'){
+		 $r->print(&Apache::lontemplate::start_functionslist());
       		if($allowed){
 			 my $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'));
+                        $r->print(&Apache::lontemplate::item_functionslist(
+                            '<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'
+                           .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
     		}elsif($privleged){
 			my $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>');
+                        $r->print(&Apache::lontemplate::item_functionslist(
+                            '<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>'));
 		}
-		&Apache::lontemplate::print_functions_content($r,&Apache::lontemplate::send_message($r,$cnum,$cdom));
+                $r->print(&Apache::lontemplate::item_functionslist(
+                    &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 ($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));
+                            $r->print(&Apache::lontemplate::item_functionslist(
+                                &Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom)));
 	    		}
-	    		&Apache::lontemplate::print_functions_content($r,&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));
+                        if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || 
+                            &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.
+                                                     $env{'request.course.sec'})) {
+                            $r->print(&Apache::lontemplate::item_functionslist(
+                                &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom)));
+                        }
+                        $r->print(&Apache::lontemplate::item_functionslist(
+                            &Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)));
 		}
-	&Apache::lontemplate::print_end_page_functions($r);
+        $r->print(&Apache::lontemplate::end_functionslist());
 	}  
 #------Print Headtitle
- if ($target ne 'tex') {
-	 $r->print('<div class="LC_ContentBoxSpecial">');
-	$r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
-	$r->print('<blockquote>');
-	 if ($courseenv{'nickname'}) {
+ 	if ($target ne 'tex') {
+		$r->print('<div class="LC_ContentBoxSpecial">');
+		$r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
+		$r->print('<blockquote>');
+	 	if ($courseenv{'nickname'}) {
       	 	$r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
     	}
-	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
- }
-else{
-	$r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
-	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');	
-}
+		$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
+ 	}
+	else {
+		$r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
+		$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');	
+	}
 # does this user have privileges to post, etc?
 
      
 	my $query_string; 
 	
-       if ($allowed) {          
-	   $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>');
-	} 
-       
-	
       if (($env{'form.uploaddoc.filename'}) &&
           ($env{'form.storeupl'}) && ($allowed)) {
  	  if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
@@ -337,9 +352,11 @@ my $image;
          '<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"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form><p>
-');
-
+	 '</form>');
+	      if ($syllabus{'uploaded.photourl'}) {
+              $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
+          }
+          $r->print('<p>');
        }
 
 	if($allowed) {
@@ -390,14 +407,14 @@ my $image;
     if ($env{'request.course.id'}
 	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	&& &in_course($cdom,$cnum)) {
-	if ($target ne 'tex') {	   
+	if ($target ne 'tex') {	  
+	   $r->print('<a name="coursecomment" />'); 
 	   &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial');
-	   $r->print('<div style="padding-left: 20px">');
-	   $r->print('<p>');
+	   $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>');	   
+&Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
 	   $r->print('</p>');
-	   &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
-	   $r->print('</div>');
 	   &Apache::lontemplate::print_end_template($r);
 	    
 	} else {