--- loncom/interface/lonsimplepage.pm	2009/12/08 12:20:49	1.88
+++ loncom/interface/lonsimplepage.pm	2009/12/15 20:48:53	1.90
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.88 2009/12/08 12:20:49 amueller Exp $
+# $Id: lonsimplepage.pm,v 1.90 2009/12/15 20:48:53 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -303,7 +303,6 @@ sub handler {
         my $titletext=$syllabus{'aaa_title'};
         if ($target ne 'tex') {
             if ($allowed) {
-                $r->print('<p>');
             }
             $r->print('<h2>'.$titletext.'</h2>');
         } else {
@@ -316,7 +315,6 @@ sub handler {
                 $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>');
             } else {
                 my $safeinit;
                 $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{'aaa_title'},$safeinit));
@@ -337,12 +335,17 @@ sub handler {
         }
 
         if ($allowed) {
-            $r->print(
-                  '<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').'" />'.
-                  '<input type="hidden" name="forceedit" value="edit" />');
+            $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');
+
 #            if ($syllabus{'uploaded.photourl'}) {
 #                $r->print('<input type="submit" name="delupl"'
 #                         .' value="'.&mt('Delete Photo').'" />');
@@ -378,7 +381,6 @@ sub handler {
                 } else {
                     if ($target ne 'tex') {
                         if ($allowed) {
-                            $r->print('<p>');
                         }
                         &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
                     } else {
@@ -389,7 +391,6 @@ 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));
@@ -402,7 +403,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 '') {