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

Diff for /loncom/homework/randomlabel.pm between versions 1.93 and 1.97

version 1.93, 2008/11/25 13:16:17 version 1.97, 2016/07/01 19:59:15
Line 172  sub start_randomlabel { Line 172  sub start_randomlabel {
     $label_xscale = 1.0; # Assume image size not overridden.      $label_xscale = 1.0; # Assume image size not overridden.
     $label_yscale = 1.0;      $label_yscale = 1.0;
     my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);      my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
     if ( defined($bgimg) && $bgimg !~ /^http:/ ) {      if ( defined($bgimg) && $bgimg !~ /^https?\:/ ) {
  $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);   $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
  if (&Apache::lonnet::repcopy($bgimg) ne 'ok') {   if (&Apache::lonnet::repcopy($bgimg) ne 'ok') {
     $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';      $bgimg=$Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/lonKaputt/lonlogo_broken.gif';
  }   }
     }      }
     $Apache::randomlabel::obj_cnt=0;      $Apache::randomlabel::obj_cnt=0;
Line 193  sub start_randomlabel { Line 193  sub start_randomlabel {
  $Apache::edit::bgimgsrc=   $Apache::edit::bgimgsrc=
     &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);      &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
  $Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;   $Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;
  $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';   $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' '.
  $result.=&Apache::edit::browse('bgimg',undef,undef,$only).' ';           &Apache::edit::browse_or_search('bgimg',undef,undef,$only,undef,1).
  $result.=&Apache::edit::search('bgimg').'<br />'.           '<br />'.
     &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).      &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
     &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).      &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
     &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).      &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
Line 223  sub end_randomlabel { Line 223  sub end_randomlabel {
  &Apache::lonnet::appenv(\%args);   &Apache::lonnet::appenv(\%args);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result='\end{picture}\\\\';   $result='\end{picture}\\\\';
  $result.= ' \vskip -'.$height_param.' mm }  \\\\ ';   $result.= ' \vskip -'.$height_param.' mm } \\newline ';
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table;   $result.=&Apache::edit::end_table;
     }      }
Removed from v.1.93  
changed lines
  Added in v.1.97

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