--- loncom/interface/lontemplate.pm 2011/05/03 21:38:40 1.45 +++ loncom/interface/lontemplate.pm 2013/04/24 02:43:59 1.47 @@ -1,7 +1,7 @@ # The LearningOnline Network # "Template" Functions to generate html output # -# $Id: lontemplate.pm,v 1.45 2011/05/03 21:38:40 www Exp $ +# $Id: lontemplate.pm,v 1.47 2013/04/24 02:43:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -115,8 +115,12 @@ sub print_template { } sub print_start_template { - my ($r,$topic,$boxclass) = @_; - $r->print('
'); + my ($r,$topic,$boxclass,$id,$display) = @_; + my $idattrib; + if ($id ne '') { + $idattrib = ' id="'.$id.'"'; + } + $r->print('
'); $r->print('

'.$topic.'

'); } @@ -128,9 +132,9 @@ sub print_end_template { sub print_editbox_template { my ($r,$content,$field) = @_; $r->print('
'); + &HTML::Entities::encode($content,'"&<>'). + '
'."\n"); + &print_saveall_template($r); } sub print_textarea_template { @@ -146,31 +150,36 @@ sub print_saveall_template { } sub print_template_fields { - my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_; + my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group, + $displayref) = @_; my @html_ids = (); my %data = %{$data_ref}; my %fields = %{$fields_ref}; my %custom_handlers = %{$custom_handlers_ref}; - + my %displays; + if (ref($displayref) eq 'HASH') { + %displays = %{$displayref}; + } foreach my $field (sort(keys(%fields))) { my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed)); my $legacy = 1; + my $display = $displays{$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); + $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display); } else { if (($data{$field}=~/\w/) || ($allowed)) { if ($target ne 'tex') { #output of syllabusfields will be generated here. - &Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box'); + &Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box','box_'.$field,$display); $r->print($message); if ($allowed) { $r->print("
"); &Apache::lontemplate::print_textarea_template($r, $data{$field}, $field, $default_rich_text); - &Apache::lontemplate::print_saveall_template($r); + &print_saveall_template($r); $r->print("
"); } &Apache::lontemplate::print_end_template($r);