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

[faziophi]

faziophi		Tue Dec 22 06:32:35 2009 EDT

  Modified files:              
    /loncom/interface	lonsimplepage.pm 
  Log:
  -- Upgrading simple page template to use new CKEditor
  -- Move textareas and save buttons  within the LC_Box templates
  -- Use rich text editor if HTML is detected, else allow user to 
     enable on demand
  
  
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.90 loncom/interface/lonsimplepage.pm:1.91
--- loncom/interface/lonsimplepage.pm:1.90	Tue Dec 15 20:48:53 2009
+++ loncom/interface/lonsimplepage.pm	Tue Dec 22 06:32:35 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.90 2009/12/15 20:48:53 amueller Exp $
+# $Id: lonsimplepage.pm,v 1.91 2009/12/22 06:32:35 faziophi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -300,7 +300,7 @@
          (($group ne '' && ($group_home_view || $group_edit_perm ||
            $group_view_perm)) || ($group eq ''))) || ($allowed)) {
         #Print the title
-        my $titletext=$syllabus{'aaa_title'};
+        my $titletext=&HTML::Entities::encode($syllabus{'aaa_title'},'<>&"');
         if ($target ne 'tex') {
             if ($allowed) {
             }
@@ -313,8 +313,14 @@
             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');
+				&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));
@@ -381,8 +387,9 @@
                 } else {
                     if ($target ne 'tex') {
                         if ($allowed) {
+                        } 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>'));
@@ -390,8 +397,16 @@
                     }
                     if ($allowed) {
                         if ($target ne 'tex') {
-                            &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
-                        } 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));
                         }