--- loncom/homework/edit.pm	2003/09/10 21:59:44	1.64
+++ loncom/homework/edit.pm	2003/11/28 01:55:24	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.64 2003/09/10 21:59:44 albertel Exp $
+# $Id: edit.pm,v 1.73 2003/11/28 01:55:24 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
@@ -67,7 +68,7 @@ sub tag_start {
 #<td>". 
 #  &movebuttons($target,$token).
 #    "</tr><tr><td colspan=\"3\">\n";
-	my @help;# = Apache::lonxml::helpinfo($token);
+	my @help = Apache::lonxml::helpinfo($token);
 	if ($help[0]) {
 	    $result .= '<td align="right" valign="top">' .
 		Apache::loncommon::help_open_topic(@help) .
@@ -273,6 +274,11 @@ sub handle_insertafter {
     return $result;
 }
 
+sub insert_img {
+    return '
+    <img />';
+}
+
 sub insert_responseparam {
     return '
     <responseparam />';
@@ -283,6 +289,8 @@ sub insert_formularesponse {
 <formularesponse answer="" samples="">
     <textline />
     <hintgroup>
+    <startouttext/>
+    <endouttext />
     </hintgroup>
 </formularesponse>';
 }
@@ -292,6 +300,8 @@ sub insert_numericalresponse {
 <numericalresponse answer="">
     <textline />
     <hintgroup>
+    <startouttext/>
+    <endouttext />
     </hintgroup>
 </numericalresponse>';
 }
@@ -301,6 +311,8 @@ sub insert_stringresponse {
 <stringresponse answer="" type="">
     <textline />
     <hintgroup>
+    <startouttext/>
+    <endouttext />
     </hintgroup>
 </stringresponse>';
 }
@@ -318,6 +330,8 @@ sub insert_imageresponse {
     <foilgroup>
     </foilgroup>
     <hintgroup>
+    <startouttext/>
+    <endouttext />
     </hintgroup>
 </imageresponse>';
 }
@@ -328,26 +342,60 @@ sub insert_optionresponse {
     <foilgroup options="">
     </foilgroup>
     <hintgroup>
+    <startouttext/>
+    <endouttext />
     </hintgroup>
 </optionresponse>';
 }
 
+sub insert_organicresponse {
+    return '
+<organicresponse>
+    <textline />
+    <hintgroup>
+    <startouttext/>
+    <endouttext />
+    </hintgroup>
+</organicresponse>';
+}
+
+sub insert_organicstructure {
+    return '
+<organicstructure />
+';
+}
+
 sub insert_radiobuttonresponse {
     return '
 <radiobuttonresponse max="10">
     <foilgroup>
     </foilgroup>
     <hintgroup>
+    <startouttext/>
+    <endouttext />
     </hintgroup>
 </radiobuttonresponse>';
 }
 
+sub insert_reactionresponse {
+    return '
+<reactionresponse>
+    <textline />
+    <hintgroup>
+    <startouttext/>
+    <endouttext />
+    </hintgroup>
+</reactionresponse>';
+}
+
 sub insert_rankresponse {
     return '
 <rankresponse max="10">
     <foilgroup options="">
     </foilgroup>
     <hintgroup>
+    <startouttext/>
+    <endouttext />
     </hintgroup>
 </rankresponse>';
 }
@@ -360,6 +408,8 @@ sub insert_matchresponse {
       </itemgroup>
     </foilgroup>
     <hintgroup>
+    <startouttext/>
+    <endouttext />
     </hintgroup>
 </matchresponse>';
 }
@@ -374,6 +424,14 @@ sub insert_hintpart {
 </hintpart>';
 }
 
+sub insert_hintgroup {
+  return '
+<hintgroup>
+    <startouttext/>
+    <endouttext />
+</hintgroup>';
+}
+
 sub insert_numericalhint {
     return '
 <numericalhint>
@@ -453,7 +511,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 +519,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;
 }
 
@@ -529,7 +590,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 +619,7 @@ sub text_arg {
     my $result;
     if (!defined $size) { $size=20; }
     my $arg=$token->[2]{$name};
-    $result=$description.'&nbsp;<input name="'.&html_element_name($name).
+    $result=&mt($description).'&nbsp;<input name="'.&html_element_name($name).
 	'" type="text" value="'.$arg.'" size="'.$size.'" />';
     return '<nobr>'.$result.'</nobr>';
 }
@@ -568,7 +629,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 +677,7 @@ sub select_or_text_arg {
     }
     $optionlist.="<option value=\"TYPEDINVALUE\"".
  	((!$found)?' selected="on"':'').
- 	">Type in value</option>\n";
+ 	">".&mt('Type-in value')."</option>\n";
 #
     my $element=&html_element_name($name);
     my $selectelement='select_list_'.$element;
@@ -630,6 +690,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 (<<ENDSELECTORTYPE);
 <nobr>
@@ -708,17 +769,21 @@ ENDBUTTON
 #----------------------------------------------------- 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 <tag> ... </tag>
         $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";
-<a href=\"javascript:openbrowser('$form','$element')\"\>Select</a>
+<a href=\"javascript:openbrowser('$form','$element'$titleelement)\"\>Select</a>
 ENDBUTTON
     return $result;
 }
@@ -726,7 +791,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 +800,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";
-<a href=\"javascript:opensearcher('$form','$element')\"\>Search</a>
+<a href=\"javascript:opensearcher('$form','$element'$titleelement)\"\>Search</a>
 ENDBUTTON
     return $result;
 }