--- loncom/homework/bridgetask.pm	2006/03/28 18:27:03	1.120
+++ loncom/homework/bridgetask.pm	2006/03/28 20:45:58	1.123
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.120 2006/03/28 18:27:03 albertel Exp $
+# $Id: bridgetask.pm,v 1.123 2006/03/28 20:45:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,10 +176,10 @@ sub add_grading_button {
     if (scalar(keys(%sections)) < 3) {
 	$size=scalar(keys(%sections))+2;
     }
-    my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+    my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
     $sec_select .= "<option value='all' selected='selected'>all</option>\n";
     foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
-	$sec_select .= "<option name=\"$sec\">$sec</option>\n";
+	$sec_select .= "<option value=\"$sec\">$sec</option>\n";
     }
     $sec_select .= "<option value='none'>none</option></select>\n";
     
@@ -213,6 +213,7 @@ sub add_grading_button {
 						   'gradinguser',
 						   'gradingdomain');
 	$result.=&Apache::loncommon::studentbrowser_javascript();
+	$result.= '</p>';
   }
     return $result;
 }
@@ -428,7 +429,14 @@ sub start_Task {
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
 	&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
     
-    $body_tag_start = '<div class="LC_task">'."\n";
+    $body_tag_start .= '<div class="LC_task">'."\n";
+
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$head_tag_start.='<title>'.
+	    &Apache::structuretags::get_resource_name($parstack,$safeeval).
+	    '</title>';
+    }
+
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {
 	if ($Apache::lonhomework::modifygrades) {
 	    $body_tag_start.='<form name="gradesubmission" method="post" action="';
@@ -538,8 +546,7 @@ DONESCREEN
 		}
 	    }
 	} elsif ($target eq 'web') {
-	    my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
-	    $result.="$head_tag_start<title>$name</title></head>
+	    $result.="$head_tag_start</head>
               $body_tag_start \n".&style();
 	    
 	    $result.=&preserve_grade_info();
@@ -1701,6 +1708,10 @@ sub get_instance {
 
 {
     my $last_link;
+    sub link {
+	my ($instance,$id) = @_;
+	return 'LC_GRADING_criteria_'.$instance.'_'.$id;
+    }
     sub end_Dimension {
 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 	my $result=&Apache::lonxml::endredirection();
@@ -1795,7 +1806,7 @@ sub get_instance {
 	    @Apache::scripttag::parser_env = @_;
 	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $link='LC_GRADING_criteria_'.$instance.'_'.$id;
+		my $link=&link($instance,$id);
 		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
 		$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
 		    '<a name="'.$link.'" />'."\n".
@@ -1828,8 +1839,9 @@ sub get_instance {
 	    my $ungraded=0;
 	    my $review=0;
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
-		$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
+		my $link=&link($instance,$id);
+		my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};
+		$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
 		my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
 		if ($status eq 'pass') {
 		    if (!$mandatory) { $optional_passed++; }