--- loncom/interface/lonfeedback.pm 2004/08/17 14:27:19 1.116 +++ loncom/interface/lonfeedback.pm 2004/08/31 18:28:18 1.120 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.116 2004/08/17 14:27:19 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.120 2004/08/31 18:28:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -446,11 +446,11 @@ imscp_v1p1.xsd http://www.imsglobal.org/ $alldiscussion{$_} = $_; } unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) { - unless ($outputtarget eq 'tex' && $outputtarget eq 'export') { + if ($outputtarget ne 'tex' && $outputtarget ne 'export') { $discussion.="\n"; } my $thisdepth=$depth[$alldiscussion{$_}]; - unless ($outputtarget eq 'tex' || $outputtarget eq 'export') { + if ($outputtarget ne 'tex' && $outputtarget ne 'export') { for (1..$thisdepth) { $discussion.='   '; } @@ -1355,7 +1355,7 @@ $htmlheader } if (rec) { - if (typeof(document.mailform.onsubmit)!='undefined') { + if (typeof(document.mailform.onsubmit)=='function') { document.mailform.onsubmit(); } document.mailform.submit(); @@ -2028,6 +2028,7 @@ sub fail_redirect {; Sorry, no recipients ... +Continue ENDFAILREDIR @@ -2098,6 +2099,7 @@ $roletag $sectag $userpicktag +Continue ENDREDIR @@ -2106,6 +2108,7 @@ ENDREDIR sub no_redirect_back { my ($r,$feedurl) = @_; my $nofeed=&mt('Sorry, no feedback possible on this resource ...'); + my $continue=&mt('Continue'); $r->print (< Feedback not sent @@ -2121,6 +2124,7 @@ ENDNOREDIR $nofeed +$continue ENDNOREDIRTWO @@ -2453,7 +2457,7 @@ sub generate_preview_button { +onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" /> ENDPREVIEW } @@ -2938,6 +2942,7 @@ END $lt{'mnpa'} $numitems $lt{'robb'}
+Continue ENDREDIR