--- loncom/interface/lonsimplepage.pm	2008/12/16 19:01:45	1.60
+++ loncom/interface/lonsimplepage.pm	2008/12/22 00:00:51	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.60 2008/12/16 19:01:45 ehlerst Exp $
+# $Id: lonsimplepage.pm,v 1.63 2008/12/22 00:00:51 riegler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -221,9 +221,6 @@ sub handler {
                   &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 '') {
@@ -256,6 +253,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.storesyl'})) {
 	foreach my $syl_field (keys(%syllabusfields)) {
 	    my $field=$env{'form.'.$syl_field};
@@ -293,12 +297,12 @@ sub handler {
 		      '<input type="file" name="uploaddoc" size="50" />'.
 		      '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
 		      '</form><form method="post">'.
-                      '<input type="hidden" name="forceedit" value="edit" />');
+                      '<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>');
-#'<br style="clear: both;" />');
         }
 	&Apache::lontemplate::start_ContentBox($r,$allowed);
 	foreach my $field (sort(keys(%syllabusfields))) {
@@ -322,6 +326,9 @@ sub handler {
                     $r->print('<br />');
                 } elsif ($field eq 'aaa_title') {
                     if ($target ne 'tex') {
+			if($allowed){
+				$r->print('<p>');
+			}
                         $r->print('<h1>'.$message.'</h1>');
                     } else {
                         my $safeinit;
@@ -331,6 +338,7 @@ sub handler {
                         if ($env{'form.grade_target'} ne 'tex') {
                             $r->print('<br /><h3>'.&mt('Title').'</h3>');
 			    &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));
@@ -338,6 +346,9 @@ sub handler {
                     }
                 } else {
 		    if ($target ne 'tex') {
+			if($allowed){
+				$r->print('<p>');
+			}	
 			&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed);
 		    } else {
 			my $safeinit;
@@ -347,6 +358,7 @@ sub handler {
 		    if ($allowed) {
 			if ($target ne 'tex') {
 			    &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));