--- loncom/interface/lonwhatsnew.pm	2006/05/30 20:16:23	1.56
+++ loncom/interface/lonwhatsnew.pm	2006/11/23 00:02:38	1.64
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.56 2006/05/30 20:16:23 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.64 2006/11/23 00:02:38 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,7 +145,7 @@ sub display_main_box {
     my $domain=&Apache::loncommon::determinedomain();
     my $function = &Apache::loncommon::get_users_function();
     my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
-    my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+    my $lctype = lc(&Apache::loncommon::course_type());
     $r->print('<table width="100%" border="0" cellpadding="5" cellspacing="0"><tr><td width="100%">');
 
     my %threshold_titles = &Apache::lonlocal::texthash (
@@ -228,8 +228,9 @@ END
 </script>
 ';
     }
-    return &Apache::loncommon::start_page(&mt('[_1] Action Items',
-                $env{'course.'.$env{'request.course.id'}.'.type'}),$scripttag);
+    my $course_type=&Apache::loncommon::course_type();
+    return &Apache::loncommon::start_page($course_type.' Action Items',
+					  $scripttag);
 }
 
 #-------------------------------
@@ -248,14 +249,14 @@ sub display_actions_box {
     my $udom = $env{'user.domain'};
     my $uname = $env{'user.name'};
     my $cid = $env{'request.course.id'};
-    my $crstype = $env{'course.'.$cid.'.type'};
+    my $crstype = &Apache::loncommon::course_type();
     my $lctype = lc($crstype);
     my %stulabel = (
                     'Course' => 'students',
                     'Group' => 'members',
                    );
     my %lt = &Apache::lonlocal::texthash(
-                 'yacc' => 'You are accessing an invalid course or group',
+                 'yacc' => 'You are accessing an invalid course',
                  'gtfr' => 'Go to first resource',
                  'hial' => 'Hide all',
                  'shal' => 'Show all',
@@ -285,11 +286,7 @@ sub display_actions_box {
         $result = &store_courseinit_setting($uname,$udom,$cid,$initpage);
     }
 
-    my %threshold = (
-                      av_attempts => 2,
-                      degdiff => 0.5,
-                      numstudents => 2,
-                     );
+    my %threshold = ();
     my %pagedesc = &Apache::lonlocal::texthash (
                      firstres => 'First resource',
                      whatsnew => "What's New? page",
@@ -315,10 +312,10 @@ sub display_actions_box {
                   '</a></font><br />');
         }
     }
-    $r->print(&mt('Page set to be displayed after you have selected a role in this [_1]',$lctype).
+    $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).
               '. <nobr>'.&mt('Currently: <i>[_1]</i>',$currinit).'.&nbsp;&nbsp;'.
-              &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this [_2]</a>',$refpage,$lctype).' '.
-              &mt('or for all <a href="/adm/preferences?action=changecourseinit&refpage=[_1]">your courses/groups</a>',$refpage).'</nobr><br /><hr />');
+              &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&refpage=[_1]">this '.$lctype.'</a>',$refpage).' '.
+              &mt('or for all <a href="/adm/preferences?action=changecourseinit&refpage=[_1]">your courses</a>',$refpage).'</nobr><br /><hr />');
 
     if ($command eq 'reset') {
         $result = &process_reset($cdom,$crs);
@@ -372,7 +369,10 @@ sub display_actions_box {
         &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs);
     }
 
-    $headings{'abovethreshold'} = &mt('Problems with av. attempts').' &ge; '.$threshold{'av_attempts'}.' '.&mt('or deg. difficulty').' &ge; '.$threshold{'degdiff'}.'<br /> '.&mt('and total number of [_1] with submissions',$stulabel{$crstype}).' &ge; '.$threshold{'numstudents'};
+    $headings{'abovethreshold'} = 
+	&mt('Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2] <br /> and total number of '.$stulabel{$crstype}.' with submissions &ge; [_3]',
+	    $threshold{'av_attempts'},$threshold{'degdiff'},
+	    $threshold{'numstudents'});
 
     my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');
 
