--- loncom/interface/lonsyllabus.pm 2009/11/26 05:21:43 1.101
+++ loncom/interface/lonsyllabus.pm 2010/01/28 17:22:34 1.105
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.101 2009/11/26 05:21:43 faziophi Exp $
+# $Id: lonsyllabus.pm,v 1.105 2010/01/28 17:22:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -409,34 +409,50 @@ ENDSCRIPT
}
}
if ($allowed) {
- $r->print('
'.$syllabusfields{$field}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs').'
');
+ &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("
");
+ &Apache::lontemplate::print_textarea_template($r, $syllabus{$field},
+ $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
+ &Apache::lontemplate::print_saveall_template($r);
+ $r->print("
");
+ &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]+)|$1|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("
");
+ &Apache::lontemplate::print_textarea_template($r, $syllabus{$field},
+ $field, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
+ &Apache::lontemplate::print_saveall_template($r);
+ $r->print("
");
+ }
+ &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) {