--- loncom/interface/lonsimplepage.pm	2008/12/03 22:00:41	1.59
+++ loncom/interface/lonsimplepage.pm	2008/12/16 19:01:45	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.59 2008/12/03 22:00:41 schafran Exp $
+# $Id: lonsimplepage.pm,v 1.60 2008/12/16 19:01:45 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ package Apache::lonsimplepage;
 use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
+use Apache::lontemplate;
 use Apache::lonnet;
 use Apache::lontexconvert;
 use Apache::lonfeedback;
@@ -215,11 +216,14 @@ 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'))
-                 .'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'">'
+	$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>');
+                  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
+		  &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))
+ 		 .'</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>');
     } elsif ($privileged and $target ne 'tex') {
         my $edittext = &mt('Edit');
         if ($group ne '') {
@@ -270,17 +274,17 @@ sub handler {
     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'});
 	    
-	    my $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
+	    $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
                             align="right" />';
 	    if ($target eq 'tex') {
 		$image=&Apache::lonxml::xmlparse($r,'tex',$image);
-	    }
-	    $r->print($image);
-	}
+            }
+        }
 	if ($allowed) {
 	    $r->print(
 		      '<form method="post" enctype="multipart/form-data">'.
@@ -291,6 +295,12 @@ sub handler {
 		      '</form><form method="post">'.
                       '<input type="hidden" name="forceedit" value="edit" />');
 	}
+	&Apache::lontemplate::start_columnSection($r);
+	if($allowed){
+                $r->print($image.'<div class="clear">&nbsp;</div>');
+#'<br style="clear: both;" />');
+        }
+	&Apache::lontemplate::start_ContentBox($r,$allowed);
 	foreach my $field (sort(keys(%syllabusfields))) {
 	    if (($syllabus{$field}) || ($allowed) || 
                 ($field eq 'abb_links' && $group ne '')) {
@@ -319,36 +329,24 @@ sub handler {
                     }
                     if ($allowed) {
                         if ($env{'form.grade_target'} ne 'tex') {
-                            $r->print(
-                                      '<br /><h3>'.&mt('Title').'</h3><textarea cols="80" rows="2" name="'.$field.'">'.
-                                      &HTML::Entities::encode($syllabus{$field},'"&<>').
-                                      '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
+                            $r->print('<br /><h3>'.&mt('Title').'</h3>');
+			    &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);				
                         } else {
                             my $safeinit;
                             $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
                         }
                     }
                 } else {
-		    if (($field ne 'bbb_content') || ($allowed)) {
-			if ($target ne 'tex') {
-			    $r->print('<h3>'.$syllabusfields{$field}.'</h3>');
-			} else {
-			    my $safeinit;
-			    $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
-			}
-		    }
 		    if ($target ne 'tex') {
-			$r->print('<blockquote>'.
-				  $message.'</blockquote>');
+			&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed);
 		    } else {
 			my $safeinit;
+			$r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
 			$r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
 		    }
 		    if ($allowed) {
 			if ($target ne 'tex') {
-			    $r->print('<br /><textarea cols="80" rows="24" name="'.$field.'" id="'.$field.'">'.
-                                      &HTML::Entities::encode($syllabus{$field},'"&<>').
-				      '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
+			    &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
 			} else {
 			    my $safeinit;
 			    $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
@@ -357,6 +355,16 @@ 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>');