[LON-CAPA-cvs] cvs: loncom /interface lonsimplepage.pm

amueller amueller@source.lon-capa.org
Tue, 15 Dec 2009 20:48:53 -0000


amueller		Tue Dec 15 20:48:53 2009 EDT

  Modified files:              
    /loncom/interface	lonsimplepage.pm 
  Log:
  -XHTML conformance.
  
  
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.89 loncom/interface/lonsimplepage.pm:1.90
--- loncom/interface/lonsimplepage.pm:1.89	Sat Dec 12 14:45:42 2009
+++ loncom/interface/lonsimplepage.pm	Tue Dec 15 20:48:53 2009
@@ -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.90 2009/12/15 20:48:53 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -303,7 +303,6 @@
         my $titletext=$syllabus{'aaa_title'};
         if ($target ne 'tex') {
             if ($allowed) {
-                $r->print('<p>');
             }
             $r->print('<h2>'.$titletext.'</h2>');
         } else {
@@ -316,7 +315,6 @@
                 $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));
@@ -383,7 +381,6 @@
                 } else {
                     if ($target ne 'tex') {
                         if ($allowed) {
-                            $r->print('<p>');
                         }
                         &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
                     } else {
@@ -394,7 +391,6 @@
                     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));
@@ -407,7 +403,6 @@
             $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
                 ('bbb_content').'</form>');
         }
-        if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');}
 
     } else {
         if ($group ne '') {