--- loncom/interface/lonsimplepage.pm	2009/05/19 09:59:48	1.82
+++ 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.82 2009/05/19 09:59:48 amueller Exp $
+# $Id: lonsimplepage.pm,v 1.90 2009/12/15 20:48:53 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -182,7 +182,7 @@ sub handler {
             my $msg =
             &mt('You do not currently have rights to view this group.');
             if ($target ne 'tex') {
-                $r->print("<p>$msg</p>".
+                $r->print('<p class="LC_warning">'.$msg.'</p>'.
                 &Apache::loncommon::end_page());
             } else {
                 $r->print('\textbf{'.$msg.'}\end{document}');
@@ -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};
@@ -253,37 +253,45 @@ sub handler {
         &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
     }
 
-#---Print help Text
-    if($target ne 'tex'){
-        if ($allowed) {
-            $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
-        }
-    }
 #---Print Function
     if ($target ne 'tex') {
         if ($allowed || $privileged) {
-            $r->print(&Apache::lontemplate::start_functionslist());
+            my $functions=&Apache::lonhtmlcommon::start_funclist();
             if ($allowed) {
-                $r->print(&Apache::lontemplate::item_functionslist(
-                '<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Student View').'</a>'
-                .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
+                $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                                '<a href="'.$r->uri.'?forcestudent=1">'
+                               .&mt('Show Student View').'</a>'
+                               .&Apache::loncommon::help_open_topic(
+                                    'Uploaded_Templates_PublicView'));
             } elsif ($privileged) {
                 my $edittext = &mt('Edit');
                     if ($group ne '') {
                     $edittext = &mt('Edit Group Homepage');
                 }
-                $r->print(&Apache::lontemplate::item_functionslist(
-                '<a href="'.$r->uri.'?forceedit=edit'.$refarg.'">'.$edittext.'</a>'));
+                $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                                '<a href="'.$r->uri.'?forceedit=edit'.$refarg.'">'
+                               .$edittext.'</a>');
                 if ($group ne '') {
                     if ($group_edit_perm) {
-                        $r->print(&Apache::lontemplate::item_functionslist(
-                        '<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'
-                        .'&amp;state=pick_task&amp;groupname='.$group.'">'
-                        .&mt('Edit Group Settings').'</a>'));
+                        $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                                        '<a href="/adm/coursegroups'
+                                       .'?action=modify&amp;refpage=grouplist'
+                                       .'&amp;state=pick_task&amp;groupname='
+                                       .$group.'">'
+                                       .&mt('Edit Group Settings')
+                                       .'</a>');
                        }
                     }
             }
-            $r->print(&Apache::lontemplate::end_functionslist());
+            $functions.=&Apache::lonhtmlcommon::end_funclist();
+            $r->print(&Apache::loncommon::head_subbox($functions));
+        }
+    }
+
+#---Print help Text
+    if($target ne 'tex'){
+        if ($allowed) {
+            $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
         }
     }
 
@@ -291,40 +299,70 @@ sub handler {
     if ((($syllabus{'uploaded.lastmodified'}) &&
          (($group ne '' && ($group_home_view || $group_edit_perm ||
            $group_view_perm)) || ($group eq ''))) || ($allowed)) {
+        #Print the title
+        my $titletext=$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_template($r, &mt('Title'), $titletext, $allowed, 'LC_Box');
+                &Apache::lontemplate::print_editbox_template($r,$syllabus{'aaa_title'},'aaa_title');
+            } 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'});
 
-            $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
-                            />';
+            $image='<img src="'.$syllabus{'uploaded.photourl'}
+                  .'" alt="'.&mt('Image').'" />';
             if ($target eq 'tex') {
                 $image=&Apache::lonxml::xmlparse($r,'tex',$image);
             }
         }
 
         if ($allowed) {
-            $r->print(
-                  '<form method="post" 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">'.
-                  '<input type="hidden" name="forceedit" value="edit" />');
-            if ($syllabus{'uploaded.photourl'}) {
-                $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' );
-            }
+            $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').'" />');
+#            }
         }
         if ($allowed) {
-            $r->print($image.'<div class="clear">&nbsp;</div>');
+            $r->print($image.'<div class="LC_footer_clear">&nbsp;</div>');
         }
+        if (!$allowed) {$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);
@@ -339,32 +377,12 @@ 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_ContentBoxSpecial');
-                            &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>');
                         }
-                        &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+                        &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>'));
@@ -373,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));
@@ -386,13 +403,17 @@ sub handler {
             $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
                 ('bbb_content').'</form>');
         }
-        if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');}
 
     } else {
         if ($group ne '') {
             &display_group_links($r,$target,$group,'view',$refarg,%groupinfo);
         } else {
-            $r->print('<p>'.&mt('No page information provided.').'</p>');
+            my $text=&mt('No page information provided.');
+            if ($target ne 'tex') {
+                $r->print('<p class="LC_info">'.$text.'</p>');
+            } else {
+            $r->print($text)
+            }
         }
     }
     if ($env{'form.grade_target'} ne 'tex') {