--- loncom/interface/lonsimplepage.pm	2009/02/16 10:33:32	1.66
+++ loncom/interface/lonsimplepage.pm	2009/02/19 17:32:39	1.67
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.66 2009/02/16 10:33:32 biermanm Exp $
+# $Id: lonsimplepage.pm,v 1.67 2009/02/19 17:32:39 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -216,25 +216,7 @@ sub handler {
     if ($forcestudent or $target eq 'tex') { $allowed=0; }
 
     if ($allowed) {
-	$r->print('<p>'.'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'">'
-                 .'<font size="+1">'.&mt('Show Student View').'</font></a>'.
-                  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
-		  &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))
- 		 .'</p>');                
-    } elsif ($privileged and $target ne 'tex') {
-        my $edittext = &mt('Edit');
-        if ($group ne '') {
-            $edittext = &mt('Edit Group Homepage');
-        }
-	$r->print('<a href="'.$r->uri.'?forceedit=edit'.$refarg.'"><font size="+1">'.$edittext.'</font></a>');
-        if ($group ne '') {
-            if ($group_edit_perm) {
-                $r->print('&nbsp;&nbsp;&nbsp;<font size="+1">'.
-               '<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'.
-               '&amp;state=pick_task&amp;groupname='.$group.'">'.
-               &mt('Edit Group Settings').'</a></font>');
-            }
-        }    
+	$r->print('<p>'.&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')) .'</p>');             
     } 
     if (($env{'form.uploaddoc.filename'} and $target ne 'tex') &&
 	($env{'form.storeupl'}) && ($allowed)) {
@@ -289,6 +271,28 @@ sub handler {
 		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
             }
         }
+	if ($target ne 'tex') {
+		&Apache::lontemplate::print_start_page_functions($r);
+		if($allowed){
+			&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Student View').'</a>'.
+          											&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));	      		
+		}elsif($privileged){
+			my $edittext = &mt('Edit');
+       		 	if ($group ne '') {
+            			$edittext = &mt('Edit Group Homepage');
+        		}
+			&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forceedit=edit'.$refarg.'"><font size="+1">'.$edittext.'</font></a>');
+        		if ($group ne '') {
+            			if ($group_edit_perm) {
+               				 &Apache::lontemplate::print_functions_content($r,'&nbsp;&nbsp;&nbsp;<font size="+1">'.
+               				'<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'.
+               				'&amp;state=pick_task&amp;groupname='.$group.'">'.
+               				&mt('Edit Group Settings').'</a></font>');
+           			}
+      	 	 	}		    
+		}
+		&Apache::lontemplate::print_end_page_functions($r);
+	  }	
 	if ($allowed) {
 	    $r->print(
 		      '<form method="post" enctype="multipart/form-data">'.
@@ -369,13 +373,7 @@ sub handler {
 	
 	if(!$allowed){
 		$r->print($image);
-	}
-	
-	if ($allowed) {
-                $r->print('<p>'.'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'">'
-                        .'<font size="+1">'.&mt('Show Student View').'</font></a>'.
-                        &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
-        }
+	}	
 	if ($allowed && ($env{'form.grade_target'} ne 'tex')) {
 	    $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
 		      ('bbb_content').'</form>');