--- loncom/interface/lonaboutme.pm	2009/06/08 18:04:45	1.137
+++ loncom/interface/lonaboutme.pm	2009/06/11 16:48:33	1.138
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.137 2009/06/08 18:04:45 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.138 2009/06/11 16:48:33 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,7 +203,6 @@ sub handler {
                    ($env{'user.domain'} eq $cdom));
     if ($forcestudent or $target eq 'tex') { $allowed=0; }
 
-
 # --------------------------------------- There is such a user, get environment
 
     if ($target ne 'tex') {
@@ -218,7 +217,56 @@ sub handler {
         }
         my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args);
         $r->print($start_page);
+   }
 
+#----------------Print Functions
+    if ($target ne 'tex') {
+        my $functions=&Apache::lonhtmlcommon::start_funclist();
+        if ($allowed) {
+            my $query_string = &build_query_string(
+                                   {'forcestudent' => '1',
+                                    'popup' => $env{'form.popup'}});
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                            '<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'}});
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                            '<a href="'.$r->uri.$query_string.'">'
+                            .&mt('Edit').'</a>');
+        }
+        $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                        &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'})) {
+                $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                     &Apache::loncommon::track_student_link(
+                         'View recent activity by this student',$cnum,$cdom));
+            }
+            if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||
+                &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+                $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                    &Apache::loncommon::slot_reservations_link(
+                        'Slot reservation history',$cnum,$cdom));
+            }
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                           &Apache::loncommon::noteswrapper(
+                               &mt('Add Records'),$cnum,$cdom));
+        }
+        $functions.=&Apache::lonhtmlcommon::end_funclist();
+        $r->print(&Apache::loncommon::head_subbox($functions));
+    }
+
+# Print Privacy Note
+    if ($target ne 'tex') {
         #Print Privacy Note
         if ($allowed) {
             $r->print('<div class="LC_info">'
@@ -227,9 +275,11 @@ sub handler {
                 .'</div>'
             );
         }
+    }
 
 #Print last modified
 
+    if ($target ne 'tex') {
         my $lastmod;
         if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
             $lastmod=$syllabus{'uploaded.lastmodified'};
@@ -246,37 +296,6 @@ sub handler {
         }
     }
 
-#----------------Print Functions
-    if ($target ne 'tex') {
-         $r->print(&Apache::lontemplate::start_functionslist());
-         if ($allowed) {
-             my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
-             $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'}});
-             $r->print(&Apache::lontemplate::item_functionslist(
-                 '<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>'));
-         }
-         $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 (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
-                     $r->print(&Apache::lontemplate::item_functionslist(
-                         &Apache::loncommon::track_student_link('View recent activity by this student',$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)));
-         }
-         $r->print(&Apache::lontemplate::end_functionslist());
-    }
 #------Print Headtitle
      if ($target ne 'tex') {
         $r->print('<div class="LC_Box">');