From 37bc30853da34ccbcf84a87ba20ff64c4ea91c93 Mon Sep 17 00:00:00 2001 From: Geoff Goehle Date: Thu, 12 Dec 2013 11:56:17 -0500 Subject: [PATCH] Fixed a small bug having to do with conditional release Fixed a small bug having to do with formatting certain forms --- htdocs/themes/math4/math4.css | 1 + lib/WeBWorK/ContentGenerator/ProblemSets.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/themes/math4/math4.css b/htdocs/themes/math4/math4.css index a3b614e882..f582a6aeb6 100644 --- a/htdocs/themes/math4/math4.css +++ b/htdocs/themes/math4/math4.css @@ -350,6 +350,7 @@ table.FormLayout tr { vertical-align: top; } table.FormLayout th.LeftHeader { text-align: right; white-space: nowrap; } table.FormLayout tr.ButtonRow { text-align: left; } table.FormLayout tr.ButtonRowCenter { text-align: center; } +table.FormLayout td { padding-right:10px } div.RenderSolo { background-color: #E0E0E0; color: black; } div.AuthorComment { background-color: #00E0E0; color: black; } diff --git a/lib/WeBWorK/ContentGenerator/ProblemSets.pm b/lib/WeBWorK/ContentGenerator/ProblemSets.pm index a7ee7d106a..c3f3b7ac9e 100644 --- a/lib/WeBWorK/ContentGenerator/ProblemSets.pm +++ b/lib/WeBWorK/ContentGenerator/ProblemSets.pm @@ -488,9 +488,9 @@ sub setListRow { $interactive = $name unless $preOpenSets; } elsif (time < $set->open_date && @restricted) { my $restriction = ($set->restricted_status)*100; - $status = $r->maketext("will open on [_1] if you score at least [_2]% on set [_3]", $self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat}),sprintf("%.2",$restriction),@restricted) if scalar(@restricted) == 1; + $status = $r->maketext("will open on [_1] if you score at least [_2]% on set [_3]", $self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat}),sprintf("%.2f",$restriction),@restricted) if scalar(@restricted) == 1; if(@restricted > 1) { - $status = $r->maketext("will open on [_1] if you score at least [_2]% on sets", $self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat}),sprintf("%.2",$restriction)); + $status = $r->maketext("will open on [_1] if you score at least [_2]% on sets", $self->formatDateTime($set->open_date,undef,$ce->{studentDateDisplayFormat}),sprintf("%.2f",$restriction)); foreach(0..$#restricted) { $status .= " $restricted[$_], " if $_ != $#restricted; $status .= " and $restricted[$_]. " if $_ == $#restricted;