--- loncom/homework/edit.pm	2012/08/07 14:54:10	1.142
+++ loncom/homework/edit.pm	2015/01/19 15:35:53	1.153
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.142 2012/08/07 14:54:10 raeburn Exp $
+# $Id: edit.pm,v 1.153 2015/01/19 15:35:53 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,21 +161,18 @@ 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="<$tag>"; }
 	}
-	$result.= &start_table($token)."<tr><td>$description</td>
-                      <td>".&mt('Delete?').' '.
-		      &deletelist($target,$token)
-		      ."</td>
-                       <td>".
-		       &insertlist($target,$token);
+    $result.= &start_table($token)."<tr><td>".&Apache::loncommon::insert_folding_button().
+        " $description</td><td>".&mt('Delete?')." ".&deletelist($target,$token).
+        "</td><td>".&insertlist($target,$token);
 #<td>". 
 #  &movebuttons($target,$token).
 #    "</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 +200,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 +208,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])) {
@@ -232,7 +229,10 @@ sub end_table {
     return $result;
 }
 
-sub start_spanning_row { return '<tr><td colspan="5" bgcolor="#F0F0F0">';}
+sub start_spanning_row {
+    return '<tr name="foldblock_'.$Apache::lonxml::curdepth.
+    '" style="visibility: \'\'"><td colspan="5" bgcolor="#F0F0F0">';
+}
 sub start_row          { return '<tr><td bgcolor="#DDDDDD">';            }
 sub end_row            { return '</td></tr>';          }
 
@@ -296,7 +296,7 @@ sub get_insert_list {
 	    my $descrip=$Apache::lonxml::insertlist{"$tag.description"};
 	    my $tagnum =$Apache::lonxml::insertlist{"$tag.num"};
 	    $options{$descrip} ="<option value=\"$tagnum\">".
-		$descrip."</option>\n";
+		&mt($descrip)."</option>\n";
 	}
 	foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
 	if ($result) { $result='<option selected="selected"></option>'.$result; }
@@ -488,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>
@@ -660,6 +667,9 @@ sub insert_matchresponse {
 <matchresponse max="10">
     <foilgroup options="">
       <itemgroup>
+        <item>
+          <startouttext /><endouttext />
+        </item>
       </itemgroup>
       <foil>
          <startouttext /><endouttext />
@@ -778,14 +788,59 @@ sub element_change_detection {
 
 sub submit_ask_anyway {
     my ($extra_action) = @_;
-    return ' onclick="still_ask=true;'.$extra_action.'" ';
+    my $resource = $env{'request.ambiguous'};
+    return ' onclick="saveScrollPosition(\''.$resource.'\');still_ask=true;'.$extra_action.';" ';
 }
 
 sub submit_dont_ask {
     my ($extra_action) = @_;
-    return ' onclick="is_submit=true;'.$extra_action.'" ';
+    my $resource = $env{'request.ambiguous'};
+    return ' onclick="saveScrollPosition(\''.$resource.'\');is_submit=true;'.$extra_action.';" ';
+}
+
+sub js_update_linknum {
+    return (<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+function updateNumber(name,index,caller,textprompt) {
+    var pickitem = document.getElementById(name+'_'+index);
+    var picknumtext = document.getElementById(name+'_numtext_'+index);
+    if (pickitem.checked) {
+        var showval = '';
+        if (pickitem.value != 'nochoice') {
+            showval = pickitem.value;
+        } 
+        var picknum=prompt(textprompt,showval);
+        if (picknum == '' || picknum == null) {
+            if (caller == 'check') {
+                pickitem.checked=false;
+                pickitem.value='nochoice';
+            }
+        } else {
+            picknum.toString();
+            var regexdigit=/^\\d+\$/;
+            if (regexdigit.test(picknum)) {
+                pickitem.value = picknum;
+                picknumtext.innerHTML = '&nbsp;<a href="javascript:updateNumber(\\''+name+'\\',\\''+index+'\\',\\'link\\',\\''+textprompt+'\\');">'+picknum+'</a>';
+            } else {
+                if (caller == 'check') {
+                    pickitem.checked=false;
+                    pickitem.value='nochoice';
+                }
+                return;
+            }
+        }
+    } else {
+        pickitem.value = '';
+        picknumtext.innerHTML = '';
+    }
 }
 
+// ]]>
+</script>
+SCRIPT
+
+}
 
 sub textarea_sizes {
     my ($data)=@_;
@@ -828,7 +883,7 @@ 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
@@ -840,8 +895,8 @@ sub editfield {
 	$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 {
@@ -931,7 +986,7 @@ sub hidden_arg {
 }
 
 sub checked_arg {
-    my ($description,$name,$list,$token) = @_;
+    my ($description,$name,$list,$token,$onclick,$useid) = @_;
     my $result;
     my $optionlist="";
     my $allselected=$token->[2]{$name};
@@ -940,13 +995,13 @@ 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.='<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 ) {
@@ -954,7 +1009,10 @@ sub checked_arg {
 		last;
 	    }
 	}
-	$result.=&element_change_detection().' />'.$text.'</label></span>'."\n";
+        if ($useid) {
+            $result .= ' id="'.&html_element_name($name).'" ';
+        }
+	$result.=&element_change_detection().$onclick.' />'.$text.'</label></span>'."\n";
     }
     return $result;
 }
@@ -970,7 +1028,7 @@ sub text_arg {
 	$result .= 'class="' . $class . '" ';
     }
     $result .=	&element_change_detection().'/>';
-    return '<span class="LC_nobreak">'.$result.'</span>';
+    return ' <span class="LC_edit_opt">'.$result.'</span>';
 }
 
 sub select_arg {
@@ -996,7 +1054,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>';
@@ -1047,16 +1105,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