--- loncom/interface/lonfeedback.pm 2003/10/21 00:22:23 1.64
+++ loncom/interface/lonfeedback.pm 2003/11/03 20:34:54 1.65
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.64 2003/10/21 00:22:23 www Exp $
+# $Id: lonfeedback.pm,v 1.65 2003/11/03 20:34:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -313,45 +313,46 @@ ENDNOREDIRTWO
}
sub screen_header {
- my ($feedurl) = @_;
- my $msgoptions='';
- my $discussoptions='';
- if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
- $msgoptions=
- '
'.
- &mt('Feedback to resource author').'
';
- }
- if (&feedback_available(1)) {
- $msgoptions.=
- '
'.
- &mt('Question about resource content');
- }
- if (&feedback_available(0,1)) {
- $msgoptions.=
- '
'.
- &mt('Question/Comment/Feedback about course content');
- }
- if (&feedback_available(0,0,1)) {
- $msgoptions.=
- '
'.
- &mt('Question/Comment/Feedback about course policy');
- }
-
- if ($ENV{'request.course.id'}) {
- if (&Apache::lonnet::allowed('pch',
- $ENV{'request.course.id'}.
- ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
- $discussoptions=' '.
- &mt('Contribution to course discussion of resource');
- $discussoptions.='
'.
- &mt('Anonymous contribution to course discussion of resource').
- ' ('.&mt('name only visible to course faculty').')';
+ my ($feedurl) = @_;
+ my $msgoptions='';
+ my $discussoptions='';
+ unless ($ENV{'form.replydisc'}) {
+ if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
+ $msgoptions=
+ ' '.
+ &mt('Feedback to resource author').'
';
+ }
+ if (&feedback_available(1)) {
+ $msgoptions.=
+ '
'.
+ &mt('Question about resource content');
+ }
+ if (&feedback_available(0,1)) {
+ $msgoptions.=
+ '
'.
+ &mt('Question/Comment/Feedback about course content');
+ }
+ if (&feedback_available(0,0,1)) {
+ $msgoptions.=
+ '
'.
+ &mt('Question/Comment/Feedback about course policy');
+ }
+ }
+ if ($ENV{'request.course.id'}) {
+ if (&Apache::lonnet::allowed('pch',
+ $ENV{'request.course.id'}.
+ ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+ $discussoptions=' '.
+ &mt('Contribution to course discussion of resource');
+ $discussoptions.='
'.
+ &mt('Anonymous contribution to course discussion of resource').
+ ' ('.&mt('name only visible to course faculty').')';
}
- }
- if ($msgoptions) { $msgoptions=''.&mt('Sending Messages').'
'.$msgoptions; }
- if ($discussoptions) {
- $discussoptions=''.&mt('Discussion Contributions').'
'.$discussoptions; }
- return $msgoptions.$discussoptions;
+ }
+ if ($msgoptions) { $msgoptions=''.&mt('Sending Messages').'
'.$msgoptions; }
+ if ($discussoptions) {
+ $discussoptions=''.&mt('Discussion Contributions').'
'.$discussoptions; }
+ return $msgoptions.$discussoptions;
}
sub resource_output {
@@ -522,6 +523,9 @@ sub adddiscuss {
$ENV{'environment.lastname'}.' '.
$ENV{'enrironment.generation'},
'attachmenturl'=> $attachmenturl);
+ if ($ENV{'form.replydisc'}) {
+ $contrib{'replyto'}=$ENV{'form.replydisc'};
+ }
if ($anon) {
$contrib{'anonymous'}='true';
}
@@ -563,10 +567,11 @@ sub show_preview {
}
sub generate_preview_button {
+ my $pre=&mt("Show Preview");
return(<
-
ENDPREVIEW
@@ -582,7 +587,7 @@ sub handler {
# --------------------------- Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['hide','unhide','deldisc','postdata','preview']);
+ ['hide','unhide','deldisc','postdata','preview','replydisc']);
if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
# ----------------------------------------------------------------- Hide/unhide