version 1.41, 2002/12/03 10:32:57
|
version 1.44, 2003/05/06 11:54:08
|
Line 86 sub start_randomlabel {
|
Line 86 sub start_randomlabel {
|
my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval); |
my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval); |
if ( $bgimg !~ /^http:/ ) { |
if ( $bgimg !~ /^http:/ ) { |
$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) { |
|
$bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; |
|
} |
} |
} |
my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval)); |
my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval)); |
my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval)); |
my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval)); |
Line 97 sub start_randomlabel {
|
Line 100 sub start_randomlabel {
|
$result.="BGIMG=".&Apache::lonnet::escape($bgimg); |
$result.="BGIMG=".&Apache::lonnet::escape($bgimg); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $newbgimg = $bgimg; |
my $newbgimg = $bgimg; |
$bgimg=~s/(.gif|.jpg|.png)$/.eps/; |
$bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i; |
$bgimg= &Apache::lonnet::filelocation($bgimg); |
$bgimg= &Apache::lonnet::filelocation($bgimg); |
if (not $ENV{'request.role'}=~/^au\./) { |
if (not $ENV{'request.role'}=~/^au\./) { |
$bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/; |
$bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/; |
Line 136 sub start_randomlabel {
|
Line 139 sub start_randomlabel {
|
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
|
$Apache::edit::bgimgsrc= |
|
&Apache::lonxml::get_param('bgimg',$parstack,$safeeval); |
|
$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').' '; |
$result.=&Apache::edit::browse('bgimg').' '; |
$result.=&Apache::edit::search('bgimg').'<br />'. |
$result.=&Apache::edit::search('bgimg').'<br />'. |
Line 342 sub start_location {
|
Line 348 sub start_location {
|
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('X:','x',$token,4). |
$result.=&Apache::edit::text_arg('X:','x',$token,4). |
&Apache::edit::text_arg('Y:','y',$token,4). |
&Apache::edit::text_arg('Y:','y',$token,4). |
|
&Apache::edit::entercoords('x','y','attribute','width','height').' '. |
&Apache::edit::text_arg('Value:','value',$token). |
&Apache::edit::text_arg('Value:','value',$token). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
$result.=&Apache::edit::end_table; |
$result.=&Apache::edit::end_table; |
Line 370 sub start_label {
|
Line 377 sub start_label {
|
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2); |
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2); |
if ($target eq 'web' || $target eq 'tex' || |
if ($target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer' || $target eq 'analyze') { |
$target eq 'grade' || $target eq 'answer' || $target eq 'analyze') { |
my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]); |
my $ltext=&Apache::lonxml::get_all_text("/label",$parser); |
$ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]); |
$ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]); |
if ($type eq 'image') { |
if ($type eq 'image') { |
&Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]"); |
&Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]"); |
Line 384 sub start_label {
|
Line 391 sub start_label {
|
push(@Apache::randomlabel::label_arr,$ltext); |
push(@Apache::randomlabel::label_arr,$ltext); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token,"$type Label"); |
$result.=&Apache::edit::tag_start($target,$token,"$type Label"); |
my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]); |
my $text=&Apache::lonxml::get_all_text("/label",$parser); |
if ($type eq 'image') { |
if ($type eq 'image') { |
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result.=&Apache::edit::text_arg('Description:','description',$token); |
$result.=&Apache::edit::text_arg('Description:','description',$token); |