| \n";
- my @help;# = Apache::lonxml::helpinfo($token);
+ my @help = Apache::lonxml::helpinfo($token);
if ($help[0]) {
$result .= ' | ' .
Apache::loncommon::help_open_topic(@help) .
@@ -273,6 +274,11 @@ sub handle_insertafter {
return $result;
}
+sub insert_img {
+ return '
+ ![]() ';
+}
+
sub insert_responseparam {
return '
';
@@ -283,6 +289,7 @@ sub insert_formularesponse {
+
';
}
@@ -292,6 +299,7 @@ sub insert_numericalresponse {
+
';
}
@@ -301,6 +309,7 @@ sub insert_stringresponse {
+
';
}
@@ -318,6 +327,7 @@ sub insert_imageresponse {
+
';
}
@@ -328,26 +338,55 @@ sub insert_optionresponse {
+
';
}
+sub insert_organicresponse {
+ return '
+
+
+
+
+
+';
+}
+
+sub insert_organicstructure {
+ return '
+
+';
+}
+
sub insert_radiobuttonresponse {
return '
+
';
}
+sub insert_reactionresponse {
+ return '
+
+
+
+
+
+';
+}
+
sub insert_rankresponse {
return '
+
';
}
@@ -360,6 +399,7 @@ sub insert_matchresponse {
+
';
}
@@ -374,6 +414,13 @@ sub insert_hintpart {
';
}
+sub insert_hintgroup {
+ return '
+
+
+';
+}
+
sub insert_numericalhint {
return '
@@ -405,11 +452,11 @@ sub insert_optionhint {
}
sub insert_startouttext {
- return "\n";
+ return "";
}
sub insert_script {
- return "\n";
+ return "\n";
}
sub textarea_sizes {
@@ -453,7 +500,7 @@ sub editfield {
}
sub modifiedfield {
- my ($token) = @_;
+ my ($endtag,$parser) = @_;
my $result;
# foreach my $envkey (sort keys %ENV) {
# &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
@@ -461,6 +508,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;
}
@@ -482,6 +532,9 @@ sub get_new_args {
$token->[2]->{$arg}=$newvalue;
}
$rebuild=1;
+ } elsif (!defined($newvalue) && defined($value)) {
+ delete($token->[2]->{$arg});
+ $rebuild=1;
}
}
return $rebuild;
@@ -529,7 +582,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') {
@@ -558,7 +611,7 @@ sub text_arg {
my $result;
if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};
- $result=$description.' ';
return ''.$result.'';
}
@@ -568,7 +621,6 @@ sub select_arg {
my $result;
my $optionlist="";
my $selected=$token->[2]{$name};
- &Apache::lonxml::error("Wha $selected");
foreach my $option (@$list) {
my ($text,$value);
if ( ref($option) eq 'ARRAY') {
@@ -617,7 +669,7 @@ sub select_or_text_arg {
}
$optionlist.="\n";
+ ">".&mt('Type-in value')."\n";
#
my $element=&html_element_name($name);
my $selectelement='select_list_'.$element;
@@ -630,12 +682,13 @@ 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 (<
$description
...
$element = &Apache::lonnet::escape('homework_edit_'.
$Apache::lonxml::curdepth);
}
- my $formheight='';
+ my $id=$Apache::lonxml::curdepth;
+ my %data=("imagechoice.$id.type" =>$type,
+ "imagechoice.$id.formname" =>$form,
+ "imagechoice.$id.file" =>$bgfile,
+ "imagechoice.$id.formcoord" =>$element);
if ($height) {
- $formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth;
+ $data{"imagechoice.$id.formheight"}=$height.'_'.
+ $Apache::edit::bgimgsrccurdepth;
}
- my $formwidth='';
if ($width) {
- $formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth;
+ $data{"imagechoice.$id.formwidth"}=$width.'_'.
+ $Apache::edit::bgimgsrccurdepth;
}
- my $result = <<"ENDBUTTON";
-Click Coordinate Pair
-ENDBUTTON
+ &Apache::lonnet::appenv(%data);
+ my $text="Enter Coordinates";
+ if ($type eq 'polygon') { $text='Create Polygon Data'; }
+ my $result=''.$text.'';
return $result;
}
+
+sub deletecoorddata {
+ &Apache::lonnet::delenv("imagechoice\\.");
+}
+
#----------------------------------------------------- browse
sub browse {
# insert a link to call up the filesystem browser (lonindexer)
- my ($id, $mode) = @_;
+ my ($id, $mode, $titleid) = @_;
my $form = 'lonhomework';
my $element;
if (! defined($mode) || $mode eq 'attribute') {
$element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
} elsif ($mode eq 'textnode') { # for data between ...
$element = &Apache::lonnet::escape('homework_edit_'.
- $Apache::lonxml::curdepth);
+ $Apache::lonxml::curdepth);
+ }
+ my $titleelement;
+ if ($titleid) {
+ $titleelement=",'','','".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";
}
my $result = <<"ENDBUTTON";
-Select
+Select
ENDBUTTON
return $result;
}
@@ -726,7 +795,7 @@ ENDBUTTON
#----------------------------------------------------- browse
sub search {
# insert a link to call up the filesystem browser (lonindexer)
- my ($id, $mode) = @_;
+ my ($id, $mode, $titleid) = @_;
my $form = 'lonhomework';
my $element;
if (! defined($mode) || $mode eq 'attribute') {
@@ -735,8 +804,12 @@ sub search {
$element = &Apache::lonnet::escape('homework_edit_'.
$Apache::lonxml::curdepth);
}
+ my $titleelement;
+ if ($titleid) {
+ $titleelement=",'".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";
+ }
my $result = <<"ENDBUTTON";
-Search
+Search
ENDBUTTON
return $result;
}
|