--- loncom/interface/lonwhatsnew.pm 2006/12/03 05:45:13 1.66 +++ loncom/interface/lonwhatsnew.pm 2007/03/02 20:58:32 1.69 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.66 2006/12/03 05:45:13 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.69 2007/03/02 20:58:32 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,7 +144,6 @@ sub display_main_box { my ($r,$command,$refpage,$checkallowed) = @_; my $domain=&Apache::loncommon::determinedomain(); my $function = &Apache::loncommon::get_users_function(); - my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); my $lctype = lc(&Apache::loncommon::course_type()); $r->print('
'); @@ -172,7 +171,7 @@ sub display_main_box { if (($command eq 'chgthreshold') && $checkallowed->{'abovethreshold'}) { - &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles, + &display_threshold_config($r,$refpage,\%threshold_titles, $cdom,$crs); } elsif (($command eq 'chginterval') && $checkallowed->{'versionchanges'}) { @@ -183,7 +182,7 @@ sub display_main_box { } elsif ($command eq 'courseinit') { &courseinit_config($r,$refpage,\%initpage); } else { - &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles, + &display_actions_box($r,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); } my $end_page = &Apache::loncommon::end_page(); @@ -241,11 +240,8 @@ END #------------------------------- sub display_actions_box { - my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles, - $initpage,$cdom,$crs,$checkallowed) = @_; - my $rowColor1 = "#ffffff"; - my $rowColor2 = "#eeeeee"; - + my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage, + $cdom,$crs,$checkallowed) = @_; my $udom = $env{'user.domain'}; my $uname = $env{'user.name'}; my $cid = $env{'request.course.id'}; @@ -396,7 +392,7 @@ sub display_actions_box { } if ($needitems) { - &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); + &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); } if ($show{'coursenormalmail'}) { $msgcount = &getnormalmail(\@newmsgs); @@ -432,7 +428,7 @@ sub display_actions_box { if ($displayed == $halfway) { $r->print(' '); } - &display_launcher($r,$actionitem,$refpage,$checkallowed,$tabbg,$rowColor1,$rowColor2,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); + &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,$interval,$countunread); $displayed ++; } } @@ -454,7 +450,7 @@ sub display_actions_box { #------------------------------- sub display_threshold_config { - my ($r,$refpage,$tabbg,$threshold_titles,$cdom,$crs) = @_; + my ($r,$refpage,$threshold_titles,$cdom,$crs) = @_; my $uname = $env{'user.name'}; my $udom = $env{'user.dom'}; my $cid = $env{'request.course.id'}; @@ -471,48 +467,31 @@ sub display_threshold_config { ); &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); - $r->print('
- - - '); + $r->print(''); my $rowNum = 0; foreach my $res (@{$tograde}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $rowNum ++; + my $css_class = $rowNum%2?' class="LC_odd_row"':''; my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); $linkurl .= '?symb='.&escape($res); @@ -1161,37 +1132,35 @@ sub display_handgrade { $linkurl = $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'}; } - $r->print(''); - $rowNum ++; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } } sub display_haserrors { - my ($r,$bombs,$rowColor1,$rowColor2,$bombed,$res_title) = @_; + my ($r,$bombs,$bombed,$res_title) = @_; my $bombnum = 0; - my $rowColor; my %lt = &Apache::lonlocal::texthash( reso => 'Resource', nmer => 'Number of errors', noer => 'No problems with errors', ); if (@{$bombs} > 0) { - $r->print(''); + $r->print(''); @{$bombs} = sort { &cmp_title($a,$b,$res_title) } @{$bombs}; foreach my $bomb (@{$bombs}) { - if ($bombnum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); $bombnum ++; + my $css_class = $bombnum%2?' class="LC_odd_row"':''; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } return; } @@ -1216,10 +1185,11 @@ sub display_abovethreshold { ' '. "\n"); $r->print(''. - ''. + ''. ''. ''. - ''); + ''); my $row; foreach my $res (@{$warnings}) { $row++; @@ -1234,8 +1204,8 @@ sub display_abovethreshold { $linkurl = $$triggered{$res}{'enclink'}.'?symb='.$$triggered{$res}{'encsymb'}; } - my $css_class = $row%2?'LC_odd_row':''; - $r->print(''. + my $css_class = $row%2?' class="LC_odd_row"':''; + $r->print(''. ''); if (ref($$triggered{$res}{text}) eq 'ARRAY') { @@ -1251,14 +1221,14 @@ sub display_abovethreshold { } } } - $r->print(''); + $r->print(''); } else { $r->print(''); } } sub display_versionchanges { - my ($r,$changed,$res_title,$rowColor1,$rowColor2,$interval) = @_; + my ($r,$changed,$res_title,$interval) = @_; my %lt = &Apache::lonlocal::texthash( 'reso' => 'Resource', 'revd' => 'Last revised', @@ -1266,35 +1236,35 @@ sub display_versionchanges { 'veru' => 'Version used', 'noup' => 'No updated versions', ); - my $rowColor; if (keys(%{$changed}) > 0) { - $r->print(''); - - + $r->print(''); my @changes = sort { &cmp_title($a,$b,$res_title) } keys(%{$changed}); my $changenum = 0; foreach my $item (@changes) { - if ($changenum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + $changenum ++; + my $css_class = $changenum%2?' class="LC_odd_row"':''; my ($map,$id,$url)=&Apache::lonnet::decode_symb($item); my $linkurl=&Apache::lonnet::clutter($url); $linkurl .= '?symb='.&escape($item); - $r->print(''); - $changenum ++; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } return; } sub display_coursediscussion { - my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1, - $rowColor2) = @_; + my ($r,$newdiscussions,$unread,$countunread,$res_title) = @_; my $lctype = lc(&Apache::loncommon::course_type()); my %lt = &Apache::lonlocal::texthash( 'loca' => 'Location', @@ -1303,24 +1273,22 @@ sub display_coursediscussion { 'noun' => 'No unread posts in '.$lctype.' discussions', 'tmlp' => 'Time of last post', ); - my $rowColor; if (@{$newdiscussions} > 0) { - $r->print(''); if ($countunread eq 'on') { - $r->print(''. - ''); + $r->print(''. + ''); } else { - $r->print(''); + $r->print(''); } $r->print("\n"); @{$newdiscussions} = sort { &cmp_title($a,$b,$res_title) } @{$newdiscussions}; my $rowNum = 0; foreach my $ressymb (@{$newdiscussions}) { + $rowNum ++; my $forum_title = $$unread{$ressymb}{'title'}; my $type = 'Resource'; my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb); @@ -1331,73 +1299,70 @@ sub display_coursediscussion { if ($$unread{$ressymb}{'enclink'}) { $disclink = $$unread{$ressymb}{'enclink'}.'?symb='.$$unread{$ressymb}{'encsymb'}; } - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } + my $css_class = $rowNum%2?' class="LC_odd_row"':''; my $lastpost = &Apache::lonnavmaps::timeToHumanString( $$unread{$ressymb}{'lastpost'}); - $r->print(''); + $r->print(''); if ($countunread eq 'on') { my $unreadnum = $$unread{$ressymb}{'unreadcount'}; - $r->print(''); + $r->print(''); } else { - $r->print(''); + $r->print(''); } $r->print("\n"); - $rowNum ++; } } else { - $r->print(''); + $r->print(''); } } sub display_coursenormalmail { - my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_; - my $rowColor; + my ($r,$msgcount,$newmsgs) = @_; my $lctype = lc(&Apache::loncommon::course_type()); if ($msgcount > 0) { - $r->print(''); - my $rowNum = 0; - my $mailcount = 1; + $r->print(''); + my $mailcount = 0; foreach my $msg (@{$newmsgs}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); - $rowNum ++; $mailcount ++; + my $css_class = $mailcount%2?' class="LC_odd_row"':''; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } } sub display_coursecritmail { - my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_; - my $rowColor; + my ($r,$critmsgcount,$critmsgs) = @_; my $lctype = lc(&Apache::loncommon::course_type()); if ($critmsgcount > 0) { - $r->print(''); - my $rowNum = 0; - my $mailcount = 1; + $r->print(''); + my $mailcount = 0; foreach my $msg (@{$critmsgs}) { - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(''); - $rowNum ++; $mailcount ++; + my $css_class = $mailcount%2?' class="LC_odd_row"':''; + $r->print(''); } } else { - $r->print(''); + $r->print(''); } } @@ -1540,13 +1505,13 @@ sub store_courseinit_setting { } sub start_box { - my ($r,$tabbg,$show,$heading,$caller,$refpage) = @_; + my ($r,$show,$heading,$caller,$refpage) = @_; my %lt = &Apache::lonlocal::texthash( chth => 'Change thresholds?', chin => 'Change interval?', chop => 'Change options?', ); - my ($showhide,$class); + my $showhide; if ($$show{$caller}) { $showhide = 'Hide'; @@ -1557,47 +1522,37 @@ sub start_box { } $r->print(' -
- - -
- - -
- - - - - - '); - my $rowNum =0; + $r->print('
'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''."\n". + ''."\n". + ''."\n". + &Apache::loncommon::end_data_table_header_row()); foreach my $type (@thresholditems) { my $parameter = $env{'request.course.id'}.':threshold_'.$type; # onchange is javascript to automatically check the 'Set' button. my $onchange = 'onFocus="javascript:window.document.forms'. "['thresholdform'].elements['".$parameter."_setparmval']". '.checked=true;"'; - if ($rowNum %2 == 1) { - $rowColor = $rowColor1; - } else { - $rowColor = $rowColor2; - } - $r->print(' - - - '."\n". + ' - - '); - $rowNum ++; + 10,$onchange).''."\n". + ''."\n". + &Apache::loncommon::end_data_table_row()); } - $r->print('
Threshold NameCurrent valueChange?
Threshold NameCurrent valueChange?
'.$threshold_titles{$type}.''.&Apache::lonhtmlcommon::textbox($parameter.'_value', + $r->print(&Apache::loncommon::start_data_table_row()."\n". + ''.$threshold_titles{$type}.''.&Apache::lonhtmlcommon::textbox($parameter.'_value', $threshold{$type}, - 10,$onchange).'' - .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). - '
'. + &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval'). + '
-
+ $r->print(&Apache::loncommon::end_data_table()."\n". + '
'); @@ -674,36 +653,30 @@ sub curr_courseinit { } sub display_launcher { - my ($r,$action,$refpage,$checkallowed,$tabbg,$rowColor1,$rowColor2,$show, - $headings,$res_title,$tograde,$ungraded,$bombs,$bombed,$changed, - $warnings,$triggered,$newdiscussions,$unread,$msgcount,$newmsgs, - $critmsgcount,$critmsgs,$interval,$countunread) = @_; + my ($r,$action,$refpage,$checkallowed,$show,$headings,$res_title, + $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered, + $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs, + $interval,$countunread) = @_; if ($$checkallowed{$action}) { - &start_box($r,$tabbg,$show,$headings,$action,$refpage,$action); + &start_box($r,$show,$headings,$action,$refpage,$action); if ($$show{$action}) { if ($action eq 'handgrading') { # UNGRADED ITEMS - &display_handgrade($r,$tograde,$rowColor1,$rowColor2, - $ungraded); + &display_handgrade($r,$tograde,$ungraded); } elsif ($action eq 'haserrors') { # BOMBS - &display_haserrors($r,$bombs,$rowColor1,$rowColor2,$bombed, - $res_title); + &display_haserrors($r,$bombs,$bombed,$res_title); } elsif ($action eq 'versionchanges') { # VERSION CHANGES - &display_versionchanges($r,$changed,$res_title,$rowColor1, - $rowColor2,$interval); - + &display_versionchanges($r,$changed,$res_title,$interval); } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS &display_abovethreshold($r,$refpage,$warnings,$triggered, $res_title); } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION &display_coursediscussion($r,$newdiscussions,$unread, - $countunread,$res_title,$rowColor1,$rowColor2); + $countunread,$res_title); } elsif ($action eq 'coursenormalmail') { # NORMAL MESSAGES - &display_coursenormalmail($r,$msgcount,$newmsgs,$rowColor1, - $rowColor2); + &display_coursenormalmail($r,$msgcount,$newmsgs); } elsif ($action eq 'coursecritmail') { # CRITICAL MESSAGES - &display_coursecritmail($r,$critmsgcount,$critmsgs,$rowColor1, - $rowColor2); + &display_coursecritmail($r,$critmsgcount,$critmsgs); } } &end_box($r); @@ -713,8 +686,8 @@ sub display_launcher { sub getitems { my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions, - $tograde,$bombs,$warnings,$rowColor1,$rowColor2,$threshold,$cdom,$crs, - $res_title,$show,$starttime,$countunread) = @_; + $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show, + $starttime,$countunread) = @_; my $navmap = Apache::lonnavmaps::navmap->new(); # force retrieve Resource to seed the part id cache we'll need it later my @allres=$navmap->retrieveResources(undef, @@ -794,7 +767,8 @@ sub check_discussions { $$unread{$ressymb}{'lastpost'} = $resource->last_post_time(); if ($countunread eq 'on') { - $$unread{$ressymb}{'unreadcount'} = $resource->unread_discussion(); + $$unread{$ressymb}{'unreadcount'} = + $resource->discussion_info('unread'); } } @@ -848,7 +822,6 @@ sub check_thresholds { my %stats; my %lastreset = (); my $warning = 0; - my $rowColor; foreach my $part (@parts) { if ($resource->handgrade($part) eq 'yes') { next; @@ -1138,22 +1111,20 @@ sub checkversions { } sub display_handgrade { - my ($r,$tograde,$rowColor1,$rowColor2,$ungraded) = @_; - my $rowColor; + my ($r,$tograde,$ungraded) = @_; my %lt = &Apache::lonlocal::texthash( 'prna' => 'Problem Name', 'nmun' => 'Number ungraded', 'nopr' => 'No problems require handgrading', ); if (@{$tograde} > 0) { - $r->print('
'.$lt{'prna'}.''.$lt{'nmun'}.'
'. + $lt{'prna'}.''. + $lt{'nmun'}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'
'.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.'

  '.$lt{'nopr'}.'  

'.$lt{'nopr'}.'
'.$lt{'reso'}.''.$lt{'nmer'}.'
'. + $lt{'reso'}.''. + $lt{'nmer'}.'
'.$$bombed{$bomb}{errorlink}.''.$$bombed{$bomb}{errorcount}.'
'.$$bombed{$bomb}{errorlink}. + ''. + $$bombed{$bomb}{errorcount}.'

'.$lt{'noer'}.'

'.$lt{'noer'}.'
'.$lt{'reso'}.''.$lt{'reso'}.''.$lt{'part'}.''.$lt{'nust'}.''.$lt{'avat'}.''.$lt{'dedi'}.''.$lt{'lare'}.''.$lt{'reco'}.'
'.$lt{'lare'}.''. + $lt{'reco'}.'
'. $$triggered{$res}{title}.'


'.$lt{'nopr'}.'
'.$lt{'reso'}.''.$lt{'revd'}.''.$lt{'newv'}.''.$lt{'veru'}.'
'. + $lt{'reso'}.''.$lt{'revd'}.''. + $lt{'newv'}.''. + $lt{'veru'}.'
'.$$res_title{$item}.''.$$changed{$item}{'revdate'}.''.$$changed{$item}{'current'}.''.$$changed{$item}{'version'}.'
'. + $$res_title{$item}.''. + $$changed{$item}{'revdate'}.''. + $$changed{$item}{'current'}.''. + $$changed{$item}{'version'}.'

'.$lt{'noup'}.' '.$interval.'

'.$lt{'noup'}. + ' '.$interval.'
'.$lt{'loca'}. - ''.$lt{'type'}. - ''); + $r->print('
'. + $lt{'loca'}.''. + $lt{'type'}.''.$lt{'tmlp'}.''.$lt{'numn'}. - ''.$lt{'tmlp'}.''.$lt{'numn'}.''.$lt{'tmlp'}. - ''.$lt{'tmlp'}.'
'.$forum_title.' '.$type.' '.$forum_title.' '.$type.' '.$lastpost.''. - '',$unreadnum.' '.$lastpost.''. + $unreadnum.' '.$lastpost.''.$lastpost.'

 '. - $lt{'noun'}.'

'.$lt{'noun'}.'
'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'
'. + &mt('Number').''.&mt('Subject').''. + &mt('Sender').''. + &mt('Date/Time').'
'.$mailcount.'.  '.$msg->{'shortsub'}.'    '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' '.$msg->{'sendtime'}.'
'.$mailcount. + '.  '. + $msg->{'shortsub'}.'    '. + $msg->{'from'}.'@'.$msg->{'fromdom'}.' '. + $msg->{'sendtime'}.'

'.&mt('No new '.$lctype.' messages').'

'. + &mt('No new '.$lctype.' messages').'
'.&mt('Number').''.&mt('Subject').''.&mt('Sender').''.&mt('Date/Time').'
'. + &mt('Number').''.&mt('Subject').''. + &mt('Sender').''. + &mt('Date/Time').'
'.$mailcount.'.  '.$msg->{'shortsub'}.'    '.$msg->{'from'}.'@'.$msg->{'fromdom'}.' '.$msg->{'sendtime'}.'
'.$mailcount. + '.  '. + $msg->{'shortsub'}.'    '. + $msg->{'from'}.'@'.$msg->{'fromdom'}.' '. + $msg->{'sendtime'}.'

'.&mt('No unread critical messages in '.$lctype).'

'. + &mt('No unread critical messages in '.$lctype). + '
+
-
- - - - '); + + + '); if (($caller eq 'abovethreshold') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' - + '); } - $class='class="LC_whatsnew"'; } elsif (($caller eq 'versionchanges') && ($$show{$caller})) { if ($$show{$caller}) { $r->print(' - + '); } } elsif ($caller eq 'coursediscussion') { if ($$show{$caller}) { $r->print(' - + '); } } $r->print(' -
- - - - - -
'.$$heading{$caller}.''.$showhide.'
-
'.$$heading{$caller}.''.$showhide.'
'.$lt{'chth'}.''.$lt{'chth'}.'
'.$lt{'chin'}.''.$lt{'chin'}.'
'.$lt{'chop'}.''.$lt{'chop'}.'
- + -
+ '); return; } @@ -1605,9 +1560,6 @@ sub start_box { sub end_box { my ($r) = shift; $r->print(' -
-