--- loncom/homework/edit.pm	2001/07/13 16:15:01	1.18
+++ loncom/homework/edit.pm	2001/11/07 21:24:15	1.23
@@ -21,7 +21,10 @@ sub tag_start {
   my $result='';
   if ($target eq "edit") {
     my $tag=$token->[1];
-    if (!$description) { $description="<$tag>"; }
+    if (!$description) {
+      $description=&Apache::lonxml::description($token);
+      if (!$description) { $description="<$tag>"; }
+    }
     $result.= &start_table($token)."<tr><td>$description</td>
 <td>Delete".
   &deletelist($target,$token)
@@ -30,6 +33,9 @@ sub tag_start {
   &insertlist($target,$token).
     "</td>
 </tr><tr><td colspan=\"3\">\n";
+#<td>".
+#  &movebuttons($target,$token).
+#    "</tr><tr><td colspan=\"3\">\n";
   }
   return $result;
 }
@@ -54,7 +60,7 @@ sub start_table {
   my $tag = $token->[1];
   my $tagnum;
   foreach my $namespace (reverse @Apache::lonxml::namespace) {
-    my $testtag=$Apache::lonxml::namespace['-1'].'::'.$tag;
+    my $testtag=$namespace.'::'.$tag;
     $tagnum=$Apache::lonxml::insertlist{"$testtag.num"};
     if (defined($tagnum)) { last; }
   }
@@ -74,6 +80,15 @@ sub end_table {
   return $result;
 }
 
+sub movebuttons {
+  my ($target,$token) = @_;
+  my $result='<input type="submit" name="moveup.'.
+    $Apache::lonxml::curdepth.'" value="Move Up" />';
+  $result.='<input type="submit" name="movedown.'.
+    $Apache::lonxml::curdepth.'" value="Move Down" />';
+  return $result;
+}
+
 sub deletelist {
   my ($target,$token) = @_;
   my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">
@@ -202,9 +217,43 @@ sub insert_optionresponse {
 </optionresponse>';
 }
 
+sub insert_radiobuttonresponse {
+  return '
+<radiobuttonresponse max="10">
+    <foilgroup>
+    </foilgroup>
+    <hintgroup>
+    </hintgroup>
+</radiobuttonresponse>';
+}
+
+sub insert_displayduedate { return '<displayduedate />'; }
+sub insert_displaytitle   { return '<displaytitle />'; }
+sub insert_hintpart {
+  return '
+<hintpart on="default">
+    <startouttext/>
+    <endouttext />
+</hintpart>';
+}
+
+sub insert_numericalhint {
+  return '
+<numericalhint>
+</numericalhint>';
+}
+
+sub insert_startouttext {
+  return "<startouttext />\n<endouttext />";
+}
+
+sub insert_script {
+  return "\n<script type=\"loncapa/perl\">\n</script>";
+}
+
 sub editfield {
   my ($tag,$data,$description,$minwidth,$minheight)=@_;
-  
+
   my $count=0;
   my $maxlength=-1;
   map { $count++;
@@ -239,21 +288,14 @@ sub modifiedfield {
   return $result;
 }
 
-sub insert_startouttext {
-  return "<startouttext />\n<endouttext />";
-}
-
-sub insert_script {
-  return "\n<script type=\"loncapa/perl\">\n</script>";
-}
-
 # 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 $value=&Apache::lonxml::get_param($arg,$parstack,$safeeval);
+    #just want the string that it was set to
+    my $value=$token->[2]->{$arg};
     my $newvalue=$ENV{"form.$Apache::lonxml::curdepth.$arg"};
     &Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:");
     if ($value ne $newvalue) {
@@ -271,7 +313,7 @@ sub rebuild_tag {
   if ($token->[0] eq 'S') {
     $result = '<'.$token->[1];
     while (my ($key,$val)= each(%{$token->[2]})) {
-      $val=~s:^\s|\s$::g;
+      $val=~s:^\s+|\s+$::g;
       $val=~s:"::g; #"
       &Apache::lonxml::debug("setting :$key: to  :$val:");
       $result.=' '.$key.'="'.$val.'"';
@@ -315,5 +357,29 @@ sub select_arg {
   return $result;
 }
 
+sub select_or_text_arg {
+  my ($description,$name,$list,$token,$size) = @_;
+  my $result;
+  my $optionlist="";
+  my $found=0;
+  my $selected=$token->[2]{$name};
+  foreach my $option (@$list) {
+    if ( $selected eq $option ) {
+      $optionlist.="<option selected=\"on\">$option</option>\n";
+      $found=1;
+    } else {
+      $optionlist.="<option>$option</option>\n";
+    }
+  }
+  $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
+  if ($found) {
+    $result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
+       '.$optionlist.'
+      </select></td></tr><tr><td colspan="3">';
+  } else {
+    $result.=&text_arg($description,$name,$token,$size);
+  }
+  return $result;
+}
 1;
 __END__