--- loncom/homework/edit.pm	2008/10/24 16:22:54	1.116
+++ loncom/homework/edit.pm	2013/12/03 17:22:08	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.116 2008/10/24 16:22:54 bisitz Exp $
+# $Id: edit.pm,v 1.150 2013/12/03 17:22:08 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,110 @@
 # 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;
@@ -57,7 +161,7 @@ sub tag_start {
     if ($target eq "edit") {
 	my $tag=$token->[1];
 	if (!$description) {
-	    $description=&Apache::lonxml::description($token);
+	    $description=&mt(&Apache::lonxml::description($token));
 	    if (!$description) { $description="&lt;$tag&gt;"; }
 	}
 	$result.= &start_table($token)."<tr><td>$description</td>
@@ -71,7 +175,7 @@ sub tag_start {
 #    "</tr><tr><td colspan=\"3\">\n";
 	my @help = Apache::lonxml::helpinfo($token);
 	if ($help[0]) {
-	    $result .= '</td><td align="right" valign="top">' .
+	    $result .= '</td><td class="LC_edit_problem_latexhelper">'.
 		Apache::loncommon::help_open_topic(@help);
 	} else { $result .= "</td><td>&nbsp;"; }
 	$result .= &end_row().&start_spanning_row();
@@ -99,15 +203,15 @@ sub start_table {
     }
     $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">';
+    my $result='<div>';
+    $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="3" cellpadding="2">';
     return $result;
 }
 
 sub end_table {
     $Apache::edit::colordepth--;
     my $result='</table></div>';
-    $result.='<div align="left"><table><tr><td>';
+    $result.='<div><table><tr><td>';
 
     my ($tagname,$closingtag);
     if (defined($Apache::edit::inserttag[-2])) {
@@ -128,7 +232,7 @@ sub end_table {
     return $result;
 }
 
-sub start_spanning_row { return '<tr><td colspan="5" 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>';          }
 
@@ -253,7 +357,7 @@ sub do_insert {
 	my $depth = scalar(@Apache::lonxml::depthcounter);
 	$depth -- if ($after);
 	my $inset = "\t"x$depth;
-	$result.="\n$inset<$newtag>\n$inset</$newtag>";
+	$result.="\n$inset<$newtag></$newtag>";
     } else {
 	if (defined(&$func)) {
 	    {
@@ -293,6 +397,85 @@ 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_drawvectorsum {
+    return '
+<drawvectorsum />';
+}
+
+
+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="">
@@ -305,6 +488,13 @@ sub insert_numericalresponse {
 </numericalresponse>';
 }
 
+sub insert_externalresponse {
+    return '
+<externalresponse url="" answer="" answerdisplay="" form="">
+    <textfield spellcheck="none" />
+</externalresponse>';
+}
+
 sub insert_customresponse {
     return '
 <customresponse>
@@ -477,6 +667,9 @@ sub insert_matchresponse {
 <matchresponse max="10">
     <foilgroup options="">
       <itemgroup>
+        <item>
+          <startouttext /><endouttext />
+        </item>
       </itemgroup>
       <foil>
          <startouttext /><endouttext />
@@ -488,6 +681,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 {
@@ -510,6 +706,18 @@ sub insert_numericalhint {
 </numericalhint>';
 }
 
+sub insert_reactionhint {
+    return '
+<reactionhint>
+</reactionhint>';
+}
+
+sub insert_organichint {
+    return '
+<organichint>
+</organichint>';
+}
+
 sub insert_stringhint {
     return '
 <stringhint>
@@ -546,6 +754,7 @@ sub js_change_detection {
     my $unsaved=&mt("There are unsaved changes");
     return (<<SCRIPT);
 <script type="text/javascript">
+// <![CDATA[
 var clean = true;
 var is_submit = false;
 var still_ask = false;
@@ -564,6 +773,7 @@ function unClean() {
      clean=false;
 }
 window.onbeforeunload = compareForm;
+// ]]>
 </script>
 SCRIPT
 }
@@ -581,6 +791,12 @@ sub submit_ask_anyway {
     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;
@@ -612,30 +828,30 @@ 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=$description."<br />"; }
-    if ($usehtmlarea) {
-	&Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'.
-						   $Apache::lonxml::curdepth);
-    }
+    if ($description) { $description='<br />'.&mt($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:100%" rows="'.$rows.
+    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";
+        ($usehtmlarea?'<br />'.&Apache::lonhtmlcommon::spelllink('lonhomework',
+                                   'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
 }
 
 sub modifiedfield {
@@ -734,34 +950,37 @@ sub checked_arg {
 	my ($value,$text);
 	if ( ref($option) eq 'ARRAY') {
 	    $value='value="'.$$option[0].'"';
-	    $text=$$option[1];
+	    $text=&mt($$option[1]);
 	    $option=$$option[0];
 	} else {
-	    $text=$option;
+	    $text=&mt($option);
 	    $value='value="'.$option.'"';
 	}
-	$result.="<nobr><label><input type=\"checkbox\" $value name=\"".
-	    &html_element_name($name)."\"";
+        $result.=' <span class="LC_edit_opt"><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</label></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_edit_opt">'.$result.'</span>';
 }
 
 sub select_arg {
@@ -769,26 +988,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\">".&mt($text)."</option>\n";
-	} else {
-	    $optionlist.="<option $value >".&mt($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>'.&mt($description).'&nbsp;<select name="'.
+    $result.=' <span class="LC_edit_opt">'.&mt($description).'&nbsp;<select name="'.
 	&html_element_name($name).'" '.&element_change_detection().' >
        '.$optionlist.'
-      </select></nobr>';
+      </select></span>';
     return $result;
 }
 
@@ -798,22 +1019,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"':'').
@@ -834,18 +1057,18 @@ sub select_or_text_arg {
     $description=&mt($description);
 #
     return (<<ENDSELECTORTYPE);
-<nobr>
+ <span class="LC_edit_opt">
 $description
 &nbsp;<select name="$selectelement"
-onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
+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;" />
+onchange="$hiddenvalue=$typedinvalue;"
+onfocus="$selectedindex=$selecttypeinindex-1;" />
 <input type="hidden" name="$element" value="$selected" $change_code />
-</nobr>
+</span>
 ENDSELECTORTYPE
 }
 
@@ -921,7 +1144,7 @@ sub entercoord {
 }
 
 sub deletecoorddata {
-    &Apache::lonnet::delenv("imagechoice\\.");
+    &Apache::lonnet::delenv('imagechoice.');
 }
 
 #----------------------------------------------------- browse
@@ -974,119 +1197,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