--- loncom/interface/lonhelper.pm 2010/11/09 18:22:56 1.180.2.3 +++ loncom/interface/lonhelper.pm 2010/09/01 23:58:40 1.181 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # .helper XML handler to implement the LON-CAPA helper # -# $Id: lonhelper.pm,v 1.180.2.3 2010/11/09 18:22:56 raeburn Exp $ +# $Id: lonhelper.pm,v 1.181 2010/09/01 23:58:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1476,9 +1476,9 @@ BUTTONS HTML::Entities::encode($choice->[1],"<>&\"'") . "'"; if ($checkedChoices{$choice->[1]}) { - $result .= " checked='checked'"; + $result .= " checked='checked' "; } - $result .= qq{ id="id$id"}; + $result .= qq{id="id$id"}; my $choiceLabel = $choice->[0]; if ($choice->[3]) { # if we need to evaluate this choice $choiceLabel = "sub { my $helper = shift; my $state = shift;" . @@ -1486,7 +1486,7 @@ BUTTONS $choiceLabel = eval($choiceLabel); $choiceLabel = &$choiceLabel($helper, $self); } - $result .= " /></td><td> ".qq{<label for="id$id">}. + $result .= "/></td><td> ".qq{<label for="id$id">}. $choiceLabel. "</label></td>"; if ($choice->[4]) { $result .='<td><input type="text" size="5" name="' @@ -3364,7 +3364,7 @@ sub render { $result .= '<p><font color="#FF0000">' . $self->{ERROR_MSG} . '</font></p>'; } - $result .= '<input type="text" name="' . $self->{'variable'} . '_forminput"'; + $result .= '<input type="string" name="' . $self->{'variable'} . '_forminput"'; if (defined($self->{'size'})) { $result .= ' size="' . $self->{'size'} . '"'; @@ -3679,10 +3679,8 @@ sub render { } my $previous = HTML::Entities::encode(&mt("Back"), '<>&"'); my $next = HTML::Entities::encode(&mt("Next"), '<>&"'); - my $target = " target='loncapaclient'"; - if ($env{'environment.remote'} eq 'off') { $target=''; } $result .= "<p>\n" . - "<form action='".$actionURL."' method='post' $target>\n" . + "<form action='".$actionURL."' method='post' >\n" . "<input type='button' onclick='history.go(-1)' value='$previous' />" . "<input type='hidden' name='orgurl' value='$targetURL' />" . "<input type='hidden' name='selectrole' value='1' />\n" .