version 1.321, 2006/02/21 10:27:43
|
version 1.322, 2006/03/22 19:37:44
|
Line 2770 sub start_img {
|
Line 2770 sub start_img {
|
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($env{'browser.imagesuppress'} ne 'on') { |
if ($env{'browser.imagesuppress'} ne 'on') { |
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); |
my $enc = ('yes' eq |
|
lc(&Apache::lonxml::get_param('encrypturl',$parstack, |
|
$safeeval))); |
|
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, |
|
$enc); |
} else { |
} else { |
my $alttag= &Apache::lonxml::get_param |
my $alttag = &Apache::lonxml::get_param('alt',$parstack,$safeeval, |
('alt',$parstack,$safeeval,undef,1); |
undef,1); |
unless ($alttag) { |
if (!$alttag) { |
$alttag=&Apache::lonmeta::alttag |
$alttag = &Apache::lonmeta::alttag($Apache::lonxml::pwd[-1], |
($Apache::lonxml::pwd[-1],$src); |
$src); |
} |
} |
$currentstring.='[IMAGE: '.$alttag.']'; |
$currentstring.='[IMAGE: '.$alttag.']'; |
} |
} |
Line 2902 sub start_img {
|
Line 2906 sub start_img {
|
['','bottom','middle','top','left','right'],$token,5); |
['','bottom','middle','top','left','right'],$token,5); |
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap', |
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap', |
['', 'parbox', 'parpic'], $token, 2); |
['', 'parbox', 'parpic'], $token, 2); |
|
$currentstring .=&Apache::edit::select_arg('Encyrpt URL:','encrypturl', |
|
['no','yes'], $token, 2); |
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); |
my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); |
my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval); |
my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval); |
Line 2919 sub start_img {
|
Line 2925 sub start_img {
|
my $ctag=&Apache::edit::get_new_args($token,$parstack, |
my $ctag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'src','alt','align', |
$safeeval,'src','alt','align', |
'TeXwidth','TeXheight', 'TeXwrap', |
'TeXwidth','TeXheight', 'TeXwrap', |
'width','height'); |
'width','height','encrypturl'); |
my ($nsrc,$nwidth,$nheight)= |
my ($nsrc,$nwidth,$nheight)= |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc); |
my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc); |