[WWcvs] webwork2: CourseAdmin has minor changes in format for presenting the results of upgrading courses.

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
CourseAdmin has minor changes in format for presenting the results of upgrading courses.

Problem.pm   adds tool tips to the answer preview and to the correct answer preview using
Walter Zorn's tooltip package.

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator:
        CourseAdmin.pm
        Problem.pm

Revision Data
-------------
Index: Problem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v
retrieving revision 1.226
retrieving revision 1.227
diff -Llib/WeBWorK/ContentGenerator/Problem.pm -Llib/WeBWorK/ContentGenerator/Problem.pm -u -r1.226 -r1.227
--- lib/WeBWorK/ContentGenerator/Problem.pm
+++ lib/WeBWorK/ContentGenerator/Problem.pm
@@ -261,8 +261,14 @@
 		my $row;
 		#$row .= CGI::td($name);
 		$row .= $showAttemptAnswers ? CGI::td($self->nbsp($studentAnswer)) : "";
-		$row .= $showAttemptPreview ? CGI::td({title=>"$studentAnswer"}, $self->nbsp($preview))       : "";
-		$row .= $showCorrectAnswers ? CGI::td({title=> "$correctAnswerPreview"}, $self->nbsp($correctAnswer)) : "";
+		$row .= $showAttemptPreview ? CGI::td({onmouseover=>qq!Tip('$studentAnswer',SHADOW, true, 
+		                    DELAY, 1000, FADEIN, 300, FADEOUT, 300, STICKY, 1, OFFSETX, -20, CLOSEBTN, true, CLICKCLOSE, false, 
+		                    BGCOLOR, '#F4FF91', TITLE, 'Entered:',TITLEBGCOLOR, '#F4FF91', TITLEFONTCOLOR, '#000000')!},
+		                    $self->nbsp($preview))       : "";
+		$row .= $showCorrectAnswers ? CGI::td({onmouseover=> qq!Tip('$correctAnswer',SHADOW, true, 
+		                    DELAY, 1000, FADEIN, 300, FADEOUT, 300, STICKY, 1, OFFSETX, -20, CLOSEBTN, true, CLICKCLOSE, false, 
+		                    BGCOLOR, '#F4FF91', TITLE, 'Entered:',TITLEBGCOLOR, '#F4FF91', TITLEFONTCOLOR, '#000000')!},
+		                  $self->nbsp($correctAnswerPreview)) : "";
 		$row .= $showAttemptResults ? CGI::td($self->nbsp($resultString))  : "";
 		$row .= $showMessages       ? CGI::td({-class=>"Message"},$self->nbsp($answerMessage)) : "";
 		push @tableRows, $row;
@@ -321,7 +327,9 @@
 	# duplication that can be dealt with later by abstracting out tth/dvipng/etc.
 	
 	my $tex = $answerResult->{preview_latex_string};
-	
+	my $student_ans = $answerResult->{student_ans};
+	my $mouseover   = qq!Tip('$student_ans')!;
+
 	return "" unless defined $tex and $tex ne "";
 	
 	if ($displayMode eq "plainText") {
@@ -365,6 +373,7 @@
 		}
 		
 	} elsif ($displayMode eq "images") {
+	    $imgGen->{mouseover} = $answerResult->{student_ans};
 		$imgGen->add($tex);
 	} elsif ($displayMode eq "jsMath") {
 		$tex =~ s/</&lt;/g; $tex =~ s/>/&gt;/g;
@@ -388,6 +397,8 @@
 	
 	my $tex = $answerResult->{correct_value}->TeX;
 	
+	my $correct_ans = $answerResult->{correct_ans};
+	my $mouseover   = qq!Tip('$correct_ans')!;
 	return "" unless defined $tex and $tex ne "";
 	
 	if ($displayMode eq "plainText") {
@@ -431,6 +442,7 @@
 		}
 		
 	} elsif ($displayMode eq "images") {
+	    $imgGen->{mouseover} = $mouseover;
 		$imgGen->add($tex);
 	} elsif ($displayMode eq "jsMath") {
 		$tex =~ s/</&lt;/g; $tex =~ s/>/&gt;/g;
@@ -1023,6 +1035,10 @@
 	}
 	
 	debug("end answer processing");
+	##### javaScripts #############
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print qq!<script type="text/javascript" src="$site_url/js/wz_tooltip.js"></script>!;
+	
 	
 	##### output #####
 	# custom message for editor
Index: CourseAdmin.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm,v
retrieving revision 1.90
retrieving revision 1.91
diff -Llib/WeBWorK/ContentGenerator/CourseAdmin.pm -Llib/WeBWorK/ContentGenerator/CourseAdmin.pm -u -r1.90 -r1.91
--- lib/WeBWorK/ContentGenerator/CourseAdmin.pm
+++ lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -2578,7 +2578,7 @@
 		foreach my $table_name (@tables_to_alter) {	#warn "do_upgrade_course: adding new fields to table $table_name in course $upgrade_courseID";
 			$update_error_msg{$upgrade_courseID} .= $CIchecker->updateTableFields($upgrade_courseID, $table_name);
 		}
-		print CGI::p({-style=>'color:green; font-weight:bold'}, $update_error_msg{$upgrade_courseID});
+		### $update_error_msg{$upgrade_courseID} is printed below
 		#############################################################################
 		# Add missing directories when it can be done safely
 		#############################################################################	#warn "do_upgrade_course: updating course directories for $upgrade_courseID";
@@ -2588,8 +2588,6 @@
 		#############################################################################
 		# Analyze database status and prepare status report
 		#############################################################################
-	 	print CGI::checkbox({name=>"upgrade_courseIDs", label=>'upgrade', selected=>1,value=>$upgrade_courseID}).
-		         "Report for course $upgrade_courseID:".CGI::br();
 	
 		($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
 		  
@@ -2628,7 +2626,9 @@
 		#############################################################################
 		# Print status
 		#############################################################################
-	
+		print " Report for course $upgrade_courseID:".CGI::br();
+		print CGI::p({-style=>'color:green; font-weight:bold'}, $update_error_msg{$upgrade_courseID});
+
 		print CGI::p($str);     # print message about tables
 		print CGI::p($dir_msg); # message about directories