--- loncom/interface/lonsimplepage.pm	2009/07/10 15:05:28	1.85
+++ 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.85 2009/07/10 15:05:28 bisitz Exp $
+# $Id: lonsimplepage.pm,v 1.92 2010/01/07 14:45:08 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -232,13 +232,13 @@ sub handler {
         $syllabus{'uploaded.lastmodified'}=time;
         &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
     }
-    if ($allowed && $env{'form.delupl'}) {
-        if ($syllabus{'uploaded.photourl'}) {
-            &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
-            delete($syllabus{'uploaded.photourl'});
-            &Apache::lonnet::del('simplepage',['uploaded.photourl']);
-        }
-    }
+#    if ($allowed && $env{'form.delupl'}) {
+#        if ($syllabus{'uploaded.photourl'}) {
+#            &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
+#            delete($syllabus{'uploaded.photourl'});
+#            &Apache::lonnet::del('simplepage',['uploaded.photourl']);
+#        }
+#    }
     if (($allowed) && ($env{'form.storesyl'})) {
         foreach my $syl_field (keys(%syllabusfields)) {
             my $field=$env{'form.'.$syl_field};
@@ -299,7 +299,36 @@ sub handler {
     if ((($syllabus{'uploaded.lastmodified'}) &&
          (($group ne '' && ($group_home_view || $group_edit_perm ||
            $group_view_perm)) || ($group eq ''))) || ($allowed)) {
-        my $image;
+        #Print the title
+        my $titletext=&HTML::Entities::encode($syllabus{'aaa_title'},'<>&"');
+        if ($target ne 'tex') {
+            if ($allowed) {
+            }
+            $r->print('<h2>'.$titletext.'</h2>');
+        } else {
+            my $safeinit;
+            $r->print(&Apache::lonxml::xmlparse($r,'tex','<h1>'.$titletext.'</h1>'));
+        }
+        if ($allowed) {
+            if ($env{'form.grade_target'} ne 'tex') {
+                #editbox for title
+                $r->print('<form method="post" action="" enctype="multipart/form-data">');
+				&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));
+            }
+        }
+
+        #print the image
+        my $image='';
         if ($syllabus{'uploaded.photourl'}) {
             &Apache::lonnet::allowuploaded('/adm/smppg',
                     $syllabus{'uploaded.photourl'});
@@ -312,28 +341,34 @@ sub handler {
         }
 
         if ($allowed) {
+            &Apache::lontemplate::print_start_template($r, &mt('Upload a Photo'),'LC_Box');
+            $r->print($image);
+            $r->print("<br /><br />");
             $r->print(
-                  '<form method="post" action="" enctype="multipart/form-data">'.
-                  '<input type="hidden" name="forceedit" value="edit" />'.
-                  '<h3>'.&mt('Upload a Photo').'</h3>'.
-                  '<input type="file" name="uploaddoc" size="50" />'.
-                  '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
-                  '</form><form method="post" action="">'.
-                  '<input type="hidden" name="forceedit" value="edit" />');
-            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>');
+                '<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').'" />');
+#            }
+        }
+        #Image in Student view and printout.
+        else {
+            $r->print($image);
         }
 
         foreach my $field (sort(keys(%syllabusfields))) {
             if (($syllabus{$field}) || ($allowed) ||
                 ($field eq 'abb_links' && $group ne '')) {
                 my $message=$syllabus{$field};
-                &Apache::lonfeedback::newline_to_br(\$message);
+                if (!&Apache::lonfeedback::contains_block_html($message)) {
+               		&Apache::lonfeedback::newline_to_br(\$message);
+               	}
                 $message=~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
                 if ($allowed) {
                     $message=&Apache::lonspeller::markeduptext($message);
@@ -348,32 +383,13 @@ sub handler {
                                     %groupinfo);
                     $r->print('<br />');
                 } elsif ($field eq 'aaa_title') {
-                    if ($target ne 'tex') {
-                        if ($allowed) {
-                            $r->print('<p>');
-                        }
-                        $r->print('<h2>'.$message.'</h2>');
-                    } else {
-                        my $safeinit;
-                        $r->print(&Apache::lonxml::xmlparse($r,'tex','<h1>'.$message.'</h1>'));
-                    }
-                    if ($allowed) {
-                        if ($env{'form.grade_target'} ne 'tex') {
-                            &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_Box');
-                            &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); }
+                    next;
                 } 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>'));
@@ -381,9 +397,16 @@ sub handler {
                     }
                     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));
                         }
@@ -395,7 +418,6 @@ sub handler {
             $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
                 ('bbb_content').'</form>');
         }
-        if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');}
 
     } else {
         if ($group ne '') {