--- loncom/xml/lonplot.pm 2001/12/31 16:19:55 1.26 +++ loncom/xml/lonplot.pm 2001/12/31 17:30:09 1.27 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.26 2001/12/31 16:19:55 matthew Exp $ +# $Id: lonplot.pm,v 1.27 2001/12/31 17:30:09 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,7 +26,7 @@ # http://www.lon-capa.org/ # # 12/15/01 Matthew -# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 Matthew +# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 Matthew package Apache::lonplot; use strict; @@ -367,8 +367,7 @@ sub start_title { $result.=&Apache::edit::tag_start($target,$token,'Plot Title'); my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]); $result.=''. - &Apache::edit::editfield('',$text,'',20,1). - &Apache::edit::end_table(); + &Apache::edit::editfield('',$text,'',20,1); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/function"); $result.=&Apache::edit::modifiedfield($token); @@ -381,6 +380,7 @@ sub end_title { my $result = ''; if ($target eq 'web') { } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_end($target,$token); } return $result; } @@ -394,8 +394,7 @@ sub start_xlabel { $result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); $result.=''. - &Apache::edit::editfield('',$text,'',20,1). - &Apache::edit::end_table(); + &Apache::edit::editfield('',$text,'',20,1); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/function"); $result.=&Apache::edit::modifiedfield($token); @@ -408,6 +407,7 @@ sub end_xlabel { my $result = ''; if ($target eq 'web') { } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_end($target,$token); } return $result; } @@ -422,8 +422,7 @@ sub start_ylabel { $result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); $result .= ''. - &Apache::edit::editfield('',$text,'',20,1). - &Apache::edit::end_table(); + &Apache::edit::editfield('',$text,'',20,1); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/function"); $result.=&Apache::edit::modifiedfield($token); @@ -436,6 +435,7 @@ sub end_ylabel { my $result = ''; if ($target eq 'web') { } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_end($target,$token); } return $result; } @@ -459,8 +459,7 @@ sub start_label { $result .= &edit_attributes($target,$token,\%label_defaults); my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]); $result .= ''. - &Apache::edit::editfield('',$text,'',20,1). - &Apache::edit::end_table(); + &Apache::edit::editfield('',$text,'',20,1); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args ($token,$parstack,$safeeval,keys(%label_defaults)); @@ -823,7 +822,7 @@ sub insert_plot { # plot attributes $result .= '{'default'}. + $result .= ' '.$attr.'="'.$plot_defaults{$attr}->{'default'}. "\"\n"; } $result .= ">\n"; @@ -846,7 +845,7 @@ sub insert_key { my $result; $result .= ' {'default'}. + $result .= ' '.$attr.'="'.$key_defaults{$attr}->{'default'}. "\"\n"; } $result .= " />\n"; @@ -857,7 +856,7 @@ sub insert_axis{ my $result; $result .= ' {'default'}. + $result .= ' '.$attr.'="'.$axis_defaults{$attr}->{'default'}. "\"\n"; } $result .= " />\n"; @@ -868,7 +867,7 @@ sub insert_label { my $result; $result .= '