version 1.23, 2001/12/28 19:40:47
|
version 1.24, 2001/12/28 21:09:57
|
Line 285 sub start_plot {
|
Line 285 sub start_plot {
|
$result .= &edit_attributes($target,$token,\%plot_defaults); |
$result .= &edit_attributes($target,$token,\%plot_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %plot_defaults); |
($token,$parstack,$safeeval,keys(%plot_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 337 sub start_key {
|
Line 337 sub start_key {
|
$result .= &edit_attributes($target,$token,\%key_defaults); |
$result .= &edit_attributes($target,$token,\%key_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %key_defaults); |
($token,$parstack,$safeeval,keys(%key_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 380 sub end_title {
|
Line 380 sub end_title {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 408 sub end_xlabel {
|
Line 407 sub end_xlabel {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 437 sub end_ylabel {
|
Line 435 sub end_ylabel {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 465 sub start_label {
|
Line 462 sub start_label {
|
&Apache::edit::end_table(); |
&Apache::edit::end_table(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %label_defaults); |
($token,$parstack,$safeeval,keys(%label_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 502 sub start_curve {
|
Line 499 sub start_curve {
|
$result .= &edit_attributes($target,$token,\%curve_defaults); |
$result .= &edit_attributes($target,$token,\%curve_defaults); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %label_defaults); |
($token,$parstack,$safeeval,keys(%label_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 642 sub end_axis {
|
Line 639 sub end_axis {
|
$result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys %axis_defaults); |
($token,$parstack,$safeeval,keys(%axis_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
$result.= &Apache::edit::handle_insert(); |
Line 661 sub end_axis {
|
Line 658 sub end_axis {
|
sub set_defaults { |
sub set_defaults { |
my ($var,$defaults) = @_; |
my ($var,$defaults) = @_; |
my $key; |
my $key; |
foreach $key (keys %$defaults) { |
foreach $key (keys(%$defaults)) { |
$var->{$key} = $defaults->{$key}->{'default'}; |
$var->{$key} = $defaults->{$key}->{'default'}; |
} |
} |
} |
} |
Line 669 sub set_defaults {
|
Line 666 sub set_defaults {
|
##------------------------------------------------------------------- misc |
##------------------------------------------------------------------- misc |
sub get_attributes{ |
sub get_attributes{ |
my ($values,$defaults,$parstack,$safeeval,$tag) = @_; |
my ($values,$defaults,$parstack,$safeeval,$tag) = @_; |
foreach my $attr (keys %{$defaults}) { |
foreach my $attr (keys(%{$defaults})) { |
$values->{$attr} = |
$values->{$attr} = |
&Apache::lonxml::get_param($attr,$parstack,$safeeval); |
&Apache::lonxml::get_param($attr,$parstack,$safeeval); |
if ($values->{$attr} eq '' | !defined($values->{$attr})) { |
if ($values->{$attr} eq '' | !defined($values->{$attr})) { |