--- loncom/homework/lonhomework.pm	2011/10/06 12:32:52	1.317.4.4
+++ loncom/homework/lonhomework.pm	2011/03/07 19:42:21	1.325
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.317.4.4 2011/10/06 12:32:52 raeburn Exp $
+# $Id: lonhomework.pm,v 1.325 2011/03/07 19:42:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,7 +112,7 @@ sub get_target {
 	} elsif ( $env{'form.grade_target'} eq 'webgrade'
 		  && ($Apache::lonhomework::queuegrade eq 'F' )) {
 	    return ($env{'form.grade_target'});
-        } elsif ($env{'form.grade_target'} eq 'answer') {
+	} elsif ($env{'form.grade_target'} eq 'answer') {
             if ($env{'form.answer_output_mode'} eq 'tex') {
                 return ($env{'form.grade_target'});
             }
@@ -146,10 +146,10 @@ sub get_target {
 	    }
 	} else {
 	    if ($env{'form.problemstate'} eq 'WEB_GRADE') {
-                return ('grade','webgrade','answer');
+		return ('grade','webgrade','answer');
             } elsif ($env{'form.problemmode'} eq 'view') {
                 return ('grade','web','answer');
-            } elsif ($env{'form.problemmode'} eq 'saveview') {
+	    } elsif ($env{'form.problemmode'} eq 'saveview') {
                 return ('modified','web','answer');
             } elsif ($env{'form.problemmode'} eq 'discard') {
                 return ('web','answer');
@@ -157,11 +157,11 @@ sub get_target {
                      ($env{'form.problemmode'} eq 'undo')) {
                 return ('modified','no_output_web','edit');
             } elsif ($env{'form.problemmode'} eq 'edit') {
-                return ('no_output_web','edit');
-            } else {
-                return ('web');
-            }
-	}
+		return ('no_output_web','edit');
+	    } else {
+		return ('web');
+	    }
+        }
 #
 # End of Construction Space
 #
@@ -178,16 +178,6 @@ sub setup_vars {
 #  return ';$external::target='.$target.';';
 }
 
-sub createmenu {
-    my ($which,$request)=@_;
-    if ($which eq 'grade') {
-	$request->print('<script type="text/javascript" language="JavaScript"> 
-          hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
-                 "height=350,width=150,menubar=no");
-          </script>');
-    }
-}
-
 sub proctor_checked_in {
     my ($slot_name,$slot,$type)=@_;
     my @possible_proctors=split(",",$slot->{'proctor'});
@@ -386,7 +376,7 @@ sub check_access {
 	    $date=&mt("can not be accessed from your location.");
 	    return($status,$date);
 	}
-
+	
 	foreach my $temp ("opendate","duedate","answerdate") {
 	    $lastdate = $date;
 	    if ($temp eq 'duedate') {
@@ -448,7 +438,9 @@ sub check_access {
 	# if (correct and show prob status) or excused then CANNOT_ANSWER
 	if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
 	    &&
-	    &show_problem_status())
+	    &show_problem_status()
+            &&
+            $Apache::lonhomework::history{"resource.$id.awarded"}==1)
 	   ||
 	   $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
 	    $status = 'CANNOT_ANSWER';
@@ -906,15 +898,16 @@ sub editxmlmode {
     my $problem=&Apache::lonnet::getfile($file);
     if ($problem eq -1) {
 	&Apache::lonxml::error(
-            '<p class="LC_error">'
+            '<b> '
            .&mt('Unable to find [_1]',
                 '<span class="LC_filename">'.$file.'</span>')
-           .'</p>');
+           .'</b>');
 
 	$problem='';
     }
+
     if (($env{'form.problemmode'} eq 'saveeditxml') ||
-        ($env{'form.problemmode'} eq 'saveviewxml') ||
+        ($env{'form.problemmode'} eq 'saveviewxml') || 
         ($env{'form.problemmode'} eq 'undoxml')) {
 	my $error=&handle_save_or_undo($request,\$problem,
 				       \$env{'form.editxmltext'});
@@ -935,7 +928,6 @@ sub editxmlmode {
 	    &Apache::loncommon::resize_textarea_js().
             &Apache::structuretags::setmode_javascript().
             &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
-	my $only_body =  ($env{'environment.remote'} eq 'off')? 0 : 1;
 
     # Breadcrumbs
     my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
@@ -946,13 +938,13 @@ sub editxmlmode {
 	my $start_page = 
 	    &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
 					   {'no_auto_mt_title' => 1,
-					    'only_body'        => $only_body,
+					    'only_body'        => 0,
 					    'add_entries'      => {
 						'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
 						'onload'   => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
-                                    },
+                                                                  },
                                                 'bread_crumbs' => $brcrum,
-                                           });
+                                             });
 
     $result=$start_page
            .&Apache::loncommon::head_subbox(
@@ -971,8 +963,8 @@ sub editxmlmode {
 
          $result.='<input type="hidden" name="problemmode" value="saveedit" />'.
                   &Apache::structuretags::problem_edit_buttons('editxml');
-
-         $result.='<hr style="clear:both;" />'.&Apache::lonxml::message_location().'</div>'.
+         
+         $result.='<hr style="clear:both;" />'.&Apache::lonxml::message_location().'</div>'.  
                   '<textarea '.&Apache::edit::element_change_detection().
 	              ' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '.
 		      ' name="editxmltext" id="LC_editxmltext">'.
@@ -1016,10 +1008,9 @@ sub renderpage {
 	    $problem='';
 	    my $filename=(split('/',$file))[-1];
 	    my $error =
-                '<p class="LC_error">'
-                .&mt('Unable to find [_1]',
+		"<b> ".&mt('Unable to find [_1]',
 			   '<span class="LC_filename">'.$filename.'</span>')
-		."</p>";
+		."</b>";
 	    $result.=
 		&Apache::loncommon::simple_error_page($request,'Not available',
 						      $error);
@@ -1251,11 +1242,11 @@ sub handler {
 		#first visit to problem in construction space
 		$env{'form.problemmode'}= 'view';
 		&renderpage($request,$file);
-            } elsif (($env{'form.problemmode'} eq 'editxml') ||
+	    } elsif (($env{'form.problemmode'} eq 'editxml') || 
                      ($env{'form.problemmode'} eq 'saveeditxml') ||
                      ($env{'form.problemmode'} eq 'saveviewxml') ||
                      ($env{'form.problemmode'} eq 'undoxml')) {
-                &editxmlmode($request,$file);
+		&editxmlmode($request,$file);
 	    } elsif ($env{'form.problemmode'} eq 'calcanswers') {
 		&analyze($request,$file);
 	    } else {