From: rkingdon <rkingdon>
Date: Wed, 1 Oct 2003 16:50:42 +0000 (+0000)
Subject: Replace Literal string "Weight": fixes bug #799
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e7a4d829a8df4dbd15fcd571b121fd312e3a13c0;p=moodle.git

Replace Literal string "Weight": fixes bug #799
---

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 7f87835896..850a6cd6fc 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -2439,16 +2439,16 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 			$firstcomment = TRUE;
 			foreach ($comments as $comment) {
 				echo "<TR valign=top><TD BGCOLOR=\"$THEME->cellheading2\"><P><B>".get_string("commentby","workshop")." ";
-				if (isteacher($workshop->course, $comment->userid)) {
+				if (isteacher($workshop->course, $comment->userid)) {
 					echo $course->teacher;
 					}
-				elseif ($assessment->userid == $comment->userid) {
+				elseif ($assessment->userid == $comment->userid) {
 					print_string("assessor", "workshop");
 					}
 				else {
 					print_string("authorofsubmission", "workshop");
 					}
-				echo " ".get_string("on", "workshop", userdate($comment->timecreated))."</B></P></TD></TR><TR><TD>\n";
+				echo " ".get_string("on", "workshop", userdate($comment->timecreated))."</B></P></TD></TR><TR><TD>\n";
 				echo text_to_html($comment->comments)."&nbsp;\n";
 				// add the links if needed
 				if ($firstcomment and $showcommentlinks and !$assessment->timeagreed) {
@@ -2475,14 +2475,14 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 								get_string("agreetothisassessment", "workshop")."</A>\n";
 							}
 						}
-					}
+					}
 				echo "</TD></TR>\n";
 				}
 			echo "</TABLE>\n";
 			}
 			
 		// only show the grade if grading strategy > 0 and the grade is positive
