[LON-CAPA-cvs] cvs: loncom /interface lonbulletin.pm lonfeedback.pm
wenzelju
wenzelju@source.lon-capa.org
Tue, 08 Dec 2009 13:33:12 -0000
This is a MIME encoded message
--wenzelju1260279192
Content-Type: text/plain
wenzelju Tue Dec 8 13:33:12 2009 EDT
Modified files:
/loncom/interface lonfeedback.pm lonbulletin.pm
Log:
Changes for XHTML 1.0 transitional conformity.
--wenzelju1260279192
Content-Type: text/plain
Content-Disposition: attachment; filename="wenzelju-20091208133312.txt"
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.281 loncom/interface/lonfeedback.pm:1.282
--- loncom/interface/lonfeedback.pm:1.281 Mon Dec 7 15:46:16 2009
+++ loncom/interface/lonfeedback.pm Tue Dec 8 13:33:12 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.281 2009/12/07 15:46:16 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.282 2009/12/08 13:33:12 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -356,10 +356,10 @@
$togglink = 'toggoff';
}
- $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
+ $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink;
if ($newpostsflag) {
- $chglink .= '&previous='.$prevread;
+ $chglink .= '&previous='.$prevread;
}
$chglink.=&group_args($group);
@@ -416,13 +416,13 @@
}
} else {
my $colspan=$maxdepth+1;
- $discussion.= qq|
-<script>
+#JW
+ $discussion.= &Apache::lonhtmlcommon::scripttag(qq|
function verifydelete (caller,symb,idx,newflag,previous,groupparm) {
var symbparm = symb+':::'+idx
var prevparm = ""
if (newflag == 1) {
- prevparm = "&previous="+previous
+ prevparm = "&previous="+previous
}
if (caller == 'studentdelete') {
if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
@@ -436,8 +436,7 @@
}
}
}
-</script>
- |;
+ |);
$discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
"\n".'<table class="LC_discussion">';
$discussion .= &action_links_bar($colspan,$ressymb,$visible,
@@ -450,7 +449,7 @@
$discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
'<a href="/adm/feedback?allposts=1&symb='.$escsymb;
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
$discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
@@ -646,7 +645,7 @@
$discussion.='<td align="right">'.
'<input type="hidden" name="discsymb" value="'.$ressymb.'" />'."\n".
'<input type="button" name="readoptions" value="'.$storebutton.'"'.
- ' onClick="this.form.submit();" />'."\n".
+ ' onclick="this.form.submit();" />'."\n".
'</td>';
}
$discussion .= (<<END);
@@ -784,26 +783,26 @@
if ($visible>2) {
$discussion .= '<a href="/adm/feedback?cmd=threadedon&symb='.$escsymb;
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
$discussion .='">'.&mt('Threaded View').'</a> '.
'<a href="/adm/feedback?cmd=threadedoff&symb='.$escsymb;
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
$discussion .='">'.&mt('Chronological View').'</a>
<a href="/adm/feedback?cmd=sortfilter&symb='.$escsymb;
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
$discussion .='">'.&mt('Sorting/Filtering options').'</a>'.(' ' x2);
}
$discussion .='<a href="/adm/feedback?export='.$escsymb;
if ($newpostsflag) {
- $discussion .= '&previous='.$prevread;
+ $discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
$discussion .= '">'.&mt('Export').'?</a> </td>';
@@ -848,7 +847,7 @@
<br /><a name="newpost"></a>
<font size="1">$lt{'note'}</font><br />
<b>$lt{'title'}:</b> <input type="text" name="subject" value="$subject" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14" wrap="hard">$comment</textarea>
+<textarea name="comment" cols="80" rows="14" >$comment</textarea>
ENDDISCUSS
if ($env{'form.origpage'}) {
$postingform .= '<input type="hidden" name="origpage" value="'.
@@ -1057,7 +1056,7 @@
$sender.=' <a href="/adm/feedback?editdisc='.
$escsymb.':::'.$idx;
if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
+ $sender .= '&previous='.$prevread;
}
$sender .= &group_args($group);
$sender .= '" '.$target.'>'.&mt('Edit').'</a>';
@@ -1075,7 +1074,7 @@
$sender.=' <a href="/adm/feedback?unhide='.
$escsymb.':::'.$idx;
if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
+ $sender .= '&previous='.$prevread;
}
$sender .= '">'.&mt('Make Visible').'</a>';
}
@@ -1083,7 +1082,7 @@
$sender.=' <a href="/adm/feedback?hide='.
$escsymb.':::'.$idx;
if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
+ $sender .= '&previous='.$prevread;
}
$sender .= &group_args($group);
$sender .= '">'.&mt('Hide').'</a>';
@@ -1124,7 +1123,7 @@
$sender.=' <a href="/adm/feedback?replydisc='.
$escsymb.':::'.$idx;
if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
+ $sender .= '&previous='.$prevread;
}
$sender .= &group_args($group);
$sender .= '" '.$target.'>'.&mt('Reply').'</a>';
@@ -1135,7 +1134,7 @@
$sender.=' <a href="/adm/feedback?replydisc='.
$escsymb.':::'.$idx;
if ($$newpostsflag) {
- $sender .= '&previous='.$prevread;
+ $sender .= '&previous='.$prevread;
}
$sender .= '" '.$target.'>'.&mt('Reply').'</a>';
}
@@ -1245,12 +1244,12 @@
if ($prevread > 0 && $prevread <= $posttime) {
$$newitem{$idx} = 1;
$$discussionitems[$idx] .= '
- <p><table border="0" width="100%">
+ <table border="0" width="100%">
<tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'</b></font></td>';
} else {
$$newitem{$idx} = 0;
$$discussionitems[$idx] .= '
- <p><table border="0" width="100%">
+ <table border="0" width="100%">
<tr><td align="left"> </td>';
}
$$discussionitems[$idx] .= '<td align="left"> '.
@@ -1262,7 +1261,7 @@
$ctlink.'</td>';
}
$$discussionitems[$idx].= '</tr></table><blockquote>'.
- $message.'</blockquote></p>';
+ $message.'</blockquote>';
if ($contrib{$idx.':history'}) {
my @postversions = ();
$$discussionitems[$idx] .= &mt('This post has been edited by the author.');
@@ -1708,7 +1707,7 @@
<p>
$lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
<p>
-<textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$comment
+<textarea name="comment" id="comment" cols="60" rows="10">$comment
</textarea></p>
<p>
END
@@ -1745,7 +1744,7 @@
$r->print(<<END);
<p>
<input type="hidden" name="sendit" value="1" />
-<input type="button" value="$send" onClick='gosubmit();' />
+<input type="button" value="$send" onclick='gosubmit();' />
</p>
</form>
END
@@ -1952,9 +1951,9 @@
$r->print(<<END);
<td>$lt{'disa'}</td>
<td>$lt{$discdisp}</td>
- <td><label><input type="checkbox" name="discdisp" onClick="discdispChk('0')" /> $lt{'chgt'} "$dispchangeA"</label>
+ <td><label><input type="checkbox" name="discdisp" onclick="discdispChk('0')" /> $lt{'chgt'} "$dispchangeA"</label>
<br />
- <label><input type="checkbox" name="discdisp" onClick="discdispChk('1')" /> $lt{'chgt'} "$dispchangeB"</label>
+ <label><input type="checkbox" name="discdisp" onclick="discdispChk('1')" /> $lt{'chgt'} "$dispchangeB"</label>
</td>
END
$r->print(&Apache::loncommon::end_data_table_row());
@@ -1969,7 +1968,7 @@
$r->print(<<END);
<td>$lt{'dotm'}</td>
<td>$lt{$disctogg}</td>
- <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
+ <td><label><input type="checkbox" name="disctogg" onclick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
END
my $save = &mt('Save');
$r->print(&Apache::loncommon::end_data_table_row());
@@ -1983,7 +1982,7 @@
<input type="hidden" name="$dispchgB" value="" />
<input type="hidden" name="$markchg" value="" />
<input type="hidden" name="$toggchg" value="" />
-<input type="button" name="sub" value="$save" onClick="javascript:setDisp()" />
+<input type="button" name="sub" value="$save" onclick="javascript:setDisp()" />
END
if (exists($env{'form.group'})) {
$r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
@@ -2201,7 +2200,7 @@
<br />
<input type="hidden" name="previous" value="$previous" />
<input type="hidden" name="applysort" value="$symb" />
-<input type="button" name="sub" value="$lt{'stor'}" onClick="verifyFilter()" />
+<input type="button" name="sub" value="$lt{'stor'}" onclick="verifyFilter()" />
END
if (exists($env{'form.group'})) {
$r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
@@ -2324,7 +2323,7 @@
<br />
<input type="hidden" name="sortposts" value="$sortposts" />
<input type="hidden" name="userpick" value="$symb" />
-<input type="button" name="store" value="Display posts" onClick="javascript:document.pickpostersform.submit()" />
+<input type="button" name="store" value="Display posts" onclick="javascript:document.pickpostersform.submit()" />
</form>
$end_page
END
@@ -2427,7 +2426,7 @@
if ($previous > 0) {
$qrystr = 'previous='.$previous;
if ($feedurl =~ /\?register=1/) {
- $feedurl .= '&'.$qrystr;
+ $feedurl .= '&'.$qrystr;
} else {
$feedurl .= '?'.$qrystr;
}
@@ -2436,18 +2435,18 @@
if (defined($sort)) {
my $sortqry = 'sortposts='.$sort;
if (($feedurl =~ /\?register=1/) || ($feedurl =~ /\?previous=/)) {
- $feedurl .= '&'.$sortqry;
+ $feedurl .= '&'.$sortqry;
} else {
$feedurl .= '?'.$sortqry;
}
$sorttag = '<input type="hidden" name="sortposts" value="'.$sort.'" />';
if (defined($numpicks)) {
my $userpickqry = 'totposters='.$numpicks;
- $feedurl .= '&'.$userpickqry;
+ $feedurl .= '&'.$userpickqry;
$userpicktag = '<input type="hidden" name="totposters" value="'.$numpicks.'" />';
} else {
if (ref($sectionpick) eq 'ARRAY') {
- $feedurl .= '§ionpick=';
+ $feedurl .= '&sectionpick=';
$sectag .= '<input type="hidden" name="sectionpick" value="';
foreach my $sec (@{$sectionpick}) {
$feedurl .= $sec.',';
@@ -2457,11 +2456,11 @@
$sectag =~ s/,$//;
$sectag .= '" />';
} else {
- $feedurl .= '§ionpick='.$sectionpick;
+ $feedurl .= '&sectionpick='.$sectionpick;
$sectag = '<input type="hidden" name="sectionpick" value="'.$sectionpick.'" />';
}
if (ref($grouppick) eq 'ARRAY') {
- $feedurl .= '&grouppick=';
+ $feedurl .= '&grouppick=';
$sectag .= '<input type="hidden" name="grouppick" value="';
foreach my $grp (@{$grouppick}) {
$feedurl .= $grp.',';
@@ -2471,11 +2470,11 @@
$grptag =~ s/,$//;
$grptag .= '" />';
} else {
- $feedurl .= '&grouppick='.$grouppick;
+ $feedurl .= '&grouppick='.$grouppick;
$grptag = '<input type="hidden" name="grouppick" value="'.$grouppick.'" />';
}
if (ref($rolefilter) eq 'ARRAY') {
- $feedurl .= '&rolefilter=';
+ $feedurl .= '&rolefilter=';
$roletag .= '<input type="hidden" name="rolefilter" value="';
foreach my $role (@{$rolefilter}) {
$feedurl .= $role.',';
@@ -2485,10 +2484,10 @@
$roletag =~ s/,$//;
$roletag .= '" />';
} else {
- $feedurl .= '&rolefilter='.$rolefilter;
+ $feedurl .= '&rolefilter='.$rolefilter;
$roletag = '<input type="hidden" name="rolefilter" value="'.$rolefilter.'" />';
}
- $feedurl .= '&statusfilter='.$statusfilter;
+ $feedurl .= '&statusfilter='.$statusfilter;
$statustag ='<input type="hidden" name="statusfilter" value="'.$statusfilter.'" />';
}
}
@@ -2994,7 +2993,7 @@
<input type="hidden" name="subject" />
<input type="hidden" name="comment" />
<input type="button" value="$pre"
-onClick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
+onclick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
</form>
ENDPREVIEW
}
@@ -3081,7 +3080,7 @@
</td></tr>
<tr>
<td>
- $lt{'adda'}</td><td><input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onClick="this.form.submit()" />
+ $lt{'adda'}</td><td><input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" />
</td>
</tr>
<tr>
@@ -3104,7 +3103,7 @@
$r->print('<input type="hidden" name="deloldattach" value="'.$item.'" />'."\n");
}
$r->print(<<END);
- <input type="button" name="rtntoedit" value="$lt{'stch'}" onClick="setAction()" />
+ <input type="button" name="rtntoedit" value="$lt{'stch'}" onclick="setAction()" />
</form>
$end_page
END
@@ -3151,7 +3150,7 @@
<br />
<form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
$lt{'clic'}: <input type="button" value="$att"
-onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.value);
+onclick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.value);
END
if (!$blockblog) {
$response .= 'setblogvalue();';
Index: loncom/interface/lonbulletin.pm
diff -u loncom/interface/lonbulletin.pm:1.54 loncom/interface/lonbulletin.pm:1.55
--- loncom/interface/lonbulletin.pm:1.54 Tue Dec 8 10:26:21 2009
+++ loncom/interface/lonbulletin.pm Tue Dec 8 13:33:12 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Bulletin Board Handler
#
-# $Id: lonbulletin.pm,v 1.54 2009/12/08 10:26:21 wenzelju Exp $
+# $Id: lonbulletin.pm,v 1.55 2009/12/08 13:33:12 wenzelju Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -253,7 +253,7 @@
}
#Image in Student view.
elsif($syllabus{'uploaded.photourl'} && $target ne 'tex'){
- $r->print('<img src="'.$syllabus{'uploaded.photourl'}.'"/>');
+ $r->print('<img src="'.$syllabus{'uploaded.photourl'}.'" alt="'.&mt('Image').'"/>');
}
foreach my $field (sort(keys(%syllabusfields))) {
if (($syllabus{$field}) || ($allowed)) {
--wenzelju1260279192--