--- loncom/homework/edit.pm	2003/07/29 15:05:53	1.58
+++ loncom/homework/edit.pm	2003/09/08 21:10:53	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.58 2003/07/29 15:05:53 bowersj2 Exp $
+# $Id: edit.pm,v 1.61 2003/09/08 21:10:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,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) .
@@ -465,17 +465,21 @@ sub modifiedfield {
 # Returns a 1 if the token has been modified and you should rebuild the tag
 # side-effects, will modify the $token if new values are found
 sub get_new_args {
-  my ($token,$parstack,$safeeval,@args)=@_;
-  my $rebuild=0;
-  foreach my $arg (@args) {
+    my ($token,$parstack,$safeeval,@args)=@_;
+    my $rebuild=0;
+    foreach my $arg (@args) {
     #just want the string that it was set to
     my $value=$token->[2]->{$arg};
     my $element=&html_element_name($arg);
     my $newvalue=$ENV{"form.$element"};
     &Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:");
     if (defined($newvalue) && $value ne $newvalue) {
-      $token->[2]->{$arg}=$newvalue;
-      $rebuild=1;
+	if (ref($newvalue) eq 'ARRAY') {
+	    $token->[2]->{$arg}=join(',',@$newvalue);
+	} else {
+	    $token->[2]->{$arg}=$newvalue;
+	}
+	$rebuild=1;
     }
   }
   return $rebuild;
@@ -518,6 +522,36 @@ sub hidden_arg {
     return $result;
 }
 
+sub checked_arg {
+    my ($description,$name,$list,$token) = @_;
+    my $result;
+    my $optionlist="";
+    my $allselected=$token->[2]{$name};
+    $result=$description;
+    foreach my $option (@$list) {
+	my ($value,$text);
+	if ( ref($option) eq 'ARRAY') {
+	    $value='value="'.$$option[0].'"';
+	    $text=$$option[1];
+	    $option=$$option[0];
+	} else {
+	    $text=$option;
+	    $value='value="'.$option.'"';
+	}
+	$result.="<nobr><input type='checkbox' $value name='".
+	    &html_element_name($name)."'";
+	foreach my $selected (split(/,/,$allselected)) {
+	    &Apache::lonxml::error("wha $selected $option<br />");
+	    if ( $selected eq $option ) {
+		$result.=" checked='on' ";
+		last;
+	    }
+	}
+	$result.=" />$text</nobr>\n";
+    }
+    return $result;
+}
+
 sub text_arg {
   my ($description,$name,$token,$size) = @_;
   my $result;
@@ -575,16 +609,36 @@ sub select_or_text_arg {
 	    $optionlist.="<option $value>$option</option>\n";
 	}
     }
-    $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
-    if (($found) || (!$selected)) {
-	$result.=$description.'&nbsp;<select name="'.&html_element_name($name)
-            .'">
-       '.$optionlist.'
-      </select>';
-    } else {
-	$result.=&text_arg($description,$name,$token,$size);
-    }
-    return '<nobr>'.$result.'</nobr>';
+    $optionlist.="<option value=\"TYPEDINVALUE\"".
+ 	((!$found)?' selected="on"':'').
+ 	">Type in value</option>\n";
+#
+    my $element=&html_element_name($name);
+    my $selectelement='select_list_'.$element;
+    my $typeinelement='type_in_'.$element;
+    my $typeinvalue=($found?'':$selected);
+#
+    my $hiddenvalue='this.form.'.$element.'.value';
+    my $selectedindex='this.form.'.$selectelement.'.selectedIndex';
+    my $selectedvalue='this.form.'.$selectelement.
+	     '.options['.$selectedindex.'].value';
+    my $typedinvalue='this.form.'.$typeinelement.'.value';
+    my $selecttypeinindex='this.form.'.$selectelement.'.options.length';
+#
+    return (<<ENDSELECTORTYPE);
+<nobr>
+$description
+&nbsp;<select name="$selectelement"
+onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }"
+$optionlist
+</select>
+<input type="text" size="$size" name="$typeinelement"
+       value="$typeinvalue" 
+onChange="$hiddenvalue=$typedinvalue;"
+onFocus="$selectedindex=$selecttypeinindex-1;" />
+<input type="hidden" name="$element" value="$selected" />
+</nobr>
+ENDSELECTORTYPE
 }
 
 #----------------------------------------------------- image coordinates