[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm

[albertel]

albertel		Tue Feb 14 14:51:31 2006 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm 
  Log:
  - bug #4663
     - missing a </head>
     - table was being started too early.
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.109 loncom/homework/bridgetask.pm:1.110
--- loncom/homework/bridgetask.pm:1.109	Tue Feb 14 14:41:06 2006
+++ loncom/homework/bridgetask.pm	Tue Feb 14 14:51:29 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.109 2006/02/14 19:41:06 albertel Exp $
+# $Id: bridgetask.pm,v 1.110 2006/02/14 19:51:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -528,7 +528,7 @@
 	      $target eq 'webgrade') {
 	my $webgrade='yes';
 	if ($target eq 'webgrade') {
-	    $result.=$head_tag_start.$body_tag_start;
+	    $result.=$head_tag_start.'</head>'.$body_tag_start;
 	    #$result.='<br />Review'.&show_queue('reviewqueue');
 	    #$result.='<br />Grade'.&show_queue('gradingqueue');
 	}
@@ -550,13 +550,9 @@
 	    $Apache::bridgetask::queue_key=$todo;
 	    &Apache::structuretags::initialize_storage();
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
-	    if ($target eq 'webgrade') {
-		#$result.='<br />After -'.&show_queue($env{'form.queue'});
-		$result.="\n".'<table width="100%" style="width:100%" border="1">';
-		if ($status_code eq 'selected') {
-		    $form_tag_start.=
-			'<input type="hidden" name="queuemode" value="selected" />';
-		}
+	    if ($target eq 'webgrade' && $status_code eq 'selected') {
+		$form_tag_start.=
+		    '<input type="hidden" name="queuemode" value="selected" />';
 	    }
 	} else {
 	    if ($target eq 'webgrade') {
@@ -610,6 +606,9 @@
 	    }
 	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
 	}
+	if ($target eq 'webgrade') {
+	    $result.="\n".'<table width="100%" style="width:100%" border="1">';
+	}
     } elsif ($target eq 'edit') {
 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
 	    &Apache::structuretags::problem_edit_header();