--- loncom/homework/bridgetask.pm	2006/03/06 19:46:59	1.118
+++ loncom/homework/bridgetask.pm	2006/03/28 18:27:03	1.120
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.118 2006/03/06 19:46:59 albertel Exp $
+# $Id: bridgetask.pm,v 1.120 2006/03/28 18:27:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -371,12 +371,15 @@ sub submission_time_stamp {
     return $result;
 }
 
-sub webgrade_standard_info {
-    my ($version)=&get_version();
-    my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+sub file_list {
+    my ($files,$uname,$udom) = @_;
+    if (!defined($uname) || !defined($udom)) {
+	(undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+    }
     my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
-    my $file_list="<ul class=\"LC_GRADE_handininfo\">\n";
-    foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
+
+    my $file_list="<ul class=\"LC_GRADING_handininfo\">\n";
+    foreach my $partial_file (split(',',$files)) {
 	my $file=$file_url.$partial_file;
 	$file=~s|/+|/|g;
 	&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
@@ -385,13 +388,20 @@ sub webgrade_standard_info {
 	    '</a></nobr></li>'."\n";
     }
     $file_list.="</ul>\n";
+    return $file_list;
+}
+
+sub webgrade_standard_info {
+    my ($version)=&get_version();
+
+    my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
 
     my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
 				       'stop' => 'Quit Grading',
 				       );
 				       
     my $result=<<INFO;
-  <div class="LC_GRADE_maincontrols">
+  <div class="LC_GRADING_maincontrols">
     <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />
   </div>
@@ -621,7 +631,7 @@ DONESCREEN
 	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
 	}
 	if ($target eq 'webgrade') {
-	    $result.="\n".'<div id="LC_GRADE_criterialist">';
+	    $result.="\n".'<div id="LC_GRADING_criterialist">';
 	}
     } elsif ($target eq 'edit') {
 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
@@ -1785,26 +1795,26 @@ sub get_instance {
 	    @Apache::scripttag::parser_env = @_;
 	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $link='LC_GRADE_criteria_'.$instance.'_'.$id;
+		my $link='LC_GRADING_criteria_'.$instance.'_'.$id;
 		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
-		$result.='<div class="LC_GRADE_criteria" id="'.$link.'">'."\n".
+		$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
 		    '<a name="'.$link.'" />'."\n".
 		    '<a name="next_'.$last_link.'" />'."\n".
-		    '<div class="LC_GRADE_criteriatext">'."\n";
+		    '<div class="LC_GRADING_criteriatext">'."\n";
 		@Apache::scripttag::parser_env = @_;
 		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
 		$result.='</div>'."\n".
 		    #$dimension{$instance.'.criteria.'.$id}.
-		    '<div class="LC_GRADE_grade">'."\n".
-		    '<label class="LC_GRADE_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
-		    '<label class="LC_GRADE_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
-		    '<label class="LC_GRADE_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
-		    '<label class="LC_GRADE_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
+		    '<div class="LC_GRADING_grade">'."\n".
+		    '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
+		    '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
+		    '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
+		    '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
 		    '</div>'."\n".
-		    '<label class="LC_GRADE_comment">'.&mt('Additional Comment for Student')."\n".
-		    '<textarea class="LC_GRADE_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
+		    '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
+		    '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
 		    '</label>'."\n".
-		    '<ul class="LC_GRADE_navbuttons">'."\n".
+		    '<ul class="LC_GRADING_navbuttons">'."\n".
 		    '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
 		    '<li><a href="#next_'.$link.'">Next</a></li>'."\n".
 		    '</ul>'."\n".
@@ -1885,7 +1895,7 @@ sub grading_history {
 	}
     }
     if ($result) {
-	return '<ul class="LC_GRADE_pastgrading">'.$result.'</ul>';
+	return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
     }
     return '';
 }