--- loncom/homework/lonhomework.pm	2005/12/15 23:20:55	1.227
+++ loncom/homework/lonhomework.pm	2005/12/21 17:53:25	1.230
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.227 2005/12/15 23:20:55 albertel Exp $
+# $Id: lonhomework.pm,v 1.230 2005/12/21 17:53:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,8 +171,8 @@ sub proctor_checked_in {
     
     my $key;
     if ($type eq 'Task') {
-	my $version=$Apache::lonhomework::history{'resource.version'};
-	$key ="resource.$version.checkedin";
+	my $version=$Apache::lonhomework::history{'resource.0.version'};
+	$key ="resource.$version.0.checkedin";
     } elsif ($type eq 'problem') {
 	$key ='resource.0.checkedin';
     }
@@ -260,8 +260,8 @@ sub check_slot_access {
     
     if ($type eq 'Task') {
 	my $version=$Apache::lonhomework::history{'resource.version'};
-	if ($Apache::lonhomework::history{"resource.$version.checkedin"} &&
-	    $Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
+	if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
+	    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
 	    return ('SHOW_ANSWER');
 	}
     }
@@ -297,11 +297,11 @@ sub check_slot_access {
 
     my ($pass_status,$checkedin);
     if ($type eq 'Task') {
-	my $version=$Apache::lonhomework::history{'resource.version'};
+	my $version=$Apache::lonhomework::history{'resource.0.version'};
 	$pass_status = 
-	    $Apache::lonhomework::history{"resource.$version.status"} eq 'fail';
+	    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail';
 	$checkedin =
-	    $Apache::lonhomework::history{"resource.$version.checkedin"};
+	    $Apache::lonhomework::history{"resource.$version.0.checkedin"};
     } elsif ($type eq 'problem') {
 	$pass_status = 1;
 	$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};
@@ -765,14 +765,16 @@ sub editxmlmode {
             <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
             <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
             <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
+            <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
             <hr />
             <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
             <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
-            <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
             <hr />
             ' . $xml_help . '
             <textarea '.&Apache::edit::element_change_detection().' style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	    &HTML::Entities::encode($problem,'<>&"').'</textarea>
+	    &HTML::Entities::encode($problem,'<>&"').'</textarea><br />
+            <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
+            <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
             </form></body></html>';
 	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);