Diff for /loncom/interface/lontemplate.pm between versions 1.46 and 1.47

version 1.46, 2012/12/18 15:46:34 version 1.47, 2013/04/24 02:43:59
Line 115  sub print_template { Line 115  sub print_template {
 }  }
   
 sub print_start_template {  sub print_start_template {
  my ($r,$topic,$boxclass) = @_;   my ($r,$topic,$boxclass,$id,$display) = @_;
  $r->print('<div class="'.$boxclass.'">');          my $idattrib; 
           if ($id ne '') {
               $idattrib = ' id="'.$id.'"';
           }
    $r->print('<div class="'.$boxclass.'"'.$idattrib.$display.'>');
  $r->print('<h4 class="LC_hcell">'.$topic.'</h4>');   $r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
 }  }
   
Line 146  sub print_saveall_template { Line 150  sub print_saveall_template {
 }  }
   
 sub print_template_fields {  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 @html_ids = ();
  my %data = %{$data_ref};   my %data = %{$data_ref};
  my %fields = %{$fields_ref};   my %fields = %{$fields_ref};
  my %custom_handlers = %{$custom_handlers_ref};   my %custom_handlers = %{$custom_handlers_ref};
           my %displays;
           if (ref($displayref) eq 'HASH') {
               %displays = %{$displayref};
           }
  foreach my $field (sort(keys(%fields))) {   foreach my $field (sort(keys(%fields))) {
  my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));   my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));
  my $legacy = 1;   my $legacy = 1;
                   my $display = $displays{$field};
  my $gateway = Apache::lonhtmlgateway->new($target);   my $gateway = Apache::lonhtmlgateway->new($target);
         $message = &Encode::decode('utf8', $message);          $message = &Encode::decode('utf8', $message);
         $message = $gateway->process_outgoing_html($message, $legacy);          $message = $gateway->process_outgoing_html($message, $legacy);
         if ((%custom_handlers) && ($custom_handlers{$field})) {          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 {   } else {
  if (($data{$field}=~/\w/) || ($allowed)) {   if (($data{$field}=~/\w/) || ($allowed)) {
  if ($target ne 'tex') {   if ($target ne 'tex') {
  #output of syllabusfields will be generated here.    #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);   $r->print($message);
  if ($allowed) {   if ($allowed) {
  $r->print("<br /><div>");   $r->print("<br /><div>");

Removed from v.1.46  
changed lines
  Added in v.1.47


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>