--- loncom/interface/lonsimplepage.pm	2009/12/12 14:45:42	1.89
+++ loncom/interface/lonsimplepage.pm	2010/01/07 14:45:08	1.92
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.89 2009/12/12 14:45:42 amueller Exp $
+# $Id: lonsimplepage.pm,v 1.92 2010/01/07 14:45:08 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -300,10 +300,9 @@ sub handler {
          (($group ne '' && ($group_home_view || $group_edit_perm ||
            $group_view_perm)) || ($group eq ''))) || ($allowed)) {
         #Print the title
-        my $titletext=$syllabus{'aaa_title'};
+        my $titletext=&HTML::Entities::encode($syllabus{'aaa_title'},'<>&"');
         if ($target ne 'tex') {
             if ($allowed) {
-                $r->print('<p>');
             }
             $r->print('<h2>'.$titletext.'</h2>');
         } else {
@@ -314,9 +313,14 @@ sub handler {
             if ($env{'form.grade_target'} ne 'tex') {
                 #editbox for title
                 $r->print('<form method="post" action="" enctype="multipart/form-data">');
-                &Apache::lontemplate::print_template($r, &mt('Title'), $titletext, $allowed, 'LC_Box');
-                &Apache::lontemplate::print_editbox_template($r,$syllabus{'aaa_title'},'aaa_title');
-                $r->print('</p>');
+				&Apache::lontemplate::print_start_template($r,&mt('Title'),'LC_Box');
+				$r->print($titletext);
+				$r->print("<br /><div>");
+				&Apache::lontemplate::print_textarea_template($r, $syllabus{'aaa_title'},
+					'aaa_title', Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
+				&Apache::lontemplate::print_saveall_template($r);
+				$r->print("</div>");
+				&Apache::lontemplate::print_end_template($r);
             } else {
                 my $safeinit;
                 $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{'aaa_title'},$safeinit));
@@ -324,7 +328,7 @@ sub handler {
         }
 
         #print the image
-        my $image;
+        my $image='';
         if ($syllabus{'uploaded.photourl'}) {
             &Apache::lonnet::allowuploaded('/adm/smppg',
                     $syllabus{'uploaded.photourl'});
@@ -337,26 +341,26 @@ sub handler {
         }
 
         if ($allowed) {
-            $r->print('<input type="hidden" name="forceedit" value="edit" />');
-            my $upload_photo_label = &mt('Upload a Photo');
-            my $upload_button_label = &mt('Upload');
-
-            my $content_for_upload_photo=<<"UPLOAD_PHOTO";
-                  <input type="file" name="uploaddoc" size="50" />
-                  <input type="submit" name="storeupl" value="$upload_button_label" />
-                  <input type="hidden" name="forceedit" value="edit" />
-UPLOAD_PHOTO
-            &Apache::lontemplate::print_template($r, $upload_photo_label,$content_for_upload_photo,$allowed, 'LC_Box');
+            &Apache::lontemplate::print_start_template($r, &mt('Upload a Photo'),'LC_Box');
+            $r->print($image);
+            $r->print("<br /><br />");
+            $r->print(
+                '<input type="hidden" name="forceedit" value="edit" />'.
+                '<input type="file" name="uploaddoc" size="50" />'.
+                '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
+                '<input type="hidden" name="forceedit" value="edit" />');
+            &Apache::lontemplate::print_end_template($r);
+    
 
 #            if ($syllabus{'uploaded.photourl'}) {
 #                $r->print('<input type="submit" name="delupl"'
 #                         .' value="'.&mt('Delete Photo').'" />');
 #            }
         }
-        if ($allowed) {
-            $r->print($image.'<div class="LC_footer_clear">&nbsp;</div>');
+        #Image in Student view and printout.
+        else {
+            $r->print($image);
         }
-        if (!$allowed) {$r->print($image); }
 
         foreach my $field (sort(keys(%syllabusfields))) {
             if (($syllabus{$field}) || ($allowed) ||
@@ -383,9 +387,9 @@ UPLOAD_PHOTO
                 } else {
                     if ($target ne 'tex') {
                         if ($allowed) {
-                            $r->print('<p>');
+                        } else {
+                        	&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
                         }
-                        &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
                     } else {
                         my $safeinit;
                         $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
@@ -393,9 +397,16 @@ UPLOAD_PHOTO
                     }
                     if ($allowed) {
                         if ($target ne 'tex') {
-                            &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
-                            $r->print('</p>');
-                        } else {
+							#output of syllabusfields will be generated here. 
+							&Apache::lontemplate::print_start_template($r,$syllabusfields{$field},'LC_Box');
+							$r->print($message);
+							$r->print("<br /><div>");
+							&Apache::lontemplate::print_textarea_template($r, $syllabus{$field},
+								$field, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
+							&Apache::lontemplate::print_saveall_template($r);
+							$r->print("</div>");
+							&Apache::lontemplate::print_end_template($r);                        
+						} else {
                             my $safeinit;
                             $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
                         }
@@ -407,7 +418,6 @@ UPLOAD_PHOTO
             $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
                 ('bbb_content').'</form>');
         }
-        if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');}
 
     } else {
         if ($group ne '') {