[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.1 and 1.48

version 1.45.6.1, 2012/05/12 12:44:12 version 1.48, 2013/05/09 05:47:57
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 128  sub print_end_template { Line 132  sub print_end_template {
 sub print_editbox_template {  sub print_editbox_template {
  my ($r,$content,$field) = @_;   my ($r,$content,$field) = @_;
  $r->print('<textarea cols="81" rows="6" name="'.$field.'">'.   $r->print('<textarea cols="81" rows="6" name="'.$field.'">'.
                            &HTML::Entities::encode($content,'"&<>').                    &HTML::Entities::encode($content,'"&<>').
            '</textarea><br /><input type="submit" name="storesyl" value="'.                    '</textarea><br />'."\n");
                            &mt('Save All').'" />');   &print_saveall_template($r);
 }  }
   
 sub print_textarea_template {  sub print_textarea_template {
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,$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));
                 if ((%custom_handlers) && ($custom_handlers{$field})) {   my $legacy = 1;
  $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed);                  my $display = $displays{$field};
                   my $hidden;
                   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);
  } 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');   &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>");
  &Apache::lontemplate::print_textarea_template($r, $data{$field},   &Apache::lontemplate::print_textarea_template($r, $data{$field},
  $field, $default_rich_text);   $field, $default_rich_text);
  &Apache::lontemplate::print_saveall_template($r);   &print_saveall_template($r);
  $r->print("</div>");   $r->print("</div>");
  }    } 
  &Apache::lontemplate::print_end_template($r);   &Apache::lontemplate::print_end_template($r);
Line 192  sub print_template_fields { Line 202  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.1  
changed lines
  Added in v.1.48

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