--- loncom/homework/edit.pm 2003/10/24 21:45:32 1.69 +++ loncom/homework/edit.pm 2003/11/05 21:53:48 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.69 2003/10/24 21:45:32 albertel Exp $ +# $Id: edit.pm,v 1.71 2003/11/05 21:53:48 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ package Apache::edit; use strict; use Apache::lonnet(); use HTML::Entities(); +use Apache::lonlocal; # Global Vars # default list of colors to use in editing @@ -482,7 +483,7 @@ sub editfield { } sub modifiedfield { - my ($token) = @_; + my ($endtag,$parser) = @_; my $result; # foreach my $envkey (sort keys %ENV) { # &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}"); @@ -490,6 +491,9 @@ sub modifiedfield { # &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"}; + my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser); + # textareas throw away intial \n + if ($bodytext=~/^\n/) { $result="\n".$result; } return $result; } @@ -558,7 +562,7 @@ sub checked_arg { my $result; my $optionlist=""; my $allselected=$token->[2]{$name}; - $result=$description; + $result=&mt($description); foreach my $option (@$list) { my ($value,$text); if ( ref($option) eq 'ARRAY') { @@ -587,7 +591,7 @@ sub text_arg { my $result; if (!defined $size) { $size=20; } my $arg=$token->[2]{$name}; - $result=$description.' '; return ''.$result.''; } @@ -645,7 +649,7 @@ sub select_or_text_arg { } $optionlist.="\n"; + ">".&mt('Type in value')."\n"; # my $element=&html_element_name($name); my $selectelement='select_list_'.$element; @@ -658,6 +662,7 @@ sub select_or_text_arg { '.options['.$selectedindex.'].value'; my $typedinvalue='this.form.'.$typeinelement.'.value'; my $selecttypeinindex='this.form.'.$selectelement.'.options.length'; + $description=&mt($description); # return (<