--- loncom/homework/edit.pm	2005/12/15 23:20:55	1.98
+++ loncom/homework/edit.pm	2012/02/13 11:23:11	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.98 2005/12/15 23:20:55 albertel Exp $
+# $Id: edit.pm,v 1.140 2012/02/13 11:23:11 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,12 +26,119 @@
 # http://www.lon-capa.org/
 #
 
+=pod
+
+=head1 NAME
+
+Apache::edit - edit mode helpers
+
+=head1 SYNOPSIS
+
+Invoked by many homework and xml related modules.
+
+ &Apache::edit::SUBROUTINENAME(ARGUMENTS);
+
+=head1 INTRODUCTION
+
+This module outputs HTML syntax helpful for the rendering of edit
+mode interfaces.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item initialize_edit() 
+
+initialize edit (set colordepth to zero)
+
+=item tag_start($target,$token,$description)
+
+provide deletion and insertion lists
+for the manipulation of a start tag; return a scalar string
+
+=item tag_end($target,$token,$description)
+
+ending syntax corresponding to
+&tag_start. return a scalar string.
+
+=item  start_table($token)
+
+start table; update colordepth; return scalar string.
+
+=item end_table()
+
+reduce color depth; end table; return scalar string
+
+=item start_spanning_row()
+
+start a new table row spanning the 'edit' environment.
+
+=item start_row()
+
+start a new table row and element. 
+
+=item end_row() 
+
+end current table element and row.
+
+=item movebuttons($target,$token)
+
+move-up and move-down buttons; return scalar string
+
+=item deletelist($target,$token)
+
+provide a yes option in an HTML select element; return scalar string
+
+=item handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,
+$style)
+
+respond to a user delete request by passing relevant stack
+and array information to various rendering functions; return a scalar string
+
+=item get_insert_list($token)
+
+provide an insertion list based on possibilities from lonxml; return a scalar string
+
+=item insertlist($target,$token)
+
+api that uses get_insert_list; return a scalar string
+
+=item handleinsert($token)
+
+provide an insertion list based on possibilities from lonxml; return a scalar string
+
+=item get_insert_list($token)
+
+provide an insertion list based on possibilities from lonxml; return a scalar string
+
+=item browse($elementname)
+
+provide a link which will open up the filesystem browser (lonindexer) and, once a file is selected, place the result in the form element $elementname.
+
+=item search($elementname)
+
+provide a link which will open up the filesystem searcher (lonsearchcat) and, once a file is selected, place the result in the form element $elementname.
+
+=item editline(tag,data,description,size)
+
+Provide a <input type="text" ../> for single-line text entry.  This is to be used for text enclosed by tags, not arguements/parameters associated with a tag.
+
+=back
+
+=cut
+
 package Apache::edit; 
 
 use strict;
 use Apache::lonnet;
 use HTML::Entities();
 use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 # Global Vars
 # default list of colors to use in editing
@@ -58,7 +165,7 @@ sub tag_start {
 	    if (!$description) { $description="&lt;$tag&gt;"; }
 	}
 	$result.= &start_table($token)."<tr><td>$description</td>
-                      <td>Delete".
+                      <td>".&mt('Delete?').' '.
 		      &deletelist($target,$token)
 		      ."</td>
                        <td>".
