version 1.307, 2011/12/10 22:54:34
|
version 1.311, 2011/12/12 02:46:12
|
Line 777 sub discussion_link {
|
Line 777 sub discussion_link {
|
my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item; |
my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item; |
if ($flag) { $link .= '&previous='.$prev; } |
if ($flag) { $link .= '&previous='.$prev; } |
if ($adds) { $link .= $adds; } |
if ($adds) { $link .= $adds; } |
return &Apache::loncommon::modal_link($link,$linktext,600,400); |
return &Apache::loncommon::modal_link($link,$linktext,600,600); |
} |
} |
|
|
|
|
Line 1104 sub build_posting_display {
|
Line 1104 sub build_posting_display {
|
if ($outputtarget ne 'tex') { |
if ($outputtarget ne 'tex') { |
if (&editing_allowed($escsymb.':::'.$idx,$group)) { |
if (&editing_allowed($escsymb.':::'.$idx,$group)) { |
if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) { |
if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) { |
$sender.=' <a href="/adm/feedback?editdisc='. |
$sender.=' '. |
$escsymb.':::'.$idx; |
&discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group)); |
if ($$newpostsflag) { |
|
$sender .= '&previous='.$prevread; |
|
} |
|
$sender .= &group_args($group); |
|
$sender .= '">'.&mt('Edit').'</a>'; |
|
|
|
unless ($seeid) { |
unless ($seeid) { |
my $grpargs = &group_args($group); |
my $grpargs = &group_args($group); |
$sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')"; |
$sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')"; |
Line 1122 sub build_posting_display {
|
Line 1116 sub build_posting_display {
|
if ($seeid) { |
if ($seeid) { |
if ($hiddens{$idx}) { |
if ($hiddens{$idx}) { |
unless ($studenthidden) { |
unless ($studenthidden) { |
$sender.=' <a href="/adm/feedback?unhide='. |
$sender.=' '. |
$escsymb.':::'.$idx; |
&discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group)); |
if ($$newpostsflag) { |
|
$sender .= '&previous='.$prevread; |
|
} |
|
$sender .= '">'.&mt('Make Visible').'</a>'; |
|
} |
} |
} else { |
} else { |
$sender.=' <a href="/adm/feedback?hide='. |
$sender.=' '. |
$escsymb.':::'.$idx; |
&discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group)); |
if ($$newpostsflag) { |
|
$sender .= '&previous='.$prevread; |
|
} |
|
$sender .= &group_args($group); |
|
$sender .= '">'.&mt('Hide').'</a>'; |
|
} |
} |
my $grpargs = &group_args($group); |
my $grpargs = &group_args($group); |
$sender.= |
$sender.= |
Line 1312 sub build_posting_display {
|
Line 1297 sub build_posting_display {
|
my @postversions = (); |
my @postversions = (); |
$$discussionitems[$idx] .= &mt('This post has been edited by the author.'); |
$$discussionitems[$idx] .= &mt('This post has been edited by the author.'); |
if ($seeid) { |
if ($seeid) { |
$$discussionitems[$idx] .= ' <a href="/adm/feedback?allversions='.$escsymb.':::'.$idx; |
$$discussionitems[$idx] .= ' '. |
$$discussionitems[$idx] .= &group_args($group); |
&discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group)); |
$$discussionitems[$idx] .= '">'.&mt('Display all versions').'</a>'; |
|
} |
} |
$$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: '); |
$$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: '); |
if ($contrib{$idx.':history'} =~ m/:/) { |
if ($contrib{$idx.':history'} =~ m/:/) { |
Line 1670 END
|
Line 1654 END
|
$comment = &unescape($env{'form.comment'}); |
$comment = &unescape($env{'form.comment'}); |
&process_attachments(\@currnewattach,\@currdelold,\@keepold); |
&process_attachments(\@currnewattach,\@currdelold,\@keepold); |
} |
} |
my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1); |
my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1,'popup'); |
my $send=&mt('Send'); |
my $send=&mt('Send'); |
my $alert = &mt('Please select a feedback type.'); |
my $alert = &mt('Please select a feedback type.'); |
my $js= <<END; |
my $js= <<END; |
Line 1740 END
|
Line 1724 END
|
} |
} |
$quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>'; |
$quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>'; |
} |
} |
|
my $header=''; |
|
unless ($env{'form.modal'}) { |
|
$header="<h2><tt>$restitle</tt></h2>"; |
|
} |
$r->print(<<END); |
$r->print(<<END); |
$start_page |
$start_page |
<h2><tt>$restitle</tt></h2> |
$header |
<form action="/adm/feedback" method="post" name="mailform" |
<form action="/adm/feedback" method="post" name="mailform" |
enctype="multipart/form-data"> |
enctype="multipart/form-data"> |
$prevtag |
$prevtag |
Line 1761 END
|
Line 1748 END
|
END |
END |
} |
} |
$r->print(<<END); |
$r->print(<<END); |
$options<hr /> |
$options |
$quote |
$quote |
<p>$lt{'myqu'} |
<p>$lt{'myqu'} |
$textareaheader |
$textareaheader |
Line 2708 sub screen_header {
|
Line 2695 sub screen_header {
|
} |
} |
} |
} |
if ($msgoptions) { |
if ($msgoptions) { |
$msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />' |
$msgoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />' |
.' '.&mt('Send Feedback').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</p>' |
.'<br />'.&mt('Send Feedback').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</th>'. |
.$msgoptions; |
'<td>'.$msgoptions.'</td></tr>'; |
} |
} |
if ($discussoptions) { |
if ($discussoptions) { |
$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />' |
$discussoptions='<tr><th><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" alt="" />' |
.' '.&mt('Discussion Contributions').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</p>' |
.'<br />'.&mt('Discussion Contributions').'<br />'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</th>'. |
.$discussoptions; |
'<td>'.$discussoptions.'</td></tr>'; |
} |
} |
return $msgoptions.$discussoptions; |
return &Apache::loncommon::start_data_table().$msgoptions.$discussoptions.&Apache::loncommon::end_data_table(); |
} |
} |
|
|
sub resource_output { |
sub resource_output { |