--- loncom/interface/lonsimplepage.pm	2009/02/19 17:32:39	1.67
+++ 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.67 2009/02/19 17:32:39 neumanie 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,6 +253,32 @@ sub handler {
 	&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
     }
 
+#---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,&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); 
+			}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.'">'.$edittext.'</a>');
+        			if ($group ne '') {
+            				if ($group_edit_perm) {
+               				 	&Apache::lontemplate::print_functions_content($r,'&nbsp;&nbsp;&nbsp;'.
+               					'<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'.
+               					'&amp;state=pick_task&amp;groupname='.$group.'">'.
+               					&mt('Edit Group Settings').'</a>');
+           				}
+      	 	 		}		    
+			}
+			&Apache::lontemplate::print_end_page_functions($r);
+		}
+	  }	
+
 # ---------------------------------------------------------------- Get syllabus
     if ((($syllabus{'uploaded.lastmodified'}) && 
          (($group ne '' && ($group_home_view || $group_edit_perm ||  
@@ -271,28 +294,7 @@ 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">'.
@@ -305,7 +307,7 @@ sub handler {
 		      '<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' );
 	}	
 	if($allowed){
-                $r->print($image.'<div class="clear">&nbsp;</div>');
+               $r->print($image.'<div class="clear">&nbsp;</div>');
        }
 	
 	foreach my $field (sort(keys(%syllabusfields))) {
@@ -332,21 +334,24 @@ sub handler {
 			if($allowed){
 				$r->print('<p>');
 			}
-                        $r->print('<h1>'.$message.'</h1>');
+			$r->print('<div class="LC_ContentBoxSpecial">');
+                        $r->print('<h2 class="LC_hcell">'.$message.'</h2>');
+			$r->print('<blockquote>');
                     } else {
                         my $safeinit;
                         $r->print(&Apache::lonxml::xmlparse($r,'tex','<h1>'.$message.'</h1>'));
                     }
                     if ($allowed) {
-                        if ($env{'form.grade_target'} ne 'tex') {
-                            $r->print('<br /><h3>'.&mt('Title').'</h3>');
+                        if ($env{'form.grade_target'} ne 'tex') {                         
+			    &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial'); 
 			    &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);				
 			    $r->print('</p>');
                         } else {
                             my $safeinit;
                             $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
                         }
-                    }
+                    } 
+		    if(!$allowed) {$r->print($image); } 
                 } else {
 		    if ($target ne 'tex') {
 			if($allowed){
@@ -370,10 +375,6 @@ sub handler {
 		}
 	    }
 	}
-	
-	if(!$allowed){
-		$r->print($image);
-	}	
 	if ($allowed && ($env{'form.grade_target'} ne 'tex')) {
 	    $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
 		      ('bbb_content').'</form>');
@@ -386,6 +387,9 @@ 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 {
@@ -408,7 +412,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'}} = (
@@ -457,7 +461,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));