Skip to content

Changed help text #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 24, 2013
Merged

Changed help text #10

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f855803
Backticks are picky about variables so they shouldn't be advertised t…
goehle Mar 11, 2013
3bf742c
Fixed poor formatting for essay_help
goehle Mar 11, 2013
9c5fdc0
Merge branch 'develop' of https://github.com/openwebwork/pg
goehle Mar 11, 2013
4116d16
Merge pull request #9 from openwebwork/release/2.6
mgage Mar 11, 2013
6f21a2b
Merge branch 'develop' of https://github.com/openwebwork/pg
goehle Mar 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions macros/PGessaymacros.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,20 @@ sub essay_cmp {

sub NAMED_ESSAY_BOX {
my($name,$row,$col) = @_;
$row = 10 unless defined($row);
$col = 80 unless defined($col);
$row = 8 unless defined($row);
$col = 75 unless defined($col);

my $height = .07*$row;
my $answer_value = '';
$answer_value = $inputs_ref->{$name} if defined( $inputs_ref->{$name} );
$name = RECORD_ANS_NAME($name, $answer_value);
$answer_value =~ tr/$@`//d; #`## make sure student answers can not be interpolated by e.g. EV3
$answer_value =~ tr/$@//d; #`## make sure student answers can not be interpolated by e.g. EV3

#### Answer Value needs to be sanitized, it could contain badness!
#### Answer Value needs to have special characters replaced by the html codes
$answer_value =~ s/\\/\&\#92;/g;
$answer_value =~ s/</\&lt;/g;
$answer_value =~ s/>/\&gt;/g;
$answer_value =~ s/`/&#96;/g;

# Get rid of tabs since they mess up the past answer db
$answer_value =~ s/\t/\&nbsp;\&nbsp;\&nbsp;\&nbsp;\&nbsp;/;
Expand All @@ -121,19 +122,38 @@ sub essay_cmp {
Latex2HTML => qq!\\begin{rawhtml}<TEXTAREA NAME="$name" id="$name" ROWS="$row" COLS="$col" >$answer_value</TEXTAREA>\\end{rawhtml}!,
HTML => qq!
<TEXTAREA NAME="$name" id="$name" ROWS="$row" COLS="$col"
WRAP="VIRTUAL">$answer_value</TEXTAREA>
WRAP="VIRTUAL" title="Enclose LaTeX expressions with &#92;( and &#92;).">$answer_value</TEXTAREA>
<INPUT TYPE=HIDDEN NAME="previous_$name" VALUE = "$answer_value">
!
);

$out;
}

sub essay_help {

my $out = MODES(
TeX => '',
Latex2HTML => '',
HTML => qq!
<P> This is an essay answer text box. You can type your answer in here and, after you hit submit,
it will be saved so that your instructor can grade it at a later date. If your instructor makes
any comments on your answer those comments will appear on this page after the question has been
graded. You can use LaTeX to make your math equations look pretty.
LaTeX expressions should be enclosed using the parenthesis notation and not dollar signs.
</P>
!
);

$out;
}


sub essay_box {
my $row = shift;
my $col =shift;
$row = 12 unless $row;
$col = 120 unless $col;
$row = 8 unless $row;
$col = 75 unless $col;
my $name = NEW_ANS_NAME();
NAMED_ESSAY_BOX($name ,$row,$col);

Expand Down