-		if ($showgrades and $assessment->grade >= 0) { 
+		if ($showgrades and $assessment->grade >= 0) { 
 			echo "<CENTER><B>".get_string("thegradeis", "workshop").": ".number_format($assessment->grade, 2)."% (".
 				get_string("maximumgrade")." ".number_format($workshop->grade, 0)."%)</B></CENTER><BR CLEAR=ALL>\n";
 			}
@@ -2499,9 +2499,9 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 	<CENTER>
 	<TABLE CELLPADDING=2 BORDER=1>
 	<?PHP
-	echo "<TR valign=top>\n";
+	echo "<TR valign=top>\n";
 	echo "	<TD colspan=2 BGCOLOR=\"$THEME->cellheading2\"><CENTER><B>".get_string("assessment", "workshop").
-		"</B></CENTER></TD>\n";
+		"</B></CENTER></TD>\n";
 	echo "</TR>\n";
 
 	// get the assignment elements...
@@ -2536,14 +2536,14 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 			// now print the form
 			for ($i=0; $i < count($elements); $i++) {
 				$iplus1 = $i+1;
-				echo "<TR valign=top>\n";
-				echo "	<TD align=right><P><B>". get_string("element","workshop")." $iplus1:</B></P></TD>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD align=right><P><B>". get_string("element","workshop")." $iplus1:</B></P></TD>\n";
 				echo "	<TD>".text_to_html($elements[$i]->description);
 				echo "</TD></TR>\n";
-				echo "<TR valign=top>\n";
-				echo "	<TD align=right><P><B>". get_string("feedback").":</B></P></TD>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD align=right><P><B>". get_string("feedback").":</B></P></TD>\n";
 				echo "	<TD>\n";
-				if ($allowchanges) {
+				if ($allowchanges) {
 					echo "		<textarea name=\"feedback[]\" rows=3 cols=75 wrap=\"virtual\">\n";
 					if (isset($grades[$i]->feedback)) {
 						echo $grades[$i]->feedback;
@@ -2552,11 +2552,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 					}
 				else {
 					echo text_to_html($grades[$i]->feedback);
-					}
-				echo "	</TD>\n";
-				echo "</TR>\n";
-				echo "<TR valign=top>\n";
-				echo "	<TD COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
+					}
+				echo "	</TD>\n";
+				echo "</TR>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
 				echo "</TR>\n";
 				}
 			break;
@@ -2565,11 +2565,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 			// now print the form
 			for ($i=0; $i < count($elements); $i++) {
 				$iplus1 = $i+1;
-				echo "<TR valign=top>\n";
-				echo "	<TD align=right><P><B>". get_string("element","workshop")." $iplus1:</B></P></TD>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD align=right><P><B>". get_string("element","workshop")." $iplus1:</B></P></TD>\n";
 				echo "	<TD>".text_to_html($elements[$i]->description);
-				echo "<P align=right><FONT size=1>Weight: "
-					.number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</FONT>\n";
+				echo "<P align=right><FONT size=1>".get_string("weight", "workshop").": ".
+					number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</FONT>\n";
 				echo "</TD></TR>\n";
 				if ($showgrades) {
 					echo "<TR valign=top>\n";
@@ -2621,10 +2621,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 					echo "	</TD>\n";
 					echo "</TR>\n";
 					}
-				echo "<TR valign=top>\n";
-				echo "	<TD align=right><P><B>". get_string("feedback").":</B></P></TD>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD align=right><P><B>". get_string("feedback").":</B></P></TD>\n";
 				echo "	<TD>\n";
-				if ($allowchanges) {
+				if ($allowchanges) {
 					echo "		<textarea name=\"feedback[]\" rows=3 cols=75 wrap=\"virtual\">\n";
 					if (isset($grades[$i]->feedback)) {
 						echo $grades[$i]->feedback;
@@ -2633,11 +2633,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 					}
 				else {
 					echo text_to_html($grades[$i]->feedback);
-					}
-				echo "	</TD>\n";
-				echo "</TR>\n";
-				echo "<TR valign=top>\n";
-				echo "	<TD COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
+					}
+				echo "	</TD>\n";
+				echo "</TR>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
 				echo "</TR>\n";
 				}
 			break;
@@ -2647,11 +2647,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 			$negativecount = 0;
 			for ($i=0; $i < count($elements) - 1; $i++) {
 				$iplus1 = $i+1;
-				echo "<TR valign=top>\n";
-				echo "	<TD align=right><P><B>". get_string("element","workshop")." $iplus1:</B></P></TD>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD align=right><P><B>". get_string("element","workshop")." $iplus1:</B></P></TD>\n";
 				echo "	<TD>".text_to_html($elements[$i]->description);
-				echo "<P align=right><FONT size=1>Weight: "
-					.number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</FONT>\n";
+				echo "<P align=right><FONT size=1>".get_string("weight", "workshop").": ".
+					number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</FONT>\n";
 				echo "</TD></TR>\n";
 				echo "<TR valign=top>\n";
 				echo "	<TD align=right><P><B>". get_string("grade"). ":</B></P></TD>\n";
@@ -2700,10 +2700,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 		
 				echo "	</TD>\n";
 				echo "</TR>\n";
-				echo "<TR valign=top>\n";
-				echo "	<TD align=right><P><B>". get_string("feedback").":</B></P></TD>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD align=right><P><B>". get_string("feedback").":</B></P></TD>\n";
 				echo "	<TD>\n";
-				if ($allowchanges) {
+				if ($allowchanges) {
 					echo "		<textarea name=\"feedback[$i]\" rows=3 cols=75 wrap=\"virtual\">\n";
 					if (isset($grades[$i]->feedback)) {
 						echo $grades[$i]->feedback;
@@ -2714,20 +2714,20 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 					if (isset($grades[$i]->feedback)) {
 						echo text_to_html($grades[$i]->feedback);
 						}
-					}
-				echo "&nbsp;</TD>\n";
-				echo "</TR>\n";
-				echo "<TR valign=top>\n";
-				echo "	<TD COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
+					}
+				echo "&nbsp;</TD>\n";
+				echo "</TR>\n";
+				echo "<TR valign=top>\n";
+				echo "	<TD COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
 				echo "</TR>\n";
 				if (empty($grades[$i]->grade)) {
 					$negativecount++;
 					}
 				}
 			// print the number of negative elements
-			// echo "<TR><TD>".get_string("numberofnegativeitems", "workshop")."</TD><TD>$negativecount</TD></TR>\n";
-			// echo "<TR valign=top>\n";
-			// echo "	<TD COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
+			// echo "<TR><TD>".get_string("numberofnegativeitems", "workshop")."</TD><TD>$negativecount</TD></TR>\n";
+			// echo "<TR valign=top>\n";
+			// echo "	<TD COLSPAN=2 BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
 			echo "</TABLE></CENTER>\n";
 			// now print the grade table
 			echo "<P><CENTER><B>".get_string("gradetable","workshop")."</B></CENTER>\n";
@@ -2761,9 +2761,9 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 			break;
 			
 		case 3: // criteria grading
-			echo "<TR valign=top>\n";
-			echo "	<TD BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
-			echo "	<TD BGCOLOR=\"$THEME->cellheading2\"><B>". get_string("criterion","workshop")."</B></TD>\n";
+			echo "<TR valign=top>\n";
+			echo "	<TD BGCOLOR=\"$THEME->cellheading2\">&nbsp;</TD>\n";
+			echo "	<TD BGCOLOR=\"$THEME->cellheading2\"><B>". get_string("criterion","workshop")."</B></TD>\n";
 			echo "	<TD BGCOLOR=\"$THEME->cellheading2\"><B>".get_string("select", "workshop")."</B></TD>\n";
 			echo "	<TD BGCOLOR=\"$THEME->cellheading2\"><B>".get_string("suggestedgrade", "workshop")."</B></TD>\n";
 			// find which criteria has been selected (saved in the zero element), if any
@@ -2776,7 +2776,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 			// now run through the elements
 			for ($i=0; $i < count($elements); $i++) {
 				$iplus1 = $i+1;
-				echo "<TR valign=top>\n";
+				echo "<TR valign=top>\n";
 				echo "	<TD>$iplus1</TD><TD>".text_to_html($elements[$i]->description)."</TD>\n";
 				if ($selection == $i) {
 					echo "	<TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[0]\" VALUE=\"$i\" CHECKED></TD>\n";
@@ -2805,14 +2805,14 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 			// now run through the elements...
 			for ($i=0; $i < count($elements); $i++) {
 				$iplus1 = $i+1;
-				echo "<TR valign=\"top\">\n";
+				echo "<TR valign=\"top\">\n";
 				echo "<TD align=\"right\"><b>".get_string("element", "workshop")." $iplus1:</b></TD>\n";
 				echo "<TD>".text_to_html($elements[$i]->description).
-					 "<P align=\"right\"><font size=\"1\">Weight: "
-					.number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</font></TD></tr>\n";
-				echo "<TR valign=\"top\">\n";
+					 "<P align=\"right\"><font size=\"1\">".get_string("weight", "workshop").": ".
+					number_format($WORKSHOP_EWEIGHTS[$elements[$i]->weight], 2)."</font></TD></tr>\n";
+				echo "<TR valign=\"top\">\n";
 				echo "	<TD BGCOLOR=\"$THEME->cellheading2\" align=\"center\"><B>".get_string("select", "workshop")."</B></TD>\n";
-				echo "	<TD BGCOLOR=\"$THEME->cellheading2\"><B>". get_string("criterion","workshop")."</B></TD></tr>\n";
+				echo "	<TD BGCOLOR=\"$THEME->cellheading2\"><B>". get_string("criterion","workshop")."</B></TD></tr>\n";
 				if (isset($grades[$i])) {
 					$selection = $grades[$i]->grade;
 					} else {
@@ -2829,7 +2829,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 						if (empty($rubrics[$j]->description)) {
 							break; // out of inner for loop
 							}
-						echo "<TR valign=top>\n";
+						echo "<TR valign=top>\n";
 						if ($selection == $j) {
 							echo "	<TD align=center><INPUT TYPE=\"RADIO\" NAME=\"grade[$i]\" VALUE=\"$j\" CHECKED></TD>\n";
 							}else {
@@ -2837,10 +2837,10 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 							}
 						echo "<TD>".text_to_html($rubrics[$j]->description)."</TD>\n";
 						}
-					echo "<TR valign=top>\n";
-					echo "	<TD align=right><P><B>". get_string("feedback").":</B></P></TD>\n";
+					echo "<TR valign=top>\n";
+					echo "	<TD align=right><P><B>". get_string("feedback").":</B></P></TD>\n";
 					echo "	<TD>\n";
-					if ($allowchanges) {
+					if ($allowchanges) {
 						echo "		<textarea name=\"feedback[]\" rows=3 cols=75 wrap=\"virtual\">\n";
 						if (isset($grades[$i]->feedback)) {
 							echo $grades[$i]->feedback;
@@ -2849,11 +2849,11 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 						}
 					else {
 						echo text_to_html($grades[$i]->feedback);
-						}
-					echo "	</td>\n";
-					echo "</tr>\n";
-					echo "<tr valign=\"top\">\n";
-					echo "	<td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</TD>\n";
+						}
+					echo "	</td>\n";
+					echo "</tr>\n";
+					echo "<tr valign=\"top\">\n";
+					echo "	<td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</TD>\n";
 					echo "</tr>\n";
 					}
 				}
@@ -2861,9 +2861,9 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 		} // end of outer switch
 	
 	// now get the general comment (present in all types)
-	echo "<tr valign=\"top\">\n";
-	echo "	<td align=\"right\"><P><B>". get_string("generalcomment", "workshop").":</B></P></TD>\n";
-	echo "	<td>\n";
+	echo "<tr valign=\"top\">\n";
+	echo "	<td align=\"right\"><P><B>". get_string("generalcomment", "workshop").":</B></P></TD>\n";
+	echo "	<td>\n";
 	if ($allowchanges) {
 		echo "		<textarea name=\"generalcomment\" rows=5 cols=75 wrap=\"virtual\">\n";
 		if (isset($assessment->generalcomment)) {
@@ -2880,33 +2880,33 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 		else {
 			print_string("yourfeedbackgoeshere", "workshop");
 			}
-		}
-	echo "&nbsp;</td>\n";
-	echo "</tr>\n";
-	echo "<tr valign=\"top\">\n";
-	echo "	<td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</TD>\n";
+		}
+	echo "&nbsp;</td>\n";
+	echo "</tr>\n";
+	echo "<tr valign=\"top\">\n";
+	echo "	<td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</TD>\n";
 	echo "</tr>\n";
 	
 	$timenow = time();
 	// now show the teacher's comment if available...
 	if ($assessment->timegraded and (($timenow - $assessment->timegraded) > $CFG->maxeditingtime)) {
-		echo "<tr valign=top>\n";
-		echo "	<td align=\"right\"><p><b>". get_string("teacherscomment", "workshop").":</b></p></td>\n";
-		echo "	<td>\n";
+		echo "<tr valign=top>\n";
+		echo "	<td align=\"right\"><p><b>". get_string("teacherscomment", "workshop").":</b></p></td>\n";
+		echo "	<td>\n";
 		echo text_to_html($assessment->teachercomment);
-		echo "&nbsp;</td>\n";
+		echo "&nbsp;</td>\n";
 		echo "</tr>\n";
 		// only show the grading grade if it's the teacher
 		if (isteacher($course->id)) {
-			echo "<tr valign=\"top\">\n";
-			echo "	<td align=\"right\"><p><b>". get_string("teachersgrade", "workshop").":</b></p></td>\n";
-			echo "	<td>\n";
+			echo "<tr valign=\"top\">\n";
+			echo "	<td align=\"right\"><p><b>". get_string("teachersgrade", "workshop").":</b></p></td>\n";
+			echo "	<td>\n";
 			echo number_format($assessment->gradinggrade * 100 / COMMENTSCALE, 0)."%";
-			echo "&nbsp;</td>\n";
+			echo "&nbsp;</td>\n";
 			echo "</tr>\n";
 			}
-		echo "<tr valign=\"top\">\n";
-		echo "<td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
+		echo "<tr valign=\"top\">\n";
+		echo "<td colspan=\"2\" bgcolor=\"$THEME->cellheading2\">&nbsp;</td>\n";
 		echo "</tr>\n";
 		}
 		
@@ -2928,7 +2928,7 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
 		}
 	echo "</center>";
 	echo "</form>\n";
-	}
+	}
 
 
 //////////////////////////////////////////////////////////////////////////////////////