@@ -87,24 +194,17 @@ sub tag_end {
 
 sub start_table {
     my ($token)=@_;
-    my $tag = $token->[1];
-    my $tagnum;
-    foreach my $namespace (reverse @Apache::lonxml::namespace) {
-	my $testtag=$namespace.'::'.$tag;
-	$tagnum=$Apache::lonxml::insertlist{"$testtag.num"};
-	&Apache::lonxml::debug(" $testtag ");
-	if (defined($tagnum)) { last; }
-    }
-    if (!defined ($tagnum)) {$tagnum=$Apache::lonxml::insertlist{"$tag.num"};}
-    my $color = $Apache::lonxml::insertlist{"$tagnum.color"};
-    &Apache::lonxml::debug(" $tagnum -- $color");
+    my $tag = &Apache::lonxml::get_tag($token);
+    
+    my $color = $Apache::lonxml::insertlist{"$tag.color"};
+    &Apache::lonxml::debug(" $tag -- $color");
     if (!defined($color)) {
 	$color = $Apache::edit::colorlist[$Apache::edit::colordepth];
     }
     $Apache::edit::colordepth++;
     push(@Apache::edit::inserttag,$token->[1]);
     my $result='<div align="right">';
-    $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="5" cellpadding="3">';
+    $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="3" cellpadding="2">';
     return $result;
 }
 
@@ -116,17 +216,23 @@ sub end_table {
     my ($tagname,$closingtag);
     if (defined($Apache::edit::inserttag[-2])) {
 	$tagname=$Apache::edit::inserttag[-2];
-    } else {$tagname='problem';}
+    } else {
+	if ($Apache::lonhomework::parsing_a_task) {
+	    $tagname='Task';
+	} else {
+	    $tagname='problem';
+	}
+    }
     if (defined($Apache::edit::inserttag[-1])) {
 	$closingtag=$Apache::edit::inserttag[-1];
     }
     $result.=&innerinsertlist('edit',$tagname,$closingtag).
 	"</td></tr></table></div>";
-    pop(@Apache::edit::inserttag);
+    my $last = pop(@Apache::edit::inserttag);
     return $result;
 }
 
-sub start_spanning_row { return '<tr><td colspan="4" bgcolor="#DDDDDD">';}
+sub start_spanning_row { return '<tr><td colspan="5" bgcolor="#F0F0F0">';}
 sub start_row          { return '<tr><td bgcolor="#DDDDDD">';            }
 sub end_row            { return '</td></tr>';          }
 
@@ -143,7 +249,7 @@ sub deletelist {
     my ($target,$token) = @_;
     my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">
 <option></option>
-<option>Yes</option>
+<option>".&mt('yes')."</option>
 </select>";
     return $result;
 }
@@ -174,20 +280,21 @@ sub handle_delete {
 sub get_insert_list {
     my ($tagname) = @_;
     my $result='';
-    my @tagnums= ();
+    my @tags= ();
     #&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));
     if ($Apache::lonxml::insertlist{"$tagname.which"}) {
-	push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} });
+	push (@tags, @{ $Apache::lonxml::insertlist{"$tagname.which"} });
     }
     foreach my $namespace (@Apache::lonxml::namespace) {
 	if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) {
-	    push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });
+	    push (@tags, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });
 	}
     }
