version 1.104, 2007/01/29 23:51:19
|
version 1.106, 2007/05/22 01:03:35
|
Line 112 sub end_table {
|
Line 112 sub end_table {
|
my ($tagname,$closingtag); |
my ($tagname,$closingtag); |
if (defined($Apache::edit::inserttag[-2])) { |
if (defined($Apache::edit::inserttag[-2])) { |
$tagname=$Apache::edit::inserttag[-2]; |
$tagname=$Apache::edit::inserttag[-2]; |
} else {$tagname='problem';} |
} else { |
|
if ($Apache::lonhomework::parsing_a_task) { |
|
$tagname='Task'; |
|
} else { |
|
$tagname='problem'; |
|
} |
|
} |
if (defined($Apache::edit::inserttag[-1])) { |
if (defined($Apache::edit::inserttag[-1])) { |
$closingtag=$Apache::edit::inserttag[-1]; |
$closingtag=$Apache::edit::inserttag[-1]; |
} |
} |
$result.=&innerinsertlist('edit',$tagname,$closingtag). |
$result.=&innerinsertlist('edit',$tagname,$closingtag). |
"</td></tr></table></div>"; |
"</td></tr></table></div>"; |
pop(@Apache::edit::inserttag); |
my $last = pop(@Apache::edit::inserttag); |
return $result; |
return $result; |
} |
} |
|
|
Line 232 sub handle_insertafter {
|
Line 238 sub handle_insertafter {
|
return ''; |
return ''; |
} |
} |
my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; |
my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; |
return &do_insert($tagnum); |
return &do_insert($tagnum,1); |
} |
} |
|
|
sub do_insert { |
sub do_insert { |
my ($tagnum) = @_; |
my ($tagnum,$after) = @_; |
my $result; |
my $result; |
|
|
my $newtag = $Apache::lonxml::insertlist{"$tagnum.tag"}; |
my $newtag = $Apache::lonxml::insertlist{"$tagnum.tag"}; |
Line 244 sub do_insert {
|
Line 250 sub do_insert {
|
if ($func eq 'default') { |
if ($func eq 'default') { |
my $namespace; |
my $namespace; |
if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); } |
if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); } |
$result.="\n<$newtag>\n</$newtag>"; |
my $depth = scalar(@Apache::lonxml::depthcounter); |
|
$depth -- if ($after); |
|
my $inset = "\t"x$depth; |
|
$result.="\n$inset<$newtag>\n$inset</$newtag>"; |
} else { |
} else { |
if (defined(&$func)) { |
if (defined(&$func)) { |
{ |
{ |
Line 315 sub insert_customresponse_answer {
|
Line 324 sub insert_customresponse_answer {
|
'; |
'; |
} |
} |
|
|
|
sub insert_customhint { |
|
return ' |
|
<customhint> |
|
<answer type="loncapa/perl"> |
|
</answer> |
|
</customhint>'; |
|
} |
|
|
|
sub insert_customhint_answer { |
|
return ' |
|
<answer type="loncapa/perl"> |
|
</answer> |
|
'; |
|
} |
|
|
|
sub insert_mathresponse { |
|
return ' |
|
<mathresponse> |
|
<answer> |
|
</answer> |
|
<textline /> |
|
<hintgroup> |
|
<startouttext /> |
|
<endouttext /> |
|
</hintgroup> |
|
</mathresponse>'; |
|
} |
|
|
|
sub insert_mathresponse_answer { |
|
return ' |
|
<answer> |
|
</answer> |
|
'; |
|
} |
|
|
|
sub insert_mathhint { |
|
return ' |
|
<mathhint> |
|
<answer> |
|
</answer> |
|
</mathhint>'; |
|
} |
|
|
|
sub insert_mathhint_answer { |
|
return ' |
|
<answer> |
|
</answer> |
|
'; |
|
} |
|
|
sub insert_stringresponse { |
sub insert_stringresponse { |
return ' |
return ' |
<stringresponse answer="" type=""> |
<stringresponse answer="" type=""> |
Line 565 sub editfield {
|
Line 624 sub editfield {
|
&Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'. |
&Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'. |
$Apache::lonxml::curdepth); |
$Apache::lonxml::curdepth); |
} |
} |
|
# remove typesetting whitespace from between data and the end tag |
|
# to make the edit look prettier |
|
$data =~ s/\n?[ \t]*$//; |
|
|
return $description."\n".'<textarea style="width:100%" 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_'. |
Line 577 sub editfield {
|
Line 640 sub editfield {
|
sub modifiedfield { |
sub modifiedfield { |
my ($endtag,$parser) = @_; |
my ($endtag,$parser) = @_; |
my $result; |
my $result; |
# foreach my $envkey (sort keys %env) { |
|
# &Apache::lonxml::debug("$envkey ---- $env{$envkey}"); |
|
# } |
|
# &Apache::lonxml::debug("I want 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; |
|
} |
|
# if there is typesetting whitespace from between the data and the end tag |
|
# restore to keep the source looking pretty |
|
if ($bodytext =~ /(\n?[ \t]*)$/) { |
|
$result .= $1; |
|
} |
return $result; |
return $result; |
} |
} |
|
|