Log Message:
-----------
use new feedbackMacro(), put "edit this problem" inside the problem DIV.
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
Problem.pm
Revision Data
-------------
Index: Problem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v
retrieving revision 1.184
retrieving revision 1.185
diff -Llib/WeBWorK/ContentGenerator/Problem.pm -Llib/WeBWorK/ContentGenerator/Problem.pm -u -r1.184 -r1.185
--- lib/WeBWorK/ContentGenerator/Problem.pm
+++ lib/WeBWorK/ContentGenerator/Problem.pm
@@ -827,7 +827,7 @@
my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
courseID => $courseName, setID => $set->set_id, problemID => $problem->problem_id);
my $editorURL = $self->systemLink($editorPage, params=>$forced_field);
- $editorLink = CGI::a({href=>$editorURL}, "Edit this problem");
+ $editorLink = CGI::p(CGI::a({href=>$editorURL}, "Edit this problem"));
}
##### translation errors? #####
@@ -994,6 +994,7 @@
print CGI::start_div({class=>"problem"});
print CGI::p($pg->{body_text});
print CGI::p(CGI::b("Note: "), CGI::i($pg->{result}->{msg})) if $pg->{result}->{msg};
+ print $editorLink; # this is empty unless it is appropriate to have an editor link.
print CGI::end_div();
print CGI::start_p();
@@ -1151,30 +1152,38 @@
CGI::endform();
}
- # feedback form url
- my $feedbackPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Feedback",
- courseID => $courseName);
- my $feedbackURL = $self->systemLink($feedbackPage, authen => 0); # no authen info for form action
-
- #print feedback form
- print
- CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
- $self->hidden_authen_fields,"\n",
- CGI::hidden("module", __PACKAGE__),"\n",
- CGI::hidden("set", $set->set_id),"\n",
- CGI::hidden("problem", $problem->problem_id),"\n",
- CGI::hidden("displayMode", $self->{displayMode}),"\n",
- CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
- CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
- CGI::hidden("showHints", $will{showHints}),"\n",
- CGI::hidden("showSolutions", $will{showSolutions}),"\n",
- CGI::p({-align=>"left"},
- CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
- ),
- CGI::endform(),"\n";
-
- # FIXME print editor link
- print $editorLink; #empty unless it is appropriate to have an editor link.
+ ## feedback form url
+ #my $feedbackPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Feedback",
+ # courseID => $courseName);
+ #my $feedbackURL = $self->systemLink($feedbackPage, authen => 0); # no authen info for form action
+ #
+ ##print feedback form
+ #print
+ # CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
+ # $self->hidden_authen_fields,"\n",
+ # CGI::hidden("module", __PACKAGE__),"\n",
+ # CGI::hidden("set", $set->set_id),"\n",
+ # CGI::hidden("problem", $problem->problem_id),"\n",
+ # CGI::hidden("displayMode", $self->{displayMode}),"\n",
+ # CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
+ # CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
+ # CGI::hidden("showHints", $will{showHints}),"\n",
+ # CGI::hidden("showSolutions", $will{showSolutions}),"\n",
+ # CGI::p({-align=>"left"},
+ # CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
+ # ),
+ # CGI::endform(),"\n";
+
+ print $self->feedbackMacro(
+ module => __PACKAGE__,
+ set => $self->{set}->set_id,
+ problem => $problem->problem_id,
+ displayMode => $self->{displayMode},
+ showOldAnswers => $will{showOldAnswers},
+ showCorrectAnswers => $will{showCorrectAnswers},
+ showHints => $will{showHints},
+ showSolutions => $will{showSolutions},
+ );
print CGI::end_div();
|
