openwebwork-cvs

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

Log Message:
-----------
Changed references to "feedback"  to "email instructor", "cancel email" and so 
forth for consistency.  This was in response to a suggestion by Bob Palais at 
University of Utah.

-- Mike

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator:
        Feedback.pm

Revision Data
-------------
Index: Feedback.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -Llib/WeBWorK/ContentGenerator/Feedback.pm -Llib/WeBWorK/ContentGenerator/Feedback.pm -u -r1.45 -r1.46
--- lib/WeBWorK/ContentGenerator/Feedback.pm
+++ lib/WeBWorK/ContentGenerator/Feedback.pm
@@ -198,7 +198,7 @@
 		);
 		my $chars = join("", keys %subject_map);
 		my $subject = $ce->{mail}{feedbackSubjectFormat}
-			|| "WeBWorK feedback from %c: %u set %s/prob %p"; # default if not entered
+			|| "WeBWorK question from %c: %u set %s/prob %p"; # default if not entered
 		$subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ""/eg;
 		
 		# get info about remote user (stolen from &WeBWorK::Authen::write_log_entry)
@@ -247,7 +247,7 @@
 		
 		# print message
 		print $MAIL
-			wrap("", "", "This feedback message was automatically generated by the WeBWorK",
+			wrap("", "", "This  message was automatically generated by the WeBWorK",
 				"system at $systemURL, in response to a request from $remote_host:$remote_port."
 			), "\n\n";
 		
@@ -317,17 +317,19 @@
 sub feedbackNotAllowed {
 	my ($self, $returnURL) = @_;
 	
-	print CGI::p("You are not allowed to send feedback.");
-	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel Feedback")) if $returnURL;
+	print CGI::p("You are not allowed to send e-mail.");
+	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel E-Mail")) if $returnURL;
 }
 
 sub noRecipientsAvailable {
 	my ($self, $returnURL) = @_;
 	
-	print CGI::p("No feedback recipients are listed for this course.");
-	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel Feedback")) if $returnURL;
+	print CGI::p("No e-mail recipients are listed for this course.");
+	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel E-Mail")) if $returnURL;
+}
+sub title {
+	return "E-mail Instructor";
 }
-
 sub feedbackForm {
 	my ($self, $user, $returnURL, $message) = @_;
 	my $r = $self->r;
@@ -350,12 +352,12 @@
 		included.");
 	print CGI::p(CGI::i($message)) if $message;
 	print CGI::p(
-		CGI::b("Feedback:"), CGI::br(),
+		CGI::b("E-mail:"), CGI::br(),
 		CGI::textarea("feedback", "", 20, 80),
 	);
-	print CGI::submit("sendFeedback", "Send Feedback");
+	print CGI::submit("sendFeedback", "Send E-mail");
 	print CGI::end_form();
-	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel Feedback")) if $returnURL;
+	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel E-mail")) if $returnURL;
 }
 
 sub getFeedbackRecipients {