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

[faziophi]

faziophi		Tue Dec 22 06:31:03 2009 EDT

  Modified files:              
    /loncom/interface	lonsyllabus.pm 
  Log:
  -- Upgrading syllabus page 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/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.103 loncom/interface/lonsyllabus.pm:1.104
--- loncom/interface/lonsyllabus.pm:1.103	Thu Dec  3 02:13:28 2009
+++ loncom/interface/lonsyllabus.pm	Tue Dec 22 06:31:02 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.103 2009/12/03 02:13:28 www Exp $
+# $Id: lonsyllabus.pm,v 1.104 2009/12/22 06:31:02 faziophi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -409,37 +409,51 @@
                         }
                     }
                     if ($allowed) {
-                        if (!&Apache::lonfeedback::contains_block_html($urls)) {
-                             &Apache::lonfeedback::newline_to_br(\$urls);
-                         }
-                         &Apache::lontemplate::print_template($r, $syllabusfields{$field}.
-                                  &Apache::loncommon::help_open_topic('Syllabus_URLs'), $urls,$allowed,'LC_Box');
+                         &Apache::lonfeedback::newline_to_br(\$urls);
+                         &Apache::lontemplate::print_start_template($r,$syllabusfields{$field}.
+                         		  &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box');
+                         $r->print($urls);
+                         $r->print("<br /><div>");
+						 &Apache::lontemplate::print_textarea_template($r, $syllabus{$field},
+						 	$field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
+						 &Apache::lontemplate::print_saveall_template($r);                         
+						 $r->print("</div>");
+						 &Apache::lontemplate::print_end_template($r);
+
                     } else {
                         $r->print($message);
                     }
                 } else {
                     if (!&Apache::lonfeedback::contains_block_html($message)) {
                     	&Apache::lonfeedback::newline_to_br(\$message);
-                    }
+                    } else {
+                    	$message = &Apache::lonfeedback::tidy_html($message);
+					}
+                    $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
                     $message=&Apache::lonhtmlcommon::raw_href_to_link($message);
+
                     if ($allowed) {
                         $message=&Apache::lonspeller::markeduptext($message);
                     }
                     $message=&Apache::lontexconvert::msgtexconverted($message);
                     if ($target ne 'tex') {
 						#output of syllabusfields will be generated here. 
-                        &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box');
+						&Apache::lontemplate::print_start_template($r,$syllabusfields{$field},'LC_Box');
+                        $r->print($message);
+                        if ($allowed) {
+                            $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 {
                         $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
                         &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
                     }
                     push(@htmlids,$field);
                 }
-                if ($allowed) {
-                    if ($target ne 'tex') {
-                        &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
-                    }
-                }
             }
         }
         if ($allowed) {