version 1.90, 2005/03/10 02:33:30
|
version 1.94, 2005/08/30 15:36:07
|
Line 29
|
Line 29
|
package Apache::edit; |
package Apache::edit; |
|
|
use strict; |
use strict; |
use Apache::lonnet(); |
use Apache::lonnet; |
use HTML::Entities(); |
use HTML::Entities(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
|
Line 109 sub start_table {
|
Line 109 sub start_table {
|
sub end_table { |
sub end_table { |
$Apache::edit::colordepth--; |
$Apache::edit::colordepth--; |
my $result='</table></div>'; |
my $result='</table></div>'; |
$result.="<table><tr><td>"; |
$result.='<div align="left"><table><tr><td>'; |
|
|
my ($tagname,$closingtag); |
my ($tagname,$closingtag); |
if (defined($Apache::edit::inserttag[-2])) { |
if (defined($Apache::edit::inserttag[-2])) { |
Line 119 sub end_table {
|
Line 119 sub end_table {
|
$closingtag=$Apache::edit::inserttag[-1]; |
$closingtag=$Apache::edit::inserttag[-1]; |
} |
} |
$result.=&innerinsertlist('edit',$tagname,$closingtag). |
$result.=&innerinsertlist('edit',$tagname,$closingtag). |
"</td></tr></table>"; |
"</td></tr></table></div>"; |
pop(@Apache::edit::inserttag); |
pop(@Apache::edit::inserttag); |
return $result; |
return $result; |
} |
} |
Line 147 sub deletelist {
|
Line 147 sub deletelist {
|
} |
} |
|
|
sub handle_delete { |
sub handle_delete { |
if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; } |
if (!$env{"form.delete_$Apache::lonxml::curdepth"}) { return ''; } |
my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=0; |
my $result=0; |
if ($space) { |
if ($space) { |
Line 222 sub innerinsertlist {
|
Line 222 sub innerinsertlist {
|
} |
} |
|
|
sub handle_insert { |
sub handle_insert { |
if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; } |
if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; } |
my $result; |
my $result; |
my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"}; |
my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"}; |
my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; |
my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; |
if ($func eq 'default') { |
if ($func eq 'default') { |
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; |
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; |
Line 239 sub handle_insert {
|
Line 239 sub handle_insert {
|
} |
} |
} else { |
} else { |
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; |
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; |
&Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined."); |
&Apache::lonxml::error("Unable to insert tag ".$Apache::lonxml::curdepth." ($tagnum) $newtag, func was not defined."); |
} |
} |
} |
} |
return $result; |
return $result; |
Line 247 sub handle_insert {
|
Line 247 sub handle_insert {
|
|
|
sub handle_insertafter { |
sub handle_insertafter { |
my $tagname=shift; |
my $tagname=shift; |
if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') |
if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') |
{ return ''; } |
{ return ''; } |
my $result; |
my $result; |
my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; |
my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; |
my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; |
my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; |
if ($func eq 'default') { |
if ($func eq 'default') { |
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; |
my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; |
Line 520 sub editfield {
|
Line 520 sub editfield {
|
push @Apache::lonxml::htmlareafields,'homework_edit_'. |
push @Apache::lonxml::htmlareafields,'homework_edit_'. |
$Apache::lonxml::curdepth; |
$Apache::lonxml::curdepth; |
} |
} |
return $description."\n".' <textarea rows="'.$rows. |
return $description."\n".' <textarea style="width:100%" rows="'.$rows. |
'" cols="'.$cols.'" name="homework_edit_'. |
'" cols="'.$cols.'" name="homework_edit_'. |
$Apache::lonxml::curdepth.'" id="homework_edit_'. |
$Apache::lonxml::curdepth.'" id="homework_edit_'. |
$Apache::lonxml::curdepth.'">'. |
$Apache::lonxml::curdepth.'">'. |
Line 532 sub editfield {
|
Line 532 sub editfield {
|
sub modifiedfield { |
sub modifiedfield { |
my ($endtag,$parser) = @_; |
my ($endtag,$parser) = @_; |
my $result; |
my $result; |
# foreach my $envkey (sort keys %ENV) { |
# foreach my $envkey (sort keys %env) { |
# &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}"); |
# &Apache::lonxml::debug("$envkey ---- $env{$envkey}"); |
# } |
# } |
# &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth"); |
# &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth"); |
# &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"}); |
# &Apache::lonxml::debug($env{"form.homework_edit_$Apache::lonxml::curdepth"}); |
$result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"}; |
$result=$env{"form.homework_edit_$Apache::lonxml::curdepth"}; |
my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser); |
my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser); |
# textareas throw away intial \n |
# textareas throw away intial \n |
if ($bodytext=~/^\n/) { $result="\n".$result; } |
if ($bodytext=~/^\n/) { $result="\n".$result; } |
Line 553 sub get_new_args {
|
Line 553 sub get_new_args {
|
#just want the string that it was set to |
#just want the string that it was set to |
my $value=$token->[2]->{$arg}; |
my $value=$token->[2]->{$arg}; |
my $element=&html_element_name($arg); |
my $element=&html_element_name($arg); |
my $newvalue=$ENV{"form.$element"}; |
my $newvalue=$env{"form.$element"}; |
&Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:"); |
&Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:"); |
if (defined($newvalue) && $value ne $newvalue) { |
if (defined($newvalue) && $value ne $newvalue) { |
if (ref($newvalue) eq 'ARRAY') { |
if (ref($newvalue) eq 'ARRAY') { |
Line 654 sub select_arg {
|
Line 654 sub select_arg {
|
foreach my $option (@$list) { |
foreach my $option (@$list) { |
my ($text,$value); |
my ($text,$value); |
if ( ref($option) eq 'ARRAY') { |
if ( ref($option) eq 'ARRAY') { |
$value='value="'.$$option[0].'"'; |
$value='value="'.&HTML::Entities::encode($$option[0]).'"'; |
$text=$$option[1]; |
$text=$$option[1]; |
$option=$$option[0]; |
$option=$$option[0]; |
} else { |
} else { |
$text=$option; |
$text=$option; |
$value='value="'.$option.'"'; |
$value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"'; |
} |
} |
if ( $selected eq $option ) { |
if ( $selected eq $option ) { |
$optionlist.="<option $value selected=\"selected\">$text</option>\n"; |
$optionlist.="<option $value selected=\"selected\">$text</option>\n"; |
Line 683 sub select_or_text_arg {
|
Line 683 sub select_or_text_arg {
|
foreach my $option (@$list) { |
foreach my $option (@$list) { |
my ($text,$value); |
my ($text,$value); |
if ( ref($option) eq 'ARRAY') { |
if ( ref($option) eq 'ARRAY') { |
$value='value="'.$$option[0].'"'; |
$value='value="'.&HTML::Entities::encode($$option[0]).'"'; |
$text=$$option[1]; |
$text=$$option[1]; |
$option=$$option[0]; |
$option=$$option[0]; |
} else { |
} else { |
$text=$option; |
$text=$option; |
$value='value="'.$option.'"'; |
$value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"'; |
} |
} |
if ( $selected eq $option ) { |
if ( $selected eq $option ) { |
$optionlist.="<option $value selected=\"selected\">$text</option>\n"; |
$optionlist.="<option $value selected=\"selected\">$text</option>\n"; |