--- loncom/homework/edit.pm	2010/11/07 01:57:50	1.132
+++ loncom/homework/edit.pm	2013/09/05 12:07:29	1.148
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.132 2010/11/07 01:57:50 www Exp $
+# $Id: edit.pm,v 1.148 2013/09/05 12:07:29 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -175,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();
@@ -203,7 +203,7 @@ sub start_table {
     }
     $Apache::edit::colordepth++;
     push(@Apache::edit::inserttag,$token->[1]);
-    my $result='<div align="right">';
+    my $result='<div>';
     $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="3" cellpadding="2">';
     return $result;
 }
@@ -211,7 +211,7 @@ sub start_table {
 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])) {
@@ -400,8 +400,10 @@ sub insert_formularesponse {
 sub insert_functionplotresponse {
     return '
 <functionplotresponse>
-<spline />
-<functionplotrule />
+<functionplotelements>
+</functionplotelements>
+<functionplotruleset>
+</functionplotruleset>
 </functionplotresponse>';
 }
 
@@ -415,12 +417,64 @@ sub insert_backgroundplot {
 <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 '
@@ -434,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>
@@ -606,6 +667,9 @@ sub insert_matchresponse {
 <matchresponse max="10">
     <foilgroup options="">
       <itemgroup>
+        <item>
+          <startouttext /><endouttext />
+        </item>
       </itemgroup>
       <foil>
          <startouttext /><endouttext />
@@ -690,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;
@@ -708,6 +773,7 @@ function unClean() {
      clean=false;
 }
 window.onbeforeunload = compareForm;
+// ]]>
 </script>
 SCRIPT
 }
@@ -725,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;
@@ -766,20 +838,20 @@ sub editfield {
     if ($cols > 80) { $cols = 80; }
     if ($cols < $minwidth ) { $cols = $minwidth; }
     if ($rows < $minheight) { $rows = $minheight; }
-    if ($description) { $description=$description."<br />"; }
+    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().
         $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 {
@@ -884,7 +956,7 @@ sub checked_arg {
 	    $text=$option;
 	    $value='value="'.$option.'"';
 	}
-	$result.='<span class="LC_nobreak"><label><input type="checkbox" '.$value.' 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 ) {
@@ -898,14 +970,17 @@ sub checked_arg {
 }
 
 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 '<span class="LC_nobreak">'.$result.'</span>';
+	'" 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 {
@@ -931,7 +1006,7 @@ sub select_arg {
 	    }
         }
     }
-    $result.='<span class="LC_nobreak">'.&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></span>';
@@ -982,16 +1057,16 @@ sub select_or_text_arg {
     $description=&mt($description);
 #
     return (<<ENDSELECTORTYPE);
-<span class="LC_nobreak">
+ <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 />
 </span>
 ENDSELECTORTYPE