--- loncom/homework/edit.pm	2005/04/07 06:56:21	1.92
+++ loncom/homework/edit.pm	2005/12/15 23:20:55	1.98
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.92 2005/04/07 06:56:21 albertel Exp $
+# $Id: edit.pm,v 1.98 2005/12/15 23:20:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,10 +92,12 @@ sub start_table {
     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");
     if (!defined($color)) {
 	$color = $Apache::edit::colorlist[$Apache::edit::colordepth];
     }
@@ -109,7 +111,7 @@ sub start_table {
 sub end_table {
     $Apache::edit::colordepth--;
     my $result='</table></div>';
-    $result.="<table><tr><td>";
+    $result.='<div align="left"><table><tr><td>';
 
     my ($tagname,$closingtag);
     if (defined($Apache::edit::inserttag[-2])) {
@@ -119,7 +121,7 @@ sub end_table {
 	$closingtag=$Apache::edit::inserttag[-1];
     }
     $result.=&innerinsertlist('edit',$tagname,$closingtag).
-	"</td></tr></table>";
+	"</td></tr></table></div>";
     pop(@Apache::edit::inserttag);
     return $result;
 }
@@ -161,7 +163,7 @@ sub handle_delete {
     }
     if (!$result) {
 	my $endtag='/'.$token->[1];
-	my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
+	my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser,$style);
 	$$parser['-1']->get_token();
 	&Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");
 	&Apache::lonxml::end_tag($tagstack,$parstack,$token);
@@ -309,6 +311,25 @@ sub insert_numericalresponse {
 </numericalresponse>';
 }
 
+sub insert_customresponse {
+    return '
+<customresponse>
+    <answer type="loncapa/perl">
+    </answer>
+    <textline />
+    <hintgroup>
+    <startouttext /><endouttext />
+    </hintgroup>
+</customresponse>';
+}
+
+sub insert_customresponse_answer {
+    return '
+    <answer type="loncapa/perl">
+    </answer>
+';
+}
+
 sub insert_stringresponse {
     return '
 <stringresponse answer="" type="">
@@ -477,6 +498,37 @@ sub insert_script {
     return "\n<script type=\"loncapa/perl\"></script>";
 }
 
+sub js_change_detection {
+    my $unsaved=&mt("There are unsaved changes");
+    return (<<SCRIPT);
+<script type="text/javascript">
+var clean = true;
+var is_submit = false;
+function compareForm(event_) {
+        if (!event_ && window.event) {
+          event_ = window.event;
+        }
+	if (!is_submit && !clean) {
+            event_.returnValue = "$unsaved";
+            return "$unsaved";
+        }
+}
+function unClean() {
+     clean=false;
+}
+window.onbeforeunload = compareForm;
+</script>
+SCRIPT
+}
+
+sub form_change_detection {
+    return ' onsubmit="is_submit=true;" ';
+}
+
+sub element_change_detection {
+    return ' onchange="unClean();" ';
+}
+
 sub textarea_sizes {
     my ($data)=@_;
     my $count=0;
@@ -495,10 +547,11 @@ sub editline {
     my ($tag,$data,$description,$size)=@_;
     $data=&HTML::Entities::encode($data,'<>&"');
     if ($description) { $description="<br />".$description."<br />"; }
+    my $change_code = &element_change_detection();
     my $result = <<"END";
 $description
 <input type="text" name="homework_edit_$Apache::lonxml::curdepth" 
-       value="$data" size="$size" />
+       value="$data" size="$size" $change_code />
 END
     return $result;
 }
@@ -523,7 +576,7 @@ sub editfield {
     return $description."\n".'&nbsp;&nbsp;&nbsp;<textarea style="width:100%" rows="'.$rows.
 	'" cols="'.$cols.'" name="homework_edit_'.
 	$Apache::lonxml::curdepth.'" id="homework_edit_'.
-	$Apache::lonxml::curdepth.'">'.
+	$Apache::lonxml::curdepth.'" '.&element_change_detection().'>'.
 	&HTML::Entities::encode($data,'<>&"').'</textarea>'.
 	($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
 			 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
@@ -631,7 +684,7 @@ sub checked_arg {
 		last;
 	    }
 	}
-	$result.=" />$text</nobr>\n";
+	$result.=&element_change_detection()." />$text</nobr>\n";
     }
     return $result;
 }
@@ -642,7 +695,8 @@ sub text_arg {
     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.'" />';
+	'" type="text" value="'.$arg.'" size="'.$size.'" '.
+	&element_change_detection().'/>';
     return '<nobr>'.$result.'</nobr>';
 }
 
@@ -654,12 +708,12 @@ sub select_arg {
     foreach my $option (@$list) {
 	my ($text,$value);
 	if ( ref($option) eq 'ARRAY') {
-	    $value='value="'.$$option[0].'"';
+	    $value='value="'.&HTML::Entities::encode($$option[0]).'"';
 	    $text=$$option[1];
 	    $option=$$option[0];
 	} else {
 	    $text=$option;
-	    $value='value="'.$option.'"';
+	    $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
 	}
 	if ( $selected eq $option ) {
 	    $optionlist.="<option $value selected=\"selected\">$text</option>\n";
@@ -668,7 +722,7 @@ sub select_arg {
 	}
     }
     $result.='<nobr>'.$description.'&nbsp;<select name="'.
-	&html_element_name($name).'">
+	&html_element_name($name).'" '.&element_change_detection().' >
        '.$optionlist.'
       </select></nobr>';
     return $result;
@@ -683,12 +737,12 @@ sub select_or_text_arg {
     foreach my $option (@$list) {
 	my ($text,$value);
 	if ( ref($option) eq 'ARRAY') {
-	    $value='value="'.$$option[0].'"';
+	    $value='value="'.&HTML::Entities::encode($$option[0]).'"';
 	    $text=$$option[1];
 	    $option=$$option[0];
 	} else {
 	    $text=$option;
-	    $value='value="'.$option.'"';
+	    $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
 	}
 	if ( $selected eq $option ) {
 	    $optionlist.="<option $value selected=\"selected\">$text</option>\n";
@@ -701,6 +755,7 @@ sub select_or_text_arg {
  	((!$found)?' selected="selected"':'').
  	">".&mt('Type-in value')."</option>\n";
 #
+    my $change_code=&element_change_detection();
     my $element=&html_element_name($name);
     my $selectelement='select_list_'.$element;
     my $typeinelement='type_in_'.$element;
@@ -725,7 +780,7 @@ $optionlist
        value="$typeinvalue" 
 onChange="$hiddenvalue=$typedinvalue;"
 onFocus="$selectedindex=$selecttypeinindex-1;" />
-<input type="hidden" name="$element" value="$selected" />
+<input type="hidden" name="$element" value="$selected" $change_code />
 </nobr>
 ENDSELECTORTYPE
 }