--- loncom/homework/structuretags.pm	2004/02/16 20:30:34	1.242
+++ loncom/homework/structuretags.pm	2004/03/09 20:37:58	1.245
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.242 2004/02/16 20:30:34 albertel Exp $
+# $Id: structuretags.pm,v 1.245 2004/03/09 20:37:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,6 +120,7 @@ sub page_start {
 		$body_tag_start.=$help;
 	    }
 	}
+	$body_tag_start.=&Apache::lonxml::message_location();
     }
     my $form_tag_start;
     if (!defined($found{'form'})) {
@@ -183,11 +184,11 @@ sub setup_rndseed {
 sub problem_edit_header {
     return '<input type="hidden" name="submitted" value="edit" />
        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
-       <input type="submit" name="problemmode" value="'.&mt('Discard Edits and View').'" />
-       <input type="submit" name="problemmode" value="'.&mt('EditXML').'" />
-       <input type="submit" name="Undo" value="'.&mt('undo').'" /> <hr />
-       <input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
-       <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
+       <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
+       <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+       <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
+       <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
+       <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
        &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index',
 					   'Problem Editing Help').'</td><td>'.
        &Apache::loncommon::help_open_faq(5).
@@ -213,10 +214,10 @@ sub option {
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
     my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />
-             <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
-             <input type="submit" name="problemmode" value="'.&mt('EditXML').'" />
-             <input type="submit" name="newrandomization" value="'.&mt('New Randomization').'" />
-             <input type="submit" name="resetdata" value="'.&mt('Reset Submissions').'" />
+             <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
+             <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+             <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
+             <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
              <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
               <input type="text" name="rndseed" width="10" value="'.
 	       $rndseed.'"
@@ -481,9 +482,9 @@ sub start_problem {
 		$result.= $head_tag_start.'</head>';
 		my $msg=$body_tag_start;
 		if ($status eq 'UNAVAILABLE') {
-		    $result.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
 		} else {
-		    $result.='<h1>'.&mt('Not open to be viewed').'</h1>';
+		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
 		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
 		    $msg.='The problem '.$accessmsg;
@@ -656,7 +657,10 @@ sub end_problem {
 sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
-    if ($$tagstack[0] eq 'library') { &init_problem_globals('library') };
+    if ($$tagstack[0] eq 'library') {
+	&init_problem_globals('library');
+	$Apache::lonhomework::type='problem';
+    }
     if ($target eq 'edit') {
 	($result,$head_tag_start,$body_tag_start,$form_tag_start)=
 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);