--- loncom/interface/lonsyllabus.pm 2009/09/26 20:07:58 1.98
+++ 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.98 2009/09/26 20:07:58 amueller Exp $
+# $Id: lonsyllabus.pm,v 1.105 2010/01/28 17:22:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -151,7 +151,7 @@ ENDSCRIPT
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog()",
- text=>"Course Catalog"});
+ text=>"Course/Community Catalog"});
if ($env{'form.coursenum'} ne '') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog('details')",
@@ -238,7 +238,7 @@ ENDSCRIPT
#if you have the register flag, keep it
if($env{'form.register'} == 1) {
$functions.=&Apache::lonhtmlcommon::add_item_funclist(
- ''
+ ''
.&mt('Show Public View').''
.&Apache::loncommon::help_open_topic(
'Uploaded_Templates_PublicView'));
@@ -252,7 +252,7 @@ ENDSCRIPT
} elsif ($privileged) {
if($env{'form.register'} == 1) {
$functions.=&Apache::lonhtmlcommon::add_item_funclist(
- ''
+ ''
.&mt('Edit').'');
} else {
$functions.=&Apache::lonhtmlcommon::add_item_funclist(
@@ -276,7 +276,7 @@ ENDSCRIPT
.'
'
.''
.&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].'
- ,'','')
+ ,'','')
.'
'
);
#-Print Help Text
@@ -409,32 +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 {
- &Apache::lonfeedback::newline_to_br(\$message);
- $message =~s|(https?\://[^\s]+)|$1|g;
+ if (!&Apache::lonfeedback::contains_block_html($message)) {
+ &Apache::lonfeedback::newline_to_br(\$message);
+ } else {
+ $message = &Apache::lonfeedback::tidy_html($message);
+ }
+ $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) {