--- loncom/interface/lonsimplepage.pm	2009/02/24 18:20:49	1.71
+++ loncom/interface/lonsimplepage.pm	2009/02/25 13:25:52	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.71 2009/02/24 18:20:49 hauer Exp $
+# $Id: lonsimplepage.pm,v 1.72 2009/02/25 13:25:52 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -214,10 +214,7 @@ sub handler {
     }
 
     if ($forcestudent or $target eq 'tex') { $allowed=0; }
-
-    if ($allowed) {
-	$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)) {
 	if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
@@ -256,27 +253,13 @@ sub handler {
 	&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
     }
 
-# ---------------------------------------------------------------- Get syllabus
-    if ((($syllabus{'uploaded.lastmodified'}) && 
-         (($group ne '' && ($group_home_view || $group_edit_perm ||  
-           $group_view_perm)) || ($group eq ''))) || ($allowed)) {
-	my $image;
-	if ($syllabus{'uploaded.photourl'}) {
-	    &Apache::lonnet::allowuploaded('/adm/smppg',
-					   $syllabus{'uploaded.photourl'});
-	    
-	    $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
-                            />';
-	    if ($target eq 'tex') {
-		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
-            }
-        }
+#---Print Function
 	if ($target ne 'tex') {
 		if($allowed || $privileged){
 			&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'));	      		
+				&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'));	      		
+				&Apache::lontemplate::print_functions_content($r,&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); 
 			}elsif($privileged){
 				my $edittext = &mt('Edit');
        		 		if ($group ne '') {
@@ -295,6 +278,23 @@ sub handler {
 			&Apache::lontemplate::print_end_page_functions($r);
 		}
 	  }	
+
+# ---------------------------------------------------------------- Get syllabus
+    if ((($syllabus{'uploaded.lastmodified'}) && 
+         (($group ne '' && ($group_home_view || $group_edit_perm ||  
+           $group_view_perm)) || ($group eq ''))) || ($allowed)) {
+	my $image;
+	if ($syllabus{'uploaded.photourl'}) {
+	    &Apache::lonnet::allowuploaded('/adm/smppg',
+					   $syllabus{'uploaded.photourl'});
+	    
+	    $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
+                            />';
+	    if ($target eq 'tex') {
+		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
+            }
+        }
+	
 	if ($allowed) {
 	    $r->print(
 		      '<form method="post" enctype="multipart/form-data">'.