@@ -464,9 +464,6 @@ sub display_threshold_config {
     my $rowColor;
 
     my @thresholditems = ("av_attempts","degdiff","numstudents");
-    foreach my $item (@thresholditems) {
-        $threshold{$item} = '';
-    }
     my %threshold_titles = &Apache::lonlocal::texthash(
                          av_attempts => 'Average number of attempts',
                          degdiff => 'Degree of difficulty',
@@ -530,10 +527,10 @@ sub display_threshold_config {
                                                                                    
 sub display_interval_config {
     my ($r,$refpage,$interval_titles) = @_;
-    my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+    my $lctype = lc(&Apache::loncommon::course_type());
     my $current = &get_current($env{'user.name'},$env{'user.domain'},
                                 $env{'request.course.id'},'interval');
-    $r->print('<br />'.&mt('Choose the time window to use for display of version changes for resources in the [_1].',$lctype));
+    $r->print('<br />'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.'));
     unless ($current eq '') {
         $r->print(' '.&mt('Current value is [_1]','<b>'.
                   $$interval_titles{$current}.'</b>.'));
@@ -612,7 +609,7 @@ sub courseinit_config {
     my ($control,$current) = &curr_courseinit();
     my @chgstate = ('userpref','coursespecific');
     my @chgentry = ('firstres','whatsnew');
-    my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+    my $lctype = lc(&Apache::loncommon::course_type());
     my %lt = &Apache::lonlocal::texthash(
                              'chwp' => "Choose which page will be displayed when you enter this $lctype after selecting a role.",
                              'cuva' => 'Current value is determined by',
@@ -683,7 +680,7 @@ sub display_launcher {
                           $critmsgcount,$critmsgs,$interval,$countunread) = @_;
 
     if ($$checkallowed{$action}) {
-        &start_box($r,$tabbg,$show,$headings,$action,$refpage);
+        &start_box($r,$tabbg,$show,$headings,$action,$refpage,$action);
         if ($$show{$action}) {
             if ($action eq 'handgrading') {    # UNGRADED ITEMS
                 &display_handgrade($r,$tograde,$rowColor1,$rowColor2,
@@ -697,7 +694,7 @@ sub display_launcher {
 
             } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
                 &display_abovethreshold($r,$refpage,$warnings,$triggered,
-                                             $res_title);
+					$res_title);
             } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                 &display_coursediscussion($r,$newdiscussions,$unread,
                                 $countunread,$res_title,$rowColor1,$rowColor2);
@@ -735,7 +732,6 @@ sub getitems {
                                                                    $cdom,$crs);
     }
 
-    my $warningnum = 0;
     foreach my $resource (@allres) {
         my $result = '';
         my $applies = 0;
@@ -769,8 +765,8 @@ sub getitems {
 
 # Maxtries and degree of difficulty for problem parts, unless handgradeable
         if ($$show{'abovethreshold'}) {  
-            &check_thresholds($resource,$symb,\%resourcetracker,$triggered,
-                       $threshold,$warnings,$warningnum,$rowColor1,$rowColor2);
+            &check_thresholds($resource,$symb,\%resourcetracker,
+			      $triggered,$threshold,$warnings);
         }
 
     }
@@ -834,8 +830,7 @@ sub check_bombed {
 }
 
 sub check_thresholds {
-    my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings,
-                                       $warningnum,$rowColor1,$rowColor2) = @_;
+    my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_;
 # Compile maxtries and degree of difficulty for problem parts, unless handgradeable
     my @parts = @{$resource->parts()};
     my %stats;
@@ -880,45 +875,42 @@ sub check_thresholds {
         }
     }
     if ($warning) {
-        if ($$warningnum %2 == 1) {
-            $rowColor = $rowColor1;
-        } else {
-            $rowColor = $rowColor2;
-        }
-        $$triggered{$symb}{rowColor} = $rowColor;
         $$triggered{$symb}{title} = $resource->title;
+        my $partcount = 0;
+        @{$$triggered{$symb}{text}} = ();
         foreach my $part (@parts) {
             if (exists($stats{$part}{users})) {
                 my $resetname = 'reset_'.&escape($symb."\0".$part);
                 my $resettitle = 'title_'.&escape($symb."\0".$part);
-                if ($$triggered{$symb}{numparts}) {
-                    $$triggered{$symb}{text} .= '<tr bgcolor="'.$rowColor.'">'."\n";
-                }
                 if (@parts > 1) {
-                    $$triggered{$symb}{text} .= '
-                     <td align="right"><small>part - '.$part.'<small></td>';
+                    $$triggered{$symb}{text}[$partcount] = '
+                     <td>part - '.$part.'</td>';
                 } else {
-                    $$triggered{$symb}{text} .= '
-                     <td align="right"><small>single part</small></td>';
+                    $$triggered{$symb}{text}[$partcount] = '
+                     <td>single part</td>';
                 }
-                $$triggered{$symb}{text} .= '
-                     <td align="right"><small>'.$stats{$part}{users}.'</small></td>
-                     <td align="right"><small>'.$stats{$part}{attempts}.'</small></td>
-                     <td align="right"><small>'.$stats{$part}{degdiff}.'</small></td>
-                     <td align="right"><small>'.$lastreset{$part}.'</small></td>
-                     <td align="right"><small><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>
-                    </tr>';
-                $$triggered{$symb}{numparts} ++;
+                $$triggered{$symb}{text}[$partcount] .= '
+                     <td>'.$stats{$part}{users}.'</td>
+                     <td>'.$stats{$part}{attempts}.'</td>
+                     <td>'.$stats{$part}{degdiff}.'</td>
+                     <td>'.$lastreset{$part}.'</td>
+                     <td><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
+                $partcount ++;
             }
+            $$triggered{$symb}{numparts} = $partcount;
         }
         push(@{$warnings},$symb);
-        $$warningnum ++;
     }
 }
 
 
 sub get_curr_thresholds {
     my ($threshold,$uname,$udom,$cid,$cdom,$crs) = @_;
+    # set default values
+    %$threshold = (av_attempts => 2,
+                  degdiff => 0.5,
+                  numstudents => 2
+                  );
     my %thresholdsettings = &Apache::lonnet::dump('nohist_whatsnew',$udom,
                                                      $uname,$cid.':threshold');
     my $thresholdcount = 0;
@@ -1208,8 +1200,14 @@ sub display_abovethreshold {
                 ' <input type="hidden" name="command" value="reset" />'."\n".
                 ' <input type="hidden" name="refpage" value="'.$refpage.'" />'.
                 "\n");
-        $r->print('<tr bgcolor="#cccccc"><td><b><small>'.$lt{'reso'}.'</small></b></td><td align="right"><b><small>'.$lt{'part'}.'</small></b></td><td align="right"><b><small>'.$lt{'nust'}.'</small></b></td><td align="right"><b><small>'.$lt{'avat'}.'</small></b></td><td align="right"><b><small>'.$lt{'dedi'}.'</small></b></td><td align="right"><b><small>'.$lt{'lare'}.'</small></b></td><td align="right"><b><small>'.$lt{'reco'}.'</small></b></td></tr>');
+        $r->print('<tr class="LC_info_row">'.
+		  '<td class="LC_first_item">'.$lt{'reso'}.'</td>'.
+		  '<td>'.$lt{'part'}.'</td><td>'.$lt{'nust'}.'</td>'.
+		  '<td>'.$lt{'avat'}.'</td><td>'.$lt{'dedi'}.'</td>'.
+		  '<td>'.$lt{'lare'}.'</td><td>'.$lt{'reco'}.'</td></tr>');
+	my $row;
         foreach my $res (@{$warnings}) {
+	    $row++;
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
             my $linkurl=&Apache::lonnet::clutter($url);
             my $rowspan;
@@ -1217,11 +1215,26 @@ sub display_abovethreshold {
                 $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"';
             }
             $linkurl .= '?symb='.&escape($res);
-            $r->print('<tr bgcolor="'.$$triggered{$res}{rowColor}.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text});
+            my $css_class = $row%2?'LC_odd_row':'';
+            $r->print('<tr class="'.$css_class.'">'.
+		      '<td class="LC_first_item" '.$rowspan.'><a href="'.$linkurl.'">'.
+		      $$triggered{$res}{title}.'</a></td>');
+                      if (ref($$triggered{$res}{text}) eq 'ARRAY') {
+		          $r->print($$triggered{$res}{text}[0]);
+                      }
+                      $r->print('</tr>');
+            if (ref($$triggered{$res}{text}) eq 'ARRAY') {
+                if (@{$$triggered{$res}{text}} > 1) {
+                    for (my $i=1; $i<@{$$triggered{$res}{text}}; $i++) {
+                        $r->print('<tr class="'.$css_class.'">'.
+                                  $$triggered{$res}{text}[$i].'</tr>');
+                    }
+                }
+            }
         }
-        $r->print('<tr bgcolor="#cccccc"><td colspan="7" align="right"><br /><b><small><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></form>');
+        $r->print('<tr class="LC_info_row"><td colspan="7"><br /><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></td></tr></form>');
     } else {
-        $r->print('<tr><td bgcolor="#ffffff"><br /><center><b><i><small>'.$lt{'nopr'}.'</small></i></b></center><br /></td></tr>');
+        $r->print('<tr class="LC_empty_row"><td>'.$lt{'nopr'}.'</td></tr>');
     }
 }
 
@@ -1263,7 +1276,7 @@ sub display_versionchanges {
 sub display_coursediscussion {
     my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1,
                                                               $rowColor2) = @_;
-    my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+    my $lctype = lc(&Apache::loncommon::course_type());
     my %lt = &Apache::lonlocal::texthash(
                 'loca' => 'Location',
                 'type' => 'Type',
@@ -1322,7 +1335,7 @@ sub display_coursediscussion {
 sub display_coursenormalmail {
     my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_;
     my $rowColor;
-    my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+    my $lctype = lc(&Apache::loncommon::course_type());
     if ($msgcount > 0) {
         $r->print('<tr bgcolor="#cccccc"><td><b><small>'.&mt('Number').'</small></b></td><td><b><small>'.&mt('Subject').'</small></b></td><td><b><small>'.&mt('Sender').'</small></b></td><td><b><small>'.&mt('Date/Time').'</small></b></td></tr>');
         my $rowNum = 0;
@@ -1338,14 +1351,14 @@ sub display_coursenormalmail {
             $mailcount ++;
         }
     } else {
-        $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No new [_1] messages',$lctype).'</small></i></b><br /><br /></center></td></tr>');
+        $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No new '.$lctype.' messages').'</small></i></b><br /><br /></center></td></tr>');
     }
 }
 
 sub display_coursecritmail {
     my ($r,$critmsgcount,$critmsgs,$rowColor1,$rowColor2) = @_;
     my $rowColor;
-    my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+    my $lctype = lc(&Apache::loncommon::course_type());
     if ($critmsgcount > 0) {
         $r->print('<tr bgcolor="#cccccc"><td><b><small>'.&mt('Number').'</small></b></td><td><b><small>'.&mt('Subject').'</small></b></td><td><b><small>'.&mt('Sender').'</small></b></td><td><b><small>'.&mt('Date/Time').'</small></b></td></tr>');
         my $rowNum = 0;
@@ -1361,7 +1374,7 @@ sub display_coursecritmail {
             $mailcount ++;
         }
     } else {
-        $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No unread critical messages in [_1]',$lctype).'</small></i></b><br /><br /></center></td></tr>');
+        $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No unread critical messages in '.$lctype).'</small></i></b><br /><br /></center></td></tr>');
     }
 }
 
@@ -1380,7 +1393,7 @@ sub get_display_settings {
     if ($tmp=~ /^(con_lost|error|no_such_host)/i) {
         %settings = ();
         unless ($tmp =~ /^error: 2 /) {
-            my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+	    my $lctype = lc(&Apache::loncommon::course_type());
             &Apache::lonnet::logthis('Error retrieving whatsnew settings: '.
             $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid);
         }
@@ -1422,7 +1435,7 @@ sub store_interval_setting {
                   '<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />');
 
         } else {
-            my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+	    my $lctype = lc(&Apache::loncommon::course_type());
             &Apache::lonnet::logthis('Error storing whatsnew interval setting'.
                 ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
             $result = &mt('Unable to set interval to [_1] due to [_2].',
@@ -1446,7 +1459,7 @@ sub store_discussion_setting {
                   '<b>'.$env{'form.countunread'}.'</b><br />');
                                                                                   
         } else {
-            my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+	    my $lctype = lc(&Apache::loncommon::course_type());
             &Apache::lonnet::logthis('Error storing whatsnew countunread setting'.
                 ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
             $result = &mt('Unable to set "number unread posts display" to [_1]'.
@@ -1475,14 +1488,14 @@ sub store_courseinit_setting {
             }
         }
         if ($page_control) {
-            my $lctype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+	    my $lctype = lc(&Apache::loncommon::course_type());
             my $outcome = &Apache::lonnet::put('nohist_whatsnew',
                                            \%courseinit_settings,$udom,$uname);
             if ($outcome eq 'ok') {
                 if ($page_control eq 'global preferences') {
-                    $result = &mt("Page displayed after role selection in [_1] now set by <b>user's global preferences</b>.",$lctype);
+                    $result = &mt("Page displayed after role selection in $lctype now set by <b>user's global preferences</b>.");
                 } else {
-                    $result = &mt('Page displayed after role selection in this [_1] set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}});
+                    $result = &mt('Page displayed after role selection in this '.$lctype.' set to <b>[_2]</b>',$lctype,$$initpage{$env{'form.courseinit_page'}});
                 }
             } else {
                 &Apache::lonnet::logthis('Error storing whatsnew courseinit '.
@@ -1494,7 +1507,7 @@ sub store_courseinit_setting {
                          '<b>'.$page_control.'</b>',
                          '<tt>'.$outcome.'</tt>.<br />');
                 } else {
-                    $result = &mt('Unable to set page display, after role selection, for this [_1] to <b>[_2]</b> due to <tt>[_3]</tt>.<br />',$lctype,
+                    $result = &mt('Unable to set page display, after role selection, for this '.$lctype.' to <b>[_2]</b> due to <tt>[_3]</tt>.<br />',
                          $$initpage{$env{'form.courseinit_page'}},$outcome);
                 }
             }
@@ -1510,7 +1523,7 @@ sub start_box {
                        chin => 'Change interval?',
                        chop => 'Change options?',
     );
-    my $showhide;
+    my ($showhide,$class);
     if ($$show{$caller}) {
         $showhide = '<b><a href="javascript:change_display(document.visible.'.
                                'display_'.$caller.",'hide'".');">Hide</a></b>';
@@ -1542,6 +1555,7 @@ sub start_box {
                 <td bgcolor="'.$tabbg.'" align="right"><a href="/adm/whatsnew?command=chgthreshold&refpage='.$refpage.'"><b><small>'.$lt{'chth'}.'</small></b></a></td>
               </tr>');
          }
+	 $class='class="LC_whatsnew"';
      } elsif (($caller eq 'versionchanges') && ($$show{$caller})) {
          if ($$show{$caller}) {
              $r->print('
@@ -1557,10 +1571,10 @@ sub start_box {
               </tr>');
          }
      }
-     $r->print('
+    $r->print('
               <tr>
                <td bgcolor="#ffffff">
-                <table cellpadding="2" cellspacing="0" border="0" width="100%">
+                <table cellpadding="2" cellspacing="0" border="0" width="100%" '.$class.'>
 ');
     return;
 }