--- loncom/interface/lontemplate.pm 2013/05/10 23:41:32 1.49 +++ loncom/interface/lontemplate.pm 2025/01/28 19:49:20 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.49 2013/05/10 23:41:32 raeburn Exp $ +# $Id: lontemplate.pm,v 1.52 2025/01/28 19:49:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,7 +86,7 @@ sub print_aboutme_content_template { &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); } if($allowed) { - &print_editbox_template($r,$syllabus{$field},$field); + &print_editbox_template($r,$syllabus{$field},$field,$syllabusfields{$field}); } } else { @@ -116,7 +116,7 @@ sub print_template { sub print_start_template { my ($r,$topic,$boxclass,$id,$display) = @_; - my $idattrib; + my $idattrib; if ($id ne '') { $idattrib = ' id="'.$id.'"'; } @@ -130,16 +130,18 @@ sub print_end_template { } sub print_editbox_template { - my ($r,$content,$field) = @_; - $r->print('
'."\n"); &print_saveall_template($r); } sub print_textarea_template { - my ($r, $content, $field, $wysiwyg) = @_; - $r->print('
'); } @@ -170,11 +172,11 @@ sub print_template_fields { unless ($allowed) { next if ($noshow{$field}); } - my $gateway = Apache::lonhtmlgateway->new($target); - $message = &Encode::decode('utf8', $message); - $message = $gateway->process_outgoing_html($message, $legacy); - if ((%custom_handlers) && ($custom_handlers{$field})) { - $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display); + my $gateway = Apache::lonhtmlgateway->new($target); + $message = &Encode::decode('utf8', $message); + $message = $gateway->process_outgoing_html($message, $legacy); + if ((%custom_handlers) && ($custom_handlers{$field})) { + $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display); } else { if (($data{$field}=~/\w/) || ($allowed)) { if ($target ne 'tex') { @@ -183,8 +185,8 @@ sub print_template_fields { $r->print($message); if ($allowed) { $r->print("
"); - &Apache::lontemplate::print_textarea_template($r, $data{$field}, - $field, $default_rich_text); + &print_textarea_template($r, $data{$field}, + $field, $fields{$field}, $default_rich_text); &print_saveall_template($r); $r->print("
"); }