--- loncom/interface/lonsimplepage.pm	2009/01/28 14:45:06	1.64
+++ loncom/interface/lonsimplepage.pm	2009/02/23 22:36:30	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.64 2009/01/28 14:45:06 bisitz Exp $
+# $Id: lonsimplepage.pm,v 1.70 2009/02/23 22:36:30 schualex Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,9 +139,9 @@ sub handler {
 # --------------------------------------- There is such a user, get environment
 
     if ($target ne 'tex') {
-        my $title = 'Course Page';
+        my $title = 'Simple Course Page';
         if ($group ne '') {
-            $title = 'Group Page';
+            $title = 'Simple Group Page';
         }
 	my $start_page = 
 	    &Apache::loncommon::start_page($title,undef,
@@ -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)) {
@@ -284,11 +266,35 @@ sub handler {
 					   $syllabus{'uploaded.photourl'});
 	    
 	    $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
-                            align="right" />';
+                            />';
 	    if ($target eq 'tex') {
 		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
             }
         }
+	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'));	      		
+			}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);
+		}
+	  }	
 	if ($allowed) {
 	    $r->print(
 		      '<form method="post" enctype="multipart/form-data">'.
@@ -299,12 +305,11 @@ sub handler {
 		      '</form><form method="post">'.
                       '<input type="hidden" name="forceedit" value="edit" />'.
 		      '<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' );
-	}
-	&Apache::lontemplate::start_columnSection($r);
+	}	
 	if($allowed){
-                $r->print($image.'<div class="clear">&nbsp;</div>');
-        }
-	&Apache::lontemplate::start_ContentBox($r,$allowed);
+               $r->print($image.'<div class="clear">&nbsp;</div>');
+       }
+	
 	foreach my $field (sort(keys(%syllabusfields))) {
 	    if (($syllabus{$field}) || ($allowed) || 
                 ($field eq 'abb_links' && $group ne '')) {
@@ -329,27 +334,30 @@ 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){
 				$r->print('<p>');
 			}	
-			&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed);
+			&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
 		    } else {
 			my $safeinit;
 			$r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
@@ -367,16 +375,6 @@ sub handler {
 		}
 	    }
 	}
-	&Apache::lontemplate::end_ContentBox($r);
-	if(!$allowed){
-		$r->print($image);
-	}
-	&Apache::lontemplate::end_columnSection($r);
-	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>');
@@ -389,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 {