-    if (@tagnums) {
+    if (@tags) {
 	my %options;
-	foreach my $tagnum (@tagnums) {
-	    my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"};
+	foreach my $tag (@tags) {
+	    my $descrip=$Apache::lonxml::insertlist{"$tag.description"};
+	    my $tagnum =$Apache::lonxml::insertlist{"$tag.num"};
 	    $options{$descrip} ="<option value=\"$tagnum\">".
 		$descrip."</option>\n";
 	}
@@ -212,7 +319,7 @@ sub innerinsertlist {
     if ($target eq 'edit') {
 	my $optionlist= &get_insert_list($tagname);
 	if ($optionlist) {
-	    $result = "Insert:
+	    $result = &mt('Insert:')."
             <select name=\"insert$after\_$Apache::lonxml::curdepth\">
                   $optionlist
             </select>"
@@ -225,40 +332,32 @@ sub innerinsertlist {
 
 sub handle_insert {
     if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
-    my $result;
     my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"};
-    my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
-    if ($func eq 'default') {
-	my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
-	my $namespace;
-	if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
-	$result.="\n<$newtag>\n</$newtag>";
-    } else {
-	if (defined(&$func)) {
-	    {
-		no strict 'refs';
-		$result.=&$func();
-	    }
-	} else {
-	    my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
-	    &Apache::lonxml::error("Unable to insert tag ".$Apache::lonxml::curdepth." ($tagnum) $newtag, func was not defined.");
-	}
-    }
-    return $result;
+    return &do_insert($tagnum);
 }
 
 sub handle_insertafter {
     my $tagname=shift;
-    if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
-    { return ''; }
-    my $result;
+    if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') {
+	return '';
+    }
     my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
-    my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
+    return &do_insert($tagnum,1);
+}
+
+sub do_insert {
+    my ($tagnum,$after) = @_;
+    my $result;
+
+    my $newtag = $Apache::lonxml::insertlist{"$tagnum.tag"};
+    my $func   = $Apache::lonxml::insertlist{"$newtag.function"};
     if ($func eq 'default') {
-	my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
 	my $namespace;
 	if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
-	$result.="\n<$newtag>\n</$newtag>";
+	my $depth = scalar(@Apache::lonxml::depthcounter);
+	$depth -- if ($after);
+	my $inset = "\t"x$depth;
+	$result.="\n$inset<$newtag></$newtag>";
     } else {
 	if (defined(&$func)) {
 	    {
@@ -266,8 +365,7 @@ sub handle_insertafter {
 		$result.=&$func();
 	    }
 	} else {
-	    my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
-	    &Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)");
+	    &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined. ($tagnum)");
 	}
     }
     return $result;
@@ -299,6 +397,79 @@ sub insert_formularesponse {
 </formularesponse>';
 }
 
+sub insert_functionplotresponse {
+    return '
+<functionplotresponse>
+<functionplotelements>
+</functionplotelements>
+<functionplotruleset>
+</functionplotruleset>
+</functionplotresponse>';
+}
+
+sub insert_spline {
+    return '
+<spline />';
+}
+
+sub insert_backgroundplot {
+    return '
+<backgroundplot />';
+}
+
+sub insert_plotobject {
+    return '
+<plotobject />';
+}
+
+sub insert_plotvector {
+    return '
+<plotvector />';
+}
+
+sub insert_functionplotrule {
+    return '
+<functionplotrule />';
+}
+
+sub insert_functionplotvectorrule {
+    return '
+<functionplotvectorrule />';
+}
+
+sub insert_functionplotvectorsumrule {
+    return '
+<functionplotvectorsumrule />';
+}
+
+sub insert_functionplotcustomrule {
+    return '
+<functionplotcustomrule>
+<answer type="loncapa/perl">
+# &fpr_val("label"), &fpr_f($x), &fpr_dfdx($x), &fpr_d2fdx2($x)
+# ($xs,$xe,$ys,$ye)=&fpr_vectorcoords("Name"), ($x,$y)=&fpr_objectcoords("Name")
+# &fpr_vectorlength("Name"), &fpr_vectorangle("Name")
+ 
+# Return 0 or 1
+return 1;
+</answer>
+</functionplotcustomrule>';
+}
+
+sub insert_functionplotruleset {
+    return '
+<functionplotruleset>
+<functionplotrule />
+</functionplotruleset>';
+}
+
+sub insert_functionplotelements {
+    return '
+<functionplotelements>
+<spline />
+</functionplotelements>';
+}
+
 sub insert_numericalresponse {
     return '
 <numericalresponse answer="">
@@ -330,6 +501,56 @@ sub insert_customresponse_answer {
 ';
 }
 
+sub insert_customhint {
+    return '
+        <customhint>
+            <answer type="loncapa/perl">
+            </answer>
+        </customhint>';
+}
+
+sub insert_customhint_answer {
+    return '
+            <answer type="loncapa/perl">
+            </answer>
+';
+}
+
+sub insert_mathresponse {
+    return '
+<mathresponse>
+    <answer>
+    </answer>
+    <textline />
+    <hintgroup>
+        <startouttext />
+        <endouttext />
+    </hintgroup>
+</mathresponse>';
+}
+
+sub insert_mathresponse_answer {
+    return '
+    <answer>
+    </answer>
+';
+}
+
+sub insert_mathhint {
+    return '
+        <mathhint>
+            <answer>
+            </answer>
+        </mathhint>';
+}
+
+sub insert_mathhint_answer {
+    return '
+            <answer>
+            </answer>
+';
+}
+
 sub insert_stringresponse {
     return '
 <stringresponse answer="" type="">
@@ -444,6 +665,9 @@ sub insert_matchresponse {
 </matchresponse>';
 }
 
+sub insert_startpartmarker { return '<startpartmarker />'; }
+sub insert_endpartmarker { return '<endpartmarker />'; }
+
 sub insert_displayduedate { return '<displayduedate />'; }
 sub insert_displaytitle   { return '<displaytitle />'; }
 sub insert_hintpart {
@@ -466,6 +690,18 @@ sub insert_numericalhint {
 </numericalhint>';
 }
 
+sub insert_reactionhint {
+    return '
+<reactionhint>
+</reactionhint>';
+}
+
+sub insert_organichint {
+    return '
+<organichint>
+</organichint>';
+}
+
 sub insert_stringhint {
     return '
 <stringhint>
@@ -504,11 +740,14 @@ sub js_change_detection {
 <script type="text/javascript">
 var clean = true;
 var is_submit = false;
+var still_ask = false;
 function compareForm(event_) {
         if (!event_ && window.event) {
           event_ = window.event;
         }
-	if (!is_submit && !clean) {
+	if ((!is_submit || (is_submit && still_ask)) && !clean) {
+	    still_ask = false;
+	    is_submit = false;
             event_.returnValue = "$unsaved";
             return "$unsaved";
         }
@@ -529,6 +768,17 @@ sub element_change_detection {
     return ' onchange="unClean();" ';
 }
 
+sub submit_ask_anyway {
+    my ($extra_action) = @_;
+    return ' onclick="still_ask=true;'.$extra_action.'" ';
+}
+
+sub submit_dont_ask {
+    my ($extra_action) = @_;
+    return ' onclick="is_submit=true;'.$extra_action.'" ';
+}
+
+
 sub textarea_sizes {
     my ($data)=@_;
     my $count=0;
@@ -546,7 +796,7 @@ sub textarea_sizes {
 sub editline {
     my ($tag,$data,$description,$size)=@_;
     $data=&HTML::Entities::encode($data,'<>&"');
-    if ($description) { $description="<br />".$description."<br />"; }
+    if ($description) { $description=$description."<br />"; }
     my $change_code = &element_change_detection();
     my $result = <<"END";
 $description
@@ -560,23 +810,27 @@ sub editfield {
     my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;
 
     my ($rows,$cols)=&textarea_sizes(\$data);
-    if (&Apache::lonhtmlcommon::htmlareabrowser() &&
-	!&Apache::lonhtmlcommon::htmlareablocked()) {
+    my $textareaclass;
+ 
+    if (&Apache::lonhtmlcommon::htmlareabrowser() && $usehtmlarea) { 
 	$rows+=7;      # make room for HTMLarea
 	$minheight+=7; # make room for HTMLarea
+        $textareaclass = ' class="LC_richDefaultOff"';
     }
     if ($cols > 80) { $cols = 80; }
     if ($cols < $minwidth ) { $cols = $minwidth; }
     if ($rows < $minheight) { $rows = $minheight; }
-    if ($description) { $description="<br />".$description."<br />"; }
-    if ($usehtmlarea) {
-	push @Apache::lonxml::htmlareafields,'homework_edit_'.
-	    $Apache::lonxml::curdepth;
-    }
-    return $description."\n".'&nbsp;&nbsp;&nbsp;<textarea style="width:100%" rows="'.$rows.
+    if ($description) { $description=$description."<br />"; }
+
+    # remove typesetting whitespace from between data and the end tag
+    # to make the edit look prettier
+    $data =~ s/\n?[ \t]*$//;
+
+    return $description."\n".'<textarea style="width:99%" rows="'.$rows.
 	'" cols="'.$cols.'" name="homework_edit_'.
 	$Apache::lonxml::curdepth.'" id="homework_edit_'.
-	$Apache::lonxml::curdepth.'" '.&element_change_detection().'>'.
+	$Apache::lonxml::curdepth.'" '.&element_change_detection().
+        $textareaclass.'>'.
 	&HTML::Entities::encode($data,'<>&"').'</textarea>'.
 	($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
 			 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
@@ -585,15 +839,17 @@ sub editfield {
 sub modifiedfield {
     my ($endtag,$parser) = @_;
     my $result;
-#  foreach my $envkey (sort keys %env) {
-#    &Apache::lonxml::debug("$envkey ---- $env{$envkey}");
-#  }
-#  &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; }
+    if ($bodytext=~/^\n/) {
+	$result="\n".$result;
+    }
+    # if there is typesetting whitespace from between the data and the end tag
+    # restore to keep the source looking pretty
+    if ($bodytext =~ /(\n?[ \t]*)$/) {
+	$result .= $1;
+    }
     return $result;
 }
 
@@ -615,6 +871,10 @@ sub get_new_args {
 		$token->[2]->{$arg}=$newvalue;
 	    }
 	    $rebuild=1;
+	    # add new attributes to the of the attribute seq
+	    if (!grep { $arg eq $_ } (@{ $token->[3] })) {
+		push(@{ $token->[3] },$arg);
+	    }
 	} elsif (!defined($newvalue) && defined($value)) {
 	    delete($token->[2]->{$arg});
 	    $rebuild=1;
@@ -629,11 +889,13 @@ sub rebuild_tag {
     my $result;
     if ($token->[0] eq 'S') {
 	$result = '<'.$token->[1];
-	while (my ($key,$val)= each(%{$token->[2]})) {
-	    $val=~s:^\s+|\s+$::g;
-	    $val=~s:"::g; #"
-	    &Apache::lonxml::debug("setting :$key: to  :$val:");
-	    $result.=' '.$key.'="'.$val.'"';
+	foreach my $attribute (@{ $token->[3] }) {
+	    my $value = $token->[2]{$attribute};
+	    next if ($value eq '');
+	    $value =~s/^\s+|\s+$//g;
+	    $value =~s/\"//g;
+	    &Apache::lonxml::debug("setting :$attribute: to  :$value:");
+	    $result.=' '.$attribute.'="'.$value.'"';
 	}
 	if ($token->[4] =~ m:/>$:) {
 	    $result.=' />';
@@ -676,28 +938,31 @@ sub checked_arg {
 	    $text=$option;
 	    $value='value="'.$option.'"';
 	}
-	$result.="<nobr><input type='checkbox' $value name='".
-	    &html_element_name($name)."'";
+	$result.='<span class="LC_nobreak"><label><input type="checkbox" '.$value.' name="'.
+	    &html_element_name($name).'"';
 	foreach my $selected (split(/,/,$allselected)) {
 	    if ( $selected eq $option ) {
-		$result.=" checked='checked' ";
+		$result.=' checked="checked" ';
 		last;
 	    }
 	}
-	$result.=&element_change_detection()." />$text</nobr>\n";
+	$result.=&element_change_detection().' />'.$text.'</label></span>'."\n";
     }
     return $result;
 }
 
 sub text_arg {
-    my ($description,$name,$token,$size) = @_;
+    my ($description,$name,$token,$size, $class) = @_;
     my $result;
     if (!defined $size) { $size=20; }
     my $arg=$token->[2]{$name};
     $result=&mt($description).'&nbsp;<input name="'.&html_element_name($name).
-	'" type="text" value="'.$arg.'" size="'.$size.'" '.
-	&element_change_detection().'/>';
-    return '<nobr>'.$result.'</nobr>';
+	'" type="text" value="'.$arg.'" size="'.$size.'" ';
+    if (defined $class) {
+	$result .= 'class="' . $class . '" ';
+    }
+    $result .=	&element_change_detection().'/>';
+    return '<span class="LC_nobreak">'.$result.'</span>';
 }
 
 sub select_arg {
@@ -705,26 +970,28 @@ sub select_arg {
     my $result;
     my $optionlist="";
     my $selected=$token->[2]{$name};
-    foreach my $option (@$list) {
-	my ($text,$value);
-	if ( ref($option) eq 'ARRAY') {
-	    $value='value="'.&HTML::Entities::encode($$option[0]).'"';
-	    $text=$$option[1];
-	    $option=$$option[0];
-	} else {
-	    $text=$option;
-	    $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
-	}
-	if ( $selected eq $option ) {
-	    $optionlist.="<option $value selected=\"selected\">$text</option>\n";
-	} else {
-	    $optionlist.="<option $value >$text</option>\n";
-	}
+    if (ref($list) eq 'ARRAY') {
+        foreach my $option (@{$list}) {
+	    my ($text,$value);
+	    if (ref($option) eq 'ARRAY') {
+	        $value='value="'.&HTML::Entities::encode($option->[0]).'"';
+	        $text=$option->[1];
+	        $option=$option->[0];
+	    } else {
+	        $text=$option;
+	        $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
+	    }
+	    if ( $selected eq $option ) {
+	        $optionlist.="<option $value selected=\"selected\">".&mt($text)."</option>\n";
+	    } else {
+	        $optionlist.="<option $value >".&mt($text)."</option>\n";
+	    }
+        }
     }
-    $result.='<nobr>'.$description.'&nbsp;<select name="'.
+    $result.='<span class="LC_nobreak">'.&mt($description).'&nbsp;<select name="'.
 	&html_element_name($name).'" '.&element_change_detection().' >
        '.$optionlist.'
-      </select></nobr>';
+      </select></span>';
     return $result;
 }
 
@@ -734,22 +1001,24 @@ sub select_or_text_arg {
     my $optionlist="";
     my $found=0;
     my $selected=$token->[2]{$name};
-    foreach my $option (@$list) {
-	my ($text,$value);
-	if ( ref($option) eq 'ARRAY') {
-	    $value='value="'.&HTML::Entities::encode($$option[0]).'"';
-	    $text=$$option[1];
-	    $option=$$option[0];
-	} else {
-	    $text=$option;
-	    $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
-	}
-	if ( $selected eq $option ) {
-	    $optionlist.="<option $value selected=\"selected\">$text</option>\n";
-	    $found=1;
-	} else {
-	    $optionlist.="<option $value>$text</option>\n";
-	}
+    if (ref($list) eq 'ARRAY') {
+        foreach my $option (@{$list}) {
+	    my ($text,$value);
+	    if (ref($option) eq 'ARRAY') {
+	        $value='value="'.&HTML::Entities::encode($option->[0]).'"';
+	        $text=$option->[1];
+	        $option=$option->[0];
+	    } else {
+	        $text=$option;
+	        $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
+	    }
+	    if ( $selected eq $option ) {
+	        $optionlist.="<option $value selected=\"selected\">$text</option>\n";
+	        $found=1;
+	    } else {
+	        $optionlist.="<option $value>$text</option>\n";
+	    }
+        }
     }
     $optionlist.="<option value=\"TYPEDINVALUE\"".
  	((!$found)?' selected="selected"':'').
@@ -770,7 +1039,7 @@ sub select_or_text_arg {
     $description=&mt($description);
 #
     return (<<ENDSELECTORTYPE);
-<nobr>
+<span class="LC_nobreak">
 $description
 &nbsp;<select name="$selectelement"
 onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
@@ -781,7 +1050,7 @@ $optionlist
 onChange="$hiddenvalue=$typedinvalue;"
 onFocus="$selectedindex=$selecttypeinindex-1;" />
 <input type="hidden" name="$element" value="$selected" $change_code />
-</nobr>
+</span>
 ENDSELECTORTYPE
 }
 
@@ -792,13 +1061,13 @@ sub entercoords {
     unless ($Apache::edit::bgimgsrc) { return ''; }
     if ($idx) { $idx.='_'; }
     if ($idy) { $idy.='_'; }
-    my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
+    my $bgfile=&escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {
-        $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth");
+        $element = &escape("$Apache::lonxml::curdepth");
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
-        $element = &Apache::lonnet::escape('homework_edit_'.
+        $element = &escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
     my $id=$Apache::lonxml::curdepth;
@@ -816,7 +1085,7 @@ sub entercoords {
 	$data{"imagechoice.$id.formwidth"}=$width.'_'.
 	    $Apache::edit::bgimgsrccurdepth;
     }
-    &Apache::lonnet::appenv(%data);
+    &Apache::lonnet::appenv(\%data);
     my $text="Click Coordinates";
     my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;
@@ -827,13 +1096,13 @@ sub entercoords {
 sub entercoord {
     my ($idx,$mode,$width,$height,$type) = @_;
     unless ($Apache::edit::bgimgsrc) { return ''; }
-    my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
+    my $bgfile=&escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {
-        $element = &Apache::lonnet::escape("$idx\_$Apache::lonxml::curdepth");
+        $element = &escape("$idx\_$Apache::lonxml::curdepth");
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
-        $element = &Apache::lonnet::escape('homework_edit_'.
+        $element = &escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
     my $id=$Apache::lonxml::curdepth;
@@ -849,7 +1118,7 @@ sub entercoord {
 	$data{"imagechoice.$id.formwidth"}=$width.'_'.
 	    $Apache::edit::bgimgsrccurdepth;
     }
-    &Apache::lonnet::appenv(%data);
+    &Apache::lonnet::appenv(\%data);
     my $text="Enter Coordinates";
     if ($type eq 'polygon') { $text='Create Polygon Data'; }
     my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
@@ -857,24 +1126,26 @@ sub entercoord {
 }
 
 sub deletecoorddata {
-    &Apache::lonnet::delenv("imagechoice\\.");
+    &Apache::lonnet::delenv('imagechoice.');
 }
 
 #----------------------------------------------------- browse
 sub browse {
     # insert a link to call up the filesystem browser (lonindexer)
-    my ($id, $mode, $titleid) = @_;
+    my ($id, $mode, $titleid, $only) = @_;
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {
-        $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
+        $element = &escape("$id\_$Apache::lonxml::curdepth");
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
-        $element = &Apache::lonnet::escape('homework_edit_'.
+        $element = &escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);	
     }
     my $titleelement;
     if ($titleid) {
-	$titleelement=",'','','".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";
+	$titleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
+    } else {
+        $titleelement=",'$only'";
     }
     my $result = <<"ENDBUTTON";
 <a href=\"javascript:openbrowser('$form','$element'$titleelement)\"\>Select</a>
@@ -889,14 +1160,14 @@ sub search {
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {
-        $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
+        $element = &escape("$id\_$Apache::lonxml::curdepth");
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
-        $element = &Apache::lonnet::escape('homework_edit_'.
+        $element = &escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
     my $titleelement;
     if ($titleid) {
-	$titleelement=",'".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'";
+	$titleelement=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
     }
     my $result = <<"ENDBUTTON";
 <a href=\"javascript:opensearcher('$form','$element'$titleelement)\"\>Search</a>
@@ -908,119 +1179,4 @@ ENDBUTTON
 1;
 __END__
 
-=head1 NAME
-
-Apache::edit - edit mode helpers
-
-=head1 SYNOPSIS
-
-Invoked by many homework and xml related modules.
-
- &Apache::edit::SUBROUTINENAME(ARGUMENTS);
-
-=head1 INTRODUCTION
-
-This module outputs HTML syntax helpful for the rendering of edit
-mode interfaces.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-There is no handler subroutine.
-
-=head1 OTHER SUBROUTINES
-
-=over 4
-
-=item *
-
-initialize_edit() : initialize edit (set colordepth to zero)
-
-=item *
-
-tag_start($target,$token,$description) : provide deletion and insertion lists
-for the manipulation of a start tag; return a scalar string
-
-=item *
-
-tag_end($target,$token,$description) : ending syntax corresponding to
-&tag_start. return a scalar string.
 
-=item *
-
-start_table($token) : start table; update colordepth; return scalar string.
-
-=item *
-
-end_table() : reduce color depth; end table; return scalar string
-
-=item *
-
-start_spanning_row() : start a new table row spanning the 'edit' environment.
-
-=item *
-
-start_row() : start a new table row and element. 
-
-=item *
-
-end_row() : end current table element and row.
-
-=item *
-
-movebuttons($target,$token) : move-up and move-down buttons; return scalar
-string
-
-=item *
-
-deletelist($target,$token) : provide a yes option in an HTML select element;
-return scalar string
-
-=item *
-
-handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,
-$style) : respond to a user delete request by passing relevant stack
-and array information to various rendering functions; return a scalar string
-
-=item *
-
-get_insert_list($token) : provide an insertion list based on possibilities
-from lonxml; return a scalar string
-
-=item *
-
-insertlist($target,$token) : api that uses get_insert_list;
-return a scalar string
-
-=item *
-
-handleinsert($token) : provide an insertion list based on possibilities
-from lonxml; return a scalar string
-
-=item *
-
-get_insert_list($token) : provide an insertion list based on possibilities
-from lonxml; return a scalar string
-
-=item *
-browse($elementname) : provide a link which will open up the filesystem
-browser (lonindexer) and, once a file is selected, place the result in
-the form element $elementname.
-
-=item *
-search($elementname) : provide a link which will open up the filesystem
-searcher (lonsearchcat) and, once a file is selected, place the result in
-the form element $elementname.
-
-=item *
-editline(tag,data,description,size): Provide a <input type="text" ../> for
-single-line text entry.  This is to be used for text enclosed by tags, not
-arguements/parameters associated with a tag.
-
-=back
-
-incomplete...
-
-=cut