--- loncom/interface/lonsimplepage.pm	2009/02/23 22:36:30	1.70
+++ loncom/interface/lonsimplepage.pm	2009/02/25 23:27:21	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.70 2009/02/23 22:36:30 schualex Exp $
+# $Id: lonsimplepage.pm,v 1.73 2009/02/25 23:27:21 schualex 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">'.
@@ -334,9 +334,7 @@ sub handler {
 			if($allowed){
 				$r->print('<p>');
 			}
-			$r->print('<div class="LC_ContentBoxSpecial">');
-                        $r->print('<h2 class="LC_hcell">'.$message.'</h2>');
-			$r->print('<blockquote>');
+                        $r->print('<h2>'.$message.'</h2>');
                     } else {
                         my $safeinit;
                         $r->print(&Apache::lonxml::xmlparse($r,'tex','<h1>'.$message.'</h1>'));
@@ -387,9 +385,6 @@ sub handler {
 	    $r->print('<p>'.&mt('No page information provided.').'</p>');
         }
     }
-    
-    $r->print('</blockquote>');
-    $r->print('</div>');
     if ($env{'form.grade_target'} ne 'tex') {
 	$r->print(&Apache::loncommon::end_page());
     } else {
@@ -412,7 +407,7 @@ sub display_group_links {
                         href => '/adm/groupboards?group='.$group.$refarg,
                       );
     %{$menu{'chat'}} = (
-                        text => 'Group Chat',
+                        text => 'Group Chat Room',
                         href => "javascript:group_chat('$group')",
                       );
     %{$menu{'files'}} = (
@@ -461,7 +456,7 @@ sub display_group_links {
         if ($context eq 'edit') {
             $output = &mt('No group functionality.');
         } else {  
-            $output = &mt('No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: [_1].','<b>'.&unescape($groupinfo{'description'}).'</b>');
+            $output = &mt('No group functionality (e.g., e-mail, discussion, chat room or file upload) is currently available to you in this group: [_1].','<b>'.&unescape($groupinfo{'description'}).'</b>');
         }
         if ($target eq 'tex') {
             $r->print(&Apache::lonxml::xmlparse($r,'tex',$output));