[LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 15 Oct 2003 20:13:31 -0000
This is a MIME encoded message
--albertel1066248811
Content-Type: text/plain
albertel Wed Oct 15 16:13:31 2003 EDT
Modified files:
/loncom/interface lonfeedback.pm
Log:
- xhtmlize
--albertel1066248811
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20031015161331.txt"
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.62 loncom/interface/lonfeedback.pm:1.63
--- loncom/interface/lonfeedback.pm:1.62 Wed Oct 15 16:01:48 2003
+++ loncom/interface/lonfeedback.pm Wed Oct 15 16:13:31 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.62 2003/10/15 20:01:48 www Exp $
+# $Id: lonfeedback.pm,v 1.63 2003/10/15 20:13:31 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -92,7 +92,7 @@
$message.='<p>'.&mt('Attachment').': <a href="'.
&Apache::lonnet::tokenwrapper(
$contrib{$idx.':attachmenturl'}).
- '"><tt>'.$fname.'.'.$ft.'</tt></a>';
+ '"><tt>'.$fname.'.'.$ft.'</tt></a></p>';
}
if ($message) {
if ($hidden) {
@@ -159,7 +159,7 @@
<br />
<font size="1">Note: in anonymous discussion, your name is visible only to
course faculty</font><br />
-<textarea name=comment cols=60 rows=10 wrap=hard></textarea>
+<textarea name="comment" cols="60" rows="10" wrap="hard"></textarea>
<p>
Attachment (128 KB max size): <input type="file" name="attachment" />
</p>
@@ -182,7 +182,8 @@
<head>
<title>The LearningOnline Network with CAPA</title>
<meta http-equiv="pragma" content="no-cache"></meta>
-<script>
+<script type="text/javascript">
+//<!--
function gosubmit() {
var rec=0;
if (typeof(document.mailform.elements.author)!="undefined") {
@@ -222,24 +223,27 @@
alert('Please check a feedback type.');
}
}
+//-->
</script>
</head>
$bodytag
<h2><tt>$title</tt></h2>
<form action="/adm/feedback" method="post" name="mailform"
enctype="multipart/form-data">
-<input type=hidden name=postdata value="$feedurl">
+<input type="hidden" name="postdata" value="$feedurl" />
Please check at least one of the following feedback types:
-$options<hr>
-My question/comment/feedback:<p>
+$options<hr />
+<p>My question/comment/feedback:</p>
+<p>
$latexHelp
-<textarea name=comment cols=60 rows=10 wrap=hard>
-</textarea><p>
+<textarea name="comment" cols="60" rows="10" wrap="hard">
+</textarea></p>
+<p>
Attachment (128 KB max size): <input type="file" name="attachment" />
</p>
<p>
<input type="hidden" name="sendit" value="1" />
-<input type=button value="Send Feedback" onClick='gosubmit();' />
+<input type="button" value="Send Feedback" onClick='gosubmit();' />
</p>
</form>
ENDDOCUMENT
@@ -250,12 +254,12 @@
my ($r,$feedurl) = @_;
$r->print (<<ENDFAILREDIR);
<head><title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
+<meta http-equiv="pragma" content="no-cache" />
+<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
</head>
<html>
<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
<b>Sorry, no recipients ...</b>
</body>
</html>
@@ -267,15 +271,15 @@
$r->print (<<ENDREDIR);
<head>
<title>Feedback sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
+<meta http-equiv="pragma" content="no-cache" />
<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
</head>
<html>
<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
$typestyle
<b>Sent $sendsomething message(s), and $sendposts post(s).</b>
-<font color=red>$status</font>
+<font color="red">$status</font>
<form name="reldt" action="$feedurl" target="loncapaclient">
</form>
</body>
@@ -287,7 +291,7 @@
my ($r,$feedurl) = @_;
$r->print (<<ENDNOREDIR);
<head><title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
+<meta http-equiv="pragma" content="no-cache" />
ENDNOREDIR
if ($feedurl!~/^\/adm\/feedback/) {
@@ -298,7 +302,7 @@
</head>
<html>
<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
<b>Sorry, no feedback possible on this resource ...</b>
</body>
</html>
@@ -311,22 +315,22 @@
my $discussoptions='';
if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
$msgoptions=
- '<p><input type=checkbox name=author> '.
- &mt('Feedback to resource author');
+ '<p><input type="checkbox" name="author" /> '.
+ &mt('Feedback to resource author').'</p>';
}
if (&feedback_available(1)) {
$msgoptions.=
- '<br><input type=checkbox name=question> '.
+ '<br /><input type="checkbox" name="question" /> '.
&mt('Question about resource content');
}
if (&feedback_available(0,1)) {
$msgoptions.=
- '<br><input type=checkbox name=course> '.
+ '<br /><input type="checkbox" name="course" /> '.
&mt('Question/Comment/Feedback about course content');
}
if (&feedback_available(0,0,1)) {
$msgoptions.=
- '<br><input type=checkbox name=policy> '.
+ '<br /><input type="checkbox" name="policy" /> '.
&mt('Question/Comment/Feedback about course policy');
}
@@ -334,9 +338,9 @@
if (&Apache::lonnet::allowed('pch',
$ENV{'request.course.id'}.
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
- $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;"> '.
+ $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" /> '.
&mt('Contribution to course discussion of resource');
- $discussoptions.='<br><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;"> '.
+ $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
&mt('Anonymous contribution to course discussion of resource').
' <i>('.&mt('name only visible to course faculty').')</i>';
}
@@ -392,7 +396,7 @@
my $citations=<<"ENDCITE";
<h2>Previous attempts of student (if applicable)</h2>
$prevattempts
-<p><hr>
+<br /><hr />
<h2>Original screen output (if applicable)</h2>
$usersaw
<h2>Correct Answer(s) (if applicable)</h2>
@@ -439,7 +443,7 @@
}
}
if ($ENV{'form.course'}||$course) {
- $typestyle.='Submitting as Comment<br>';
+ $typestyle.='Submitting as Comment<br />';
foreach (split(/\,/,
$ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'})
) {
@@ -448,7 +452,7 @@
}
}
if ($ENV{'form.policy'}||$policy) {
- $typestyle.='Submitting as Policy Feedback<br>';
+ $typestyle.='Submitting as Policy Feedback<br />';
foreach (split(/\,/,
$ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'})
) {
@@ -479,7 +483,7 @@
unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
'Feedback ['.$declutter.']',$email,$citations,$feedurl,
$attachmenturl)=~/ok/) {
- $status.='<br>'.&mt('Error sending message to').' '.$_.'<br>';
+ $status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
} else {
$sendsomething++;
}
@@ -493,7 +497,7 @@
$newrecord{'resource'}=$feedurl;
$newrecord{'subnumber'}=$record{'subnumber'}+1;
unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
- $status.='<br>'.&mt('Not registered').'<br>';
+ $status.='<br />'.&mt('Not registered').'<br />';
}
}
@@ -524,7 +528,7 @@
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
my %storenewentry=($symb => time);
- $status.='<br>'.&mt('Updating discussion time').': '.
+ $status.='<br />'.&mt('Updating discussion time').': '.
&Apache::lonnet::put('discussiontimes',\%storenewentry,
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
@@ -535,13 +539,13 @@
my %newrecord=();
$newrecord{'resource'}=$symb;
$newrecord{'subnumber'}=$record{'subnumber'}+1;
- $status.='<br>'.&mt('Registering').': '.
+ $status.='<br />'.&mt('Registering').': '.
&Apache::lonnet::cstore(\%newrecord,'_discussion');
}
} else {
$status.='Failed.';
}
- return $status.'<br>';
+ return $status.'<br />';
}
# ----------------------------------------------------------- Preview function
@@ -606,7 +610,7 @@
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
&redirect_back($r,&Apache::lonnet::clutter($url),
- &mt('Changed discussion status').'<p>','0','0');
+ &mt('Changed discussion status').'<br />','0','0');
} elsif ($ENV{'form.deldisc'}) {
# --------------------------------------------------------------- Hide for good
$r->content_type('text/html');
@@ -633,7 +637,7 @@
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
&redirect_back($r,&Apache::lonnet::clutter($url),
- &mt('Changed discussion status').'<p>','0','0');
+ &mt('Changed discussion status').'<br />','0','0');
} elsif ($ENV{'form.preview'}) {
# -------------------------------------------------------- User wants a preview
&show_preview($r);
--albertel1066248811--