--- loncom/interface/lonfeedback.pm 2009/03/04 17:07:31 1.267
+++ loncom/interface/lonfeedback.pm 2009/05/11 16:51:27 1.273
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.267 2009/03/04 17:07:31 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.273 2009/05/11 16:51:27 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -110,7 +110,7 @@ sub list_discussion {
return $blocktext;
}
- my @bgcols = ("#cccccc","#eeeeee");
+ my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
my $discussiononly=0;
if ($mode eq 'board') { $discussiononly=1; }
unless ($env{'request.course.id'}) { return ''; }
@@ -434,7 +434,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
}
</script>
|;
- $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" ><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+ $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
+ "\n".'<table class="LC_discussion">';
$discussion .= &action_links_bar($colspan,$ressymb,$visible,
$newpostsflag,$group,
$prevread,$markondisp);
@@ -547,7 +548,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
}
$copyresult.=&replicate_attachments($imsitems{$alldiscussion{$post}}{'allattachments'},$tempexport);
} else {
- $discussion.='<td bgcolor="'.$bgcols[$newitem{$alldiscussion{$post}}].
+ $discussion.='<td class="'.$bgcols[$newitem{$alldiscussion{$post}}].
'" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$post}].
'</td></tr>';
}
@@ -557,8 +558,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
my $colspan=$maxdepth+1;
$discussion .= <<END;
<tr bgcolor="#FFFFFF">
- <td colspan="$colspan" valign="top">
- <table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">
+ <td colspan="$colspan" class="LC_disc_action_links_bar">
+ <table class="LC_disc_action_table">
<tr>
<td align="left">
<table border="0" cellpadding="0" cellspacing="4">
@@ -639,9 +640,9 @@ END
if ($dischash{$toggkey}) {
my $storebutton = &mt('Save read/unread changes');
$discussion.='<td align="right">'.
- '<input type="hidden" name="discsymb" value="'.$ressymb.'">'."\n".
+ '<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);
@@ -766,17 +767,17 @@ sub send_message_link {
' <a href="/adm/feedback?sendmessageonly=1&symb='.
&escape($ressymb).'"><img alt="" src="'.
&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
- '" border="0" />'.&mt('Send Message').'</a></span>';
+ '" border="0" />'.&mt('Send Feedback').'</a></span>';
return $output;
}
sub action_links_bar {
my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
- my $discussion = '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
- '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
+ my $discussion = '<tr><td class="LC_disc_action_links_bar" colspan="'.$colspan.'">'.
+ '<table width="100%" class="LC_disc_action_table"><tr>';
my $escsymb=&escape($ressymb);
if ($visible>2) {
- $discussion .= '<td align="left">'.
+ $discussion .= '<td class="LC_disc_action_left">'.
'<a href="/adm/feedback?cmd=threadedon&symb='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
@@ -789,16 +790,16 @@ sub action_links_bar {
}
$discussion .= &group_args($group);
$discussion .='">'.&mt('Chronological View').'</a>
- <a href= "/adm/feedback?cmd=sortfilter&symb='.$escsymb;
+ <a href="/adm/feedback?cmd=sortfilter&symb='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
$discussion .= &group_args($group);
$discussion .='">'.&mt('Sorting/Filtering options').'</a>'.(' ' x2);
} else {
- $discussion .= '<td align="left">';
+ $discussion .= '<td class="LC_disc_action_left>';
}
- $discussion .='<a href= "/adm/feedback?export='.$escsymb;
+ $discussion .='<a href="/adm/feedback?export='.$escsymb;
if ($newpostsflag) {
$discussion .= '&previous='.$prevread;
}
@@ -806,7 +807,7 @@ sub action_links_bar {
$discussion .= '">'.&mt('Export').'?</a> </td>';
if ($newpostsflag) {
if (!$markondisp) {
- $discussion .='<td align="right"><a href="/adm/preferences?action=changediscussions';
+ $discussion .='<td class="LC_disc_action_right"><a href="/adm/preferences?action=changediscussions';
$discussion .= &group_args($group);
$discussion .= '">'.
&mt('Preferences on what is marked as NEW').
@@ -1247,7 +1248,7 @@ sub build_posting_display {
<p><table border="0" width="100%">
<tr><td align="left"> </td>';
}
- $$discussionitems[$idx] .= '<td align ="left"> '.
+ $$discussionitems[$idx] .= '<td align="left"> '.
'<b>'.$subject.'</b> '.
$sender.'</b> '.$vgrlink.' ('.
&Apache::lonlocal::locallocaltime($posttime).')</td>';
@@ -1684,8 +1685,8 @@ END
END
} elsif ($env{'form.editdisc'}) {
$r->print(<<END);
-<input type="hidden" name="editdisc" value ="$env{'form.editdisc'}" />
-<input type="hidden" name="parentmsg" value ="$parentmsg" />
+<input type="hidden" name="editdisc" value="$env{'form.editdisc'}" />
+<input type="hidden" name="parentmsg" value="$parentmsg" />
END
}
$r->print(<<END);
@@ -1927,7 +1928,7 @@ END
&Apache::loncommon::end_page();
$r->print(<<END);
$start_page
-<form name="modifydisp" method="POST" action="/adm/feedback">
+<form name="modifydisp" method="post" action="/adm/feedback">
$lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li><li>$lt{'wipa'}</li></ol>
<br />
END
@@ -1970,9 +1971,9 @@ END
<br />
<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="previous" value="$previous" />
-<input type="hidden" name="$dispchgA" value=""/>
-<input type="hidden" name="$dispchgB" value=""/>
-<input type="hidden" name="$markchg" value=""/>
+<input type="hidden" name="$dispchgA" value="" />
+<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()" />
END
@@ -2115,7 +2116,7 @@ END
$r->print(<<END);
$start_page
-<form name="modifyshown" method="POST" action="/adm/feedback">
+<form name="modifyshown" method="post" action="/adm/feedback">
<b>$lt{'diso'}</b><br/> $lt{'prca'}
<br /><br />
<table border="0">
@@ -2477,7 +2478,8 @@ sub redirect_back {
}
my $grouptag;
if ($group ne '') {
- $grouptag = '<input type="hidden" name="group" value="'.$group.'" />'; my $refarg;
+ $grouptag = '<input type="hidden" name="group" value="'.$group.'" />';
+ my $refarg;
if (exists($env{'form.ref'})) {
$refarg = '&ref='.$env{'form.ref'};
$grouptag .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
@@ -2607,9 +2609,16 @@ sub screen_header {
}
}
}
- if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+ if ($msgoptions) {
+ $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'
+ .' '.&mt('Send Feedback').'</h2>'
+ .$msgoptions;
+ }
if ($discussoptions) {
- $discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+ $discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'
+ .' '.&mt('Discussion Contributions').'</h2>'
+ .$discussoptions;
+ }
return $msgoptions.$discussoptions;
}
@@ -2935,7 +2944,7 @@ sub generate_preview_button {
return(<<ENDPREVIEW);
<br />
<form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
-<input type="hidden" name="subject">
+<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();" />
@@ -3044,7 +3053,7 @@ END
$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
@@ -3106,8 +3115,8 @@ this.form.submit();" />
<input type="hidden" name="timestamp" value="$now" />
<input type="hidden" name="subject" />
<input type="hidden" name="comment" />
-<input type="hidden" name="blog" value = "0" />
-<input type="hidden" name="discuss" value = "0" />
+<input type="hidden" name="blog" value="0" />
+<input type="hidden" name="discuss" value="0" />
<input type="hidden" name="numoldver" value="$numoldver" />
ENDATTACH
if (defined($deloldattach)) {
@@ -3316,7 +3325,7 @@ sub handler {
['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
my $group = $env{'form.group'};
my %attachmax = (
- text => '(128 KB max size)',
+ text => &mt('(128 KB max size)'),
num => 131072,
);
if ($env{'form.editdisc'}) {