version 1.355, 2012/05/28 19:03:03
|
version 1.363, 2013/01/03 20:51:23
|
Line 1056 sub build_posting_display {
|
Line 1056 sub build_posting_display {
|
&filter_regexp($rolefilter,$sectionpick,$statusfilter); |
&filter_regexp($rolefilter,$sectionpick,$statusfilter); |
$rolematch = $roleregexp.':'.$secregexp.':'.$statusregexp; |
$rolematch = $roleregexp.':'.$secregexp.':'.$statusregexp; |
} |
} |
|
my %votestyle; |
if ($seeid || $canvote) { |
if ($seeid || $canvote) { |
# We need to go through this twice, first to get the likes/dislikes, then to actually build the display |
# We need to go through this twice, first to get the likes/dislikes, then to actually build the display |
for (my $id=1;$id<=$contrib{'version'};$id++) { |
for (my $id=1;$id<=$contrib{'version'};$id++) { |
Line 1063 sub build_posting_display {
|
Line 1064 sub build_posting_display {
|
next if ($contrib{$idx.':deleted'}); |
next if ($contrib{$idx.':deleted'}); |
next if ($contrib{$idx.':hidden'}); |
next if ($contrib{$idx.':hidden'}); |
unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx}) || (!$contrib{$idx.':message'})) { |
unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx}) || (!$contrib{$idx.':message'})) { |
|
push(@theselikes,$likes{$symb.':'.$idx.':likes'}); |
if ($likes{$symb.':'.$idx.':likes'} ne '') { |
if ($likes{$symb.':'.$idx.':likes'} ne '') { |
push(@theselikes,$likes{$symb.':'.$idx.':likes'}); |
|
if (ref($likes{$symb.':'.$idx.':likers'}) eq 'HASH') { |
if (ref($likes{$symb.':'.$idx.':likers'}) eq 'HASH') { |
if (exists($likes{$symb.':'.$idx.':likers'}{$thisuser})) { |
if (exists($likes{$symb.':'.$idx.':likers'}{$thisuser})) { |
$userlikes{$idx} = 1; |
$userlikes{$idx} = 1; |
Line 1101 sub build_posting_display {
|
Line 1102 sub build_posting_display {
|
$twoplus=$ave+2.*$stddev; |
$twoplus=$ave+2.*$stddev; |
$oneminus=$ave-$stddev; |
$oneminus=$ave-$stddev; |
$twominus=$ave-2.*$stddev; |
$twominus=$ave-2.*$stddev; |
|
if ($#theselikes>1) { |
|
foreach my $class ('twoplus','oneplus','zero','oneminus','twominus') { |
|
my $fontstyle = $env{'course.'.$env{'request.course.id'}.'.discussion_post_fonts_'.$class}; |
|
if ($fontstyle ne '') { |
|
my ($size,$weight,$style,$other) = split(/,/,$fontstyle); |
|
if ($size ne '') { |
|
$votestyle{$class} .= 'font-size: '.$size.';'; |
|
} |
|
if ($weight ne '') { |
|
$votestyle{$class} .= 'font-weight: '.$weight.';'; |
|
} |
|
if ($style ne '') { |
|
$votestyle{$class} .= 'font-style: '.$style.';'; |
|
} |
|
if ($other ne '') { |
|
$votestyle{$class} .= $other; |
|
} |
|
if ($votestyle{$class} ne '') { |
|
$votestyle{$class} = 'style="'.$votestyle{$class}.'"'; |
|
} |
|
} |
|
} |
|
} |
} |
} |
# |
# |
# This is now the real loop. Go through all entries, pick up what we need |
# This is now the real loop. Go through all entries, pick up what we need |
Line 1436 sub build_posting_display {
|
Line 1460 sub build_posting_display {
|
$$discussionitems[$idx].=' '.$ctlink; |
$$discussionitems[$idx].=' '.$ctlink; |
} |
} |
my $thislikes=$likes{$symb.':'.$idx.':likes'}; |
my $thislikes=$likes{$symb.':'.$idx.':likes'}; |
my $likesize="100"; |
my $likestyle; |
if ($seeid || $canvote) { |
if ($seeid || $canvote) { |
# Figure out size based on likes |
# Figure out size based on likes |
|
my $class = 'zero'; |
my $thislikes=$likes{$symb.':'.$idx.':likes'}; |
my $thislikes=$likes{$symb.':'.$idx.':likes'}; |
if ($thislikes>$twoplus) { |
if ($thislikes>$twoplus) { |
$likesize="200"; |
$class = 'twoplus'; |
} elsif ($thislikes>$oneplus) { |
} elsif ($thislikes>$oneplus) { |
$likesize="150"; |
$class = 'oneplus'; |
} |
} |
if ($thislikes<$twominus) { |
if ($thislikes<$twominus) { |
$likesize="50"; |
$class = 'twominus'; |
} elsif ($thislikes<$oneminus) { |
} elsif ($thislikes<$oneminus) { |
$likesize="75"; |
$class = 'oneminus'; |
} |
} |
|
$likestyle = $votestyle{$class}; |
} |
} |
# Actually glue in the message itself |
# Actually glue in the message itself |
$$discussionitems[$idx].= '<br /><blockquote>'. |
$$discussionitems[$idx].= '<br /><blockquote>'. |
"<div style='font-size:$likesize%'>". |
"<div $likestyle>". |
$message. |
$message. |
'</div></blockquote>'; |
'</div></blockquote>'; |
if ($canvote) { |
if ($canvote) { |
Line 1926 END
|
Line 1952 END
|
|
|
my %onload = ('onload' => 'window.focus();setposttype();'); |
my %onload = ('onload' => 'window.focus();setposttype();'); |
my %parms=('add_entries' => \%onload); |
my %parms=('add_entries' => \%onload); |
if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum } |
if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; } |
my $start_page= |
my $start_page= |
&Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms); |
&Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms); |
|
|
Line 1967 END
|
Line 1993 END
|
} |
} |
$r->print(<<END); |
$r->print(<<END); |
$options |
$options |
<br> |
<br /> |
END |
END |
$r->print(&Apache::lonhtmlcommon::start_pick_box()); |
$r->print(&Apache::lonhtmlcommon::start_pick_box()); |
$r->print(<<END); |
$r->print(<<END); |
Line 1987 END
|
Line 2013 END
|
$subject.'" /></p>'); |
$subject.'" /></p>'); |
$r->print(&Apache::lonhtmlcommon::row_closure()); |
$r->print(&Apache::lonhtmlcommon::row_closure()); |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))); |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))); |
$r->print('<textarea name="comment" id="comment" cols="60" rows="10" '. |
$r->print('<textarea name="comment" id="comment" cols="55" rows="10" '. |
$textareaclass.'>'.$comment. |
$textareaclass.'>'.$comment. |
'</textarea>'); |
'</textarea>'); |
$r->print(&Apache::lonhtmlcommon::row_closure(1)); |
$r->print(&Apache::lonhtmlcommon::row_closure(1)); |
Line 2672 sub fail_redirect {
|
Line 2698 sub fail_redirect {
|
'only_body' => 1,})); |
'only_body' => 1,})); |
$r->print(<<ENDFAILREDIR); |
$r->print(<<ENDFAILREDIR); |
<img align="right" src="$logo" /> |
<img align="right" src="$logo" /> |
<b>$lt{'sorr'}</b> |
<p class="LC_warning">$lt{'sorr'}</p> |
ENDFAILREDIR |
ENDFAILREDIR |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
} |
} |
Line 3464 END
|
Line 3490 END
|
my $brcrum = [{'href' => '', |
my $brcrum = [{'href' => '', |
'text' => 'Discussion Post Attachments'}]; |
'text' => 'Discussion Post Attachments'}]; |
my %parms=('only_body' => 1); |
my %parms=('only_body' => 1); |
if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum } |
if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; } |
|
|
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms); |
&Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms); |
Line 3882 sub handler {
|
Line 3908 sub handler {
|
'text' => 'Discussion Post Versions'}]; |
'text' => 'Discussion Post Versions'}]; |
|
|
my %parms=(); |
my %parms=(); |
if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum } |
if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; } |
|
|
$r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,\%parms)); |
$r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,\%parms)); |
|
|
Line 3955 sub handler {
|
Line 3981 sub handler {
|
my $feedurl = '/adm/navmaps'; |
my $feedurl = '/adm/navmaps'; |
if ($env{'form.navurl'}) { $feedurl .= '?'.$env{'form.navurl'}; } |
if ($env{'form.navurl'}) { $feedurl .= '?'.$env{'form.navurl'}; } |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'mnpa' => 'Marked "New" posts as read in a total of', |
|
'robb' => 'resources/bulletin boards.', |
|
'twnp' => 'There are currently no resources or discussion boards with unread discussion postings.' |
'twnp' => 'There are currently no resources or discussion boards with unread discussion postings.' |
); |
); |
foreach my $res (@resources) { |
foreach my $res (@resources) { |
Line 3965 sub handler {
|
Line 3989 sub handler {
|
my $lastkey = $ressymb.'_lastread'; |
my $lastkey = $ressymb.'_lastread'; |
$discinfo{$lastkey} = $env{'form.navtime'}; |
$discinfo{$lastkey} = $env{'form.navtime'}; |
} |
} |
my $textline = "<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>"; |
my $textline = '<b>'. |
|
&mt('Marked "New" posts as read in a total of [_1] resources/bulletin boards.', |
|
$numitems). |
|
'</b>'; |
if ($numitems > 0) { |
if ($numitems > 0) { |
&Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss', |
&Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss', |
\%discinfo,$env{'user.domain'},$env{'user.name'}); |
\%discinfo,$env{'user.domain'},$env{'user.name'}); |