[BACK]Return to lontemplate.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

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

version 1.45.6.4, 2013/05/10 23:48:12 version 1.46, 2012/12/18 15:46:34
Line 40  use Apache::lontexconvert; Line 40  use Apache::lontexconvert;
 use Apache::lonfeedback;  use Apache::lonfeedback;
 use Apache::lonrss();  use Apache::lonrss();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonhtmlgateway;
 use Apache::lonmsgdisplay();  use Apache::lonmsgdisplay();
 use HTML::Entities();  use HTML::Entities();
   
Line 114  sub print_template { Line 115  sub print_template {
 }  }
   
 sub print_start_template {  sub print_start_template {
  my ($r,$topic,$boxclass,$id,$display) = @_;   my ($r,$topic,$boxclass) = @_;
         my $idattrib;   $r->print('<div class="'.$boxclass.'">');
         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 149  sub print_saveall_template { Line 146  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,$noshowref) = @_;  
  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,%noshow);  
         if (ref($displayref) eq 'HASH') {  
             %displays = %{$displayref};  
         }  
         if (ref($noshowref) eq 'HASH') {  
             %noshow = %{$noshowref};  
         }  
  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 $display = $displays{$field};   my $legacy = 1;
                 unless ($allowed) {   my $gateway = Apache::lonhtmlgateway->new($target);
                     next if ($noshow{$field});          $message = &Encode::decode('utf8', $message);
                 }          $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, $display);   $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed);
  } else {   } else {
  if (($data{$field}=~/\w/) || ($allowed)) {   if (($data{$field}=~/\w/) || ($allowed)) {
                                 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') {   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','box_'.$field,$display);   &Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box');
  $r->print($message);   $r->print($message);
  if ($allowed) {   if ($allowed) {
  $r->print("<br /><div>");   $r->print("<br /><div>");
Line 206  sub print_template_fields { Line 186  sub print_template_fields {
  push(@html_ids,$field);   push(@html_ids,$field);
  }   }
  }   }
    undef $gateway;
  }   }
   
  return @html_ids;   return @html_ids;
Removed from v.1.45.6.4  
changed lines
  Added in v.1.46

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