--- loncom/interface/lonwhatsnew.pm	2006/03/15 19:41:26	1.52
+++ loncom/interface/lonwhatsnew.pm	2006/12/03 05:45:13	1.66
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.52 2006/03/15 19:41:26 albertel Exp $
+# $Id: lonwhatsnew.pm,v 1.66 2006/12/03 05:45:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,8 @@ use Apache::lonuserstate;
 use Apache::Constants qw(:common :http);
 use Time::Local;
 use GDBM_File;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 #----------------------------
 # handler
@@ -100,32 +102,32 @@ sub handler {
             ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
               text=>"Change thresholds"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,"What's New?",#'Course_Action_Items_Thresholds'
+            ("What's New?",#'Course_Action_Items_Thresholds'
 	     ));
     } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
               text=>"Change interval"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,"What's New?",#'Course_Action_Items_Intervals'
+            ("What's New?",#'Course_Action_Items_Intervals'
 	     ));
     } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
               text=>"Change discussion display"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,"What's New?",#'Course_Action_Items_Intervals'
+            ("What's New?",#'Course_Action_Items_Intervals'
 	     ));
     } elsif ($command eq 'courseinit') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
               text=>"Course initialization preference"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,"What's New?",#'Course_Action_Items_Initialization'
+            ("What's New?",#'Course_Action_Items_Initialization'
 	     ));
     } else {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            (undef,"What's New?",#'Course_Action_Items_Display'
+            ("What's New?",#'Course_Action_Items_Display'
 	     ));
     }
     &display_main_box($r,$command,$refpage,\%checkallowed);
@@ -143,6 +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(&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 (
@@ -152,17 +155,17 @@ sub display_main_box {
     );
 
     my %interval_titles = &Apache::lonlocal::texthash (
-                            -1 => 'since start of course',
+                            -1 => "since start of $lctype",
                        2592000 => 'since last month',
                         604800 => 'since last week',
                          86400 => 'since yesterday',
     );
 
     my %initpage = &Apache::lonlocal::texthash (
-                     firstres => 'first resource in the course',
+                     firstres => "first resource in the $lctype",
                      whatsnew => "what's new? page",
                      userpref => 'your general user preferences',
-                     coursespecific => 'specific setting for this course',
+                     coursespecific => "specific setting for this $lctype",
                    );
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -225,7 +228,9 @@ END
 </script>
 ';
     }
-    return &Apache::loncommon::start_page('Course Action Items',$scripttag); 
+    my $course_type=&Apache::loncommon::course_type();
+    return &Apache::loncommon::start_page($course_type.' Action Items',
+					  $scripttag);
 }
 
 #-------------------------------
@@ -244,11 +249,15 @@ sub display_actions_box {
     my $udom = $env{'user.domain'};
     my $uname = $env{'user.name'};
     my $cid = $env{'request.course.id'};
-
+    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.',
+                 'yacc' => 'You are accessing an invalid course',
                  'gtfr' => 'Go to first resource',
-                 'pgse' => 'Page set to be displayed after you have selected a role in this course?',
                  'hial' => 'Hide all',
                  'shal' => 'Show all',
     );
@@ -277,16 +286,12 @@ 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",
                      userpref => 'user preference',
-                     coursespecific => 'course only',
+                     coursespecific => $lctype.' only',
                      default => 'default',
                    );
 
@@ -307,13 +312,11 @@ sub display_actions_box {
                   '</a></font><br />');
         }
     }
-    $r->print($lt{'pgse'}.' '.&mt('Currently: [_1]','<i>'.$currinit.'</i>').
-              ' <nobr>&nbsp;&nbsp;'.&mt('[_1] for just [_2]','<b>Change</b>',
-              '<a href="/adm/whatsnew?command=courseinit&refpage='.$refpage.
-              '">this course</a>').' '.&mt('or for all [_1].',
-              '<a href="/adm/preferences?action=changecourseinit&refpage='.
-              $refpage.'">your courses</a>').'</nobr><br /><hr />');
-                                                                                        
+    $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 '.$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);
     } elsif ($command eq 'update') {
@@ -328,7 +331,7 @@ sub display_actions_box {
 
     unless ($store_result eq 'ok') { 
         &Apache::lonnet::logthis('Error storing whatsnew settings: '.
-            $store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid);
+            $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
         $result .= &mt('Unable to store visibility settings due to [_1]',
                        $store_result); 
     }
@@ -354,19 +357,22 @@ sub display_actions_box {
     }
 
     my %headings = &Apache::lonlocal::texthash(
-                coursediscussion =>  'Unread course discussion posts',
+                coursediscussion =>  'Unread '.$lctype.' discussion posts',
                 handgrading =>  'Problems requiring handgrading',
                 haserrors => 'Problems with errors',
-                versionchanges => 'Resources in course with version changes '.$interval,
-                coursenormalmail => 'New course messages',
-                coursecritmail => 'New critical messages in course',
+                versionchanges => 'Resources in '.$lctype.' with version changes '.$interval,
+                coursenormalmail => 'New '.$lctype.' messages',
+                coursecritmail => 'New critical messages in '.$lctype,
     );
 
     if ($$checkallowed{'abovethreshold'}) {
         &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 students with submissions').' &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');
 
@@ -458,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',
@@ -524,9 +527,10 @@ sub display_threshold_config {
                                                                                    
 sub display_interval_config {
     my ($r,$refpage,$interval_titles) = @_;
+    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 course.'));
+    $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>.'));
@@ -605,13 +609,14 @@ sub courseinit_config {
     my ($control,$current) = &curr_courseinit();
     my @chgstate = ('userpref','coursespecific');
     my @chgentry = ('firstres','whatsnew');
+    my $lctype = lc(&Apache::loncommon::course_type());
     my %lt = &Apache::lonlocal::texthash(
-                             'chwp' => 'Choose which page will be displayed when you enter this course after selecting a role.',
+                             'chwp' => "Choose which page will be displayed when you enter this $lctype after selecting a role.",
                              'cuva' => 'Current value is determined by',
                              'anis' => 'and is set to display',
                              'padc' => 'Page display controlled by',
-                             'chce' => 'Choose course entry',
-                             'moce' => 'Modify course entry',
+                             'chce' => 'Choose '.$lctype.' entry',
+                             'moce' => 'Modify '.$lctype.' entry',
     );
     $r->print(<<"END"); 
 <br />$lt{'chwp'}
@@ -621,17 +626,27 @@ $$initpage{$current}</b>.<br /><br />
 <form method="post" name="courseinitswitch" action="/adm/whatsnew">
 <input type="hidden" name="command" value="newcourseinit" />
 <input type="hidden" name="refpage" value="$refpage" />
-$lt{'padc'}&nbsp;&nbsp;
+$lt{'padc'}:&nbsp;&nbsp;
 END
     foreach my $choice (@chgstate) {
+        my $chkstring;
+        if ($choice eq $control) {
+            $chkstring = ' checked="checked" ';
+        }  
         $r->print('<nobr><label><input type="radio" name="courseinit_control" value="'.
-                   $choice.'"/>'.$$initpage{$choice}.'&nbsp;&nbsp;</label></nobr>');
+                   $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
+                   '&nbsp;&nbsp;</label></nobr>');
     }
     $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}.
-              '<br />'.$lt{'chce'}." \n");
+              ' - <br />'.$lt{'chce'}.": \n");
     foreach my $choice (@chgentry) {
+        my $chkstring;
+        if (($choice eq $current) && ($control eq 'coursespecific')) {
+            $chkstring = ' checked="checked" ';
+        }
         $r->print('<nobr><label><input type="radio" name="courseinit_page" value="'.
-                  $choice.'"/>'.$$initpage{$choice}.'&nbsp;&nbsp;</label></nobr>');
+                  $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
+                  '&nbsp;&nbsp;</label></nobr>');
     }
     $r->print('<br /><br /><input type="submit" name="display" value="'.
                $lt{'moce'}.'" /></form>');
@@ -665,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,
@@ -679,7 +694,7 @@ sub display_launcher {
 
             } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
                 &display_abovethreshold($r,$refpage,$warnings,$triggered,
-                                             $res_title,$rowColor1,$rowColor2);
+					$res_title);
             } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                 &display_coursediscussion($r,$newdiscussions,$unread,
                                 $countunread,$res_title,$rowColor1,$rowColor2);
@@ -717,7 +732,6 @@ sub getitems {
                                                                    $cdom,$crs);
     }
 
-    my $warningnum = 0;
     foreach my $resource (@allres) {
         my $result = '';
         my $applies = 0;
@@ -726,6 +740,10 @@ sub getitems {
         %{$$ungraded{$symb}} = ();
         %{$$triggered{$symb}} = ();
         $$triggered{$symb}{numparts} = 0;
+        if ($resource->encrypted()) {
+            $$triggered{$symb}{'enclink'} = $resource->link();
+            $$triggered{$symb}{'encsymb'} = $resource->shown_symb();
+        }
         my $title = $resource->compTitle();
         $$res_title{$symb} = $title;
         my $ressymb = $resource->wrap_symb();
@@ -751,8 +769,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);
         }
 
     }
@@ -767,6 +785,10 @@ sub check_discussions {
     %{$$unread{$ressymb}} = ();
     $$unread{$ressymb}{'title'} = $title;
     $$unread{$ressymb}{'symb'} = $symb;
+    if ($resource->encrypted()) {
+        $$unread{$ressymb}{'enclink'} = $resource->link();
+        $$unread{$ressymb}{'encsymb'} = $resource->shown_symb();
+    }
     push(@{$newdiscussions}, $ressymb);
     
     $$unread{$ressymb}{'lastpost'} = $resource->last_post_time();
@@ -793,7 +815,11 @@ sub check_handgraded {
             if (@ungraded > 0) {
                 $$ungraded{$symb}{count} = scalar(@ungraded);
                 $$ungraded{$symb}{title} = $title;
-                push(@{$tograde}, $symb);
+                if ($resource->encrypted()) {
+                    $$ungraded{$symb}{'enclink'} = $resource->link();
+                    $$ungraded{$symb}{'encsymb'} = $resource->shown_symb();
+                }
+                push(@{$tograde},$symb);
             }
         }
     }
@@ -807,7 +833,7 @@ sub check_bombed {
         my @bombs = split(/,/, $errors);
         my $errorcount = scalar(@bombs);
         my $errorlink = '<a href="/adm/email?display='.
-                        &Apache::lonnet::escape($bombs[0]).'">'.
+                        &escape($bombs[0]).'">'.
                         $title.'</a>';
         $$bombed{$symb}{errorcount} = $errorcount;
         $$bombed{$symb}{errorlink} = $errorlink;
@@ -816,8 +842,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;
@@ -862,44 +887,42 @@ sub check_thresholds {
         }
     }
     if ($warning) {
-        if ($warningnum %2 == 1) {
-            $rowColor = $rowColor1;
-        } else {
-            $rowColor = $rowColor2;
-        }
         $$triggered{$symb}{title} = $resource->title;
+        my $partcount = 0;
+        @{$$triggered{$symb}{text}} = ();
         foreach my $part (@parts) {
             if (exists($stats{$part}{users})) {
-                my $resetname = 'reset_'.&Apache::lonnet::escape($symb."\0".$part);
-                my $resettitle = 'title_'.&Apache::lonnet::escape($symb."\0".$part);
-                if ($$triggered{$symb}{numparts}) {
-                    $$triggered{$symb}{text} .= '<tr bgcolor="'.$rowColor.'">'."\n";
-                }
+                my $resetname = 'reset_'.&escape($symb."\0".$part);
+                my $resettitle = 'title_'.&escape($symb."\0".$part);
                 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="'.&Apache::lonnet::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;
@@ -958,8 +981,8 @@ sub process_reset {
     my %titles = ();
     foreach my $key (keys(%env)) {
         next if ($key !~ /^form\.reset_(.+)$/);
-        my $title = &Apache::lonnet::unescape($env{'form.title_'.$1});
-        my $reset_item = &Apache::lonnet::unescape($1);
+        my $title = &unescape($env{'form.title_'.$1});
+        my $reset_item = &unescape($1);
         my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item);
         my %aggregates = ();
         my ($symb,$part) = split(/\0/,$reset_item);
@@ -991,7 +1014,7 @@ sub process_update {
         next if ($_!~/^form\.(.+)\_setparmval$/);
         my $name  = $1;
         my $value = $env{'form.'.$name.'_value'};
-        if ($name && defined($value)) {
+        if ($name && defined($value) && ($value ne '')) {
             my $put_result = &Apache::lonnet::put('nohist_whatsnew',
                                                   {$name=>$value},$udom,$uname);
            
@@ -1017,7 +1040,7 @@ sub getnormalmail {
 
     my @messages = sort(&Apache::lonnet::getkeys('nohist_email'));
     foreach my $message (@messages) {
-	my $msgid=&Apache::lonnet::escape($message);
+	my $msgid=&escape($message);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
             &Apache::lonmsg::unpackmsgid($msgid);
         if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
@@ -1029,7 +1052,6 @@ sub getnormalmail {
                     if ($shortsubj eq '') {
                         $shortsubj = &mt('No subject');
                     }
-                    $shortsubj = &Apache::lonnet::unescape($shortsubj);
                     push(@{$newmsgs}, {
                         msgid    => $msgid,
                         sendtime => $sendtime,
@@ -1061,7 +1083,6 @@ sub getcritmail {
                 if ($shortsubj eq '') {
                     $shortsubj = &mt('No subject');
                 }
-                $shortsubj = &Apache::lonnet::unescape($shortsubj);
                 push(@{$critmsgs}, {
                         msgid    => $msgid,
                         sendtime => $sendtime,
@@ -1135,8 +1156,11 @@ sub display_handgrade {
             }
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
             my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&Apache::lonnet::escape($res);
-                                                                               
+            $linkurl .= '?symb='.&escape($res);
+            if ($$ungraded{$res}{'enclink'}) {
+                $linkurl = 
+                    $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
+            } 
             $r->print('<tr bgcolor="'.$rowColor.'"><td><a href="'.$linkurl.'"><small>'.$$ungraded{$res}{title}.'</small></a></td><td align="right"><small>'.$$ungraded{$res}{count}.'</small></td></tr>');
             $rowNum ++;
         }
@@ -1173,7 +1197,7 @@ sub display_haserrors {
 }
 
 sub display_abovethreshold {
-    my ($r,$refpage,$warnings,$triggered,$res_title,$rowColor1,$rowColor2) = @_;
+    my ($r,$refpage,$warnings,$triggered,$res_title) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  reso => 'Resource',
                  part => 'Part',
@@ -1185,34 +1209,51 @@ sub display_abovethreshold {
                  rese => 'Reset counters to 0',
                  nopr => 'No problems satisfy threshold criteria',
     );
-    my $rowColor; 
-    my $warningnum = 0;
     if (@{$warnings} > 0) {
         @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings};
         $r->print('<form name="reset_tracking" method="post" action="/adm/whatsnew">'.
                 ' <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}) {
-            if ($warningnum %2 == 1) {
-                $rowColor = $rowColor1;
-            } else {
-                $rowColor = $rowColor2;
-            }
+	    $row++;
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
             my $linkurl=&Apache::lonnet::clutter($url);
             my $rowspan;
             if ($$triggered{$res}{numparts} > 1) {
                 $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"';
             }
-            $linkurl .= '?symb='.&Apache::lonnet::escape($res);
-            $r->print('<tr bgcolor="'.$rowColor.'"><td '.$rowspan.'><a href="'.$linkurl.'"><small>'.$$triggered{$res}{title}.'</small></a></td>'.$$triggered{$res}{text});
-            $warningnum ++;
+            $linkurl .= '?symb='.&escape($res);
+            if ($$triggered{$res}{'enclink'}) {
+                $linkurl = 
+                  $$triggered{$res}{'enclink'}.'?symb='.$$triggered{$res}{'encsymb'};
+            }
+            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>');
     }
 }
 
@@ -1240,7 +1281,7 @@ sub display_versionchanges {
             }
             my ($map,$id,$url)=&Apache::lonnet::decode_symb($item);
             my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&Apache::lonnet::escape($item);
+            $linkurl .= '?symb='.&escape($item);
 
             $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$linkurl.'">'.$$res_title{$item}.'</a></small></td><td><small>'.$$changed{$item}{'revdate'}.'</small></td><td><small>'.$$changed{$item}{'current'}.'</small></td><td><small>'.$$changed{$item}{'version'}.'</small></td></tr>');
             $changenum ++;
@@ -1254,11 +1295,12 @@ sub display_versionchanges {
 sub display_coursediscussion {
     my ($r,$newdiscussions,$unread,$countunread,$res_title,$rowColor1,
                                                               $rowColor2) = @_;
+    my $lctype = lc(&Apache::loncommon::course_type());
     my %lt = &Apache::lonlocal::texthash(
                 'loca' => 'Location',
                 'type' => 'Type',
                 'numn' => 'Number of new posts',
-                'noun' => 'No unread posts in course discussions',
+                'noun' => 'No unread posts in '.$lctype.' discussions',
                 'tmlp' => 'Time of last post', 
     );
     my $rowColor;
@@ -1282,9 +1324,13 @@ sub display_coursediscussion {
             my $forum_title = $$unread{$ressymb}{'title'};
             my $type = 'Resource';
             my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb);
+            my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb};
             if ($feedurl =~ /bulletinboard/) {
                 $type = 'Bulletin Board';
             }
+            if ($$unread{$ressymb}{'enclink'}) {
+                $disclink = $$unread{$ressymb}{'enclink'}.'?symb='.$$unread{$ressymb}{'encsymb'};
+            }
             if ($rowNum %2 == 1) {
                 $rowColor = $rowColor1;
             } else {
@@ -1292,7 +1338,7 @@ sub display_coursediscussion {
             }
             my $lastpost = &Apache::lonnavmaps::timeToHumanString(
                                                $$unread{$ressymb}{'lastpost'});
-            $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$feedurl.'?symb='.$$unread{$ressymb}{symb}.'">'.$forum_title.'</a>&nbsp;</td><td><small>'.$type.'&nbsp;</small></td>');
+            $r->print('<tr bgcolor="'.$rowColor.'"><td><small><a href="'.$disclink.'">'.$forum_title.'</a>&nbsp;</td><td><small>'.$type.'&nbsp;</small></td>');
             if ($countunread eq 'on') {
                 my $unreadnum = $$unread{$ressymb}{'unreadcount'};
                 $r->print('<td><small>'.$lastpost.'<small></td><td align="right">'.
@@ -1312,6 +1358,7 @@ sub display_coursediscussion {
 sub display_coursenormalmail {
     my ($r,$msgcount,$newmsgs,$rowColor1,$rowColor2) = @_;
     my $rowColor;
+    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;
@@ -1327,13 +1374,14 @@ sub display_coursenormalmail {
             $mailcount ++;
         }
     } else {
-        $r->print('<tr><td bgcolor="#ffffff" width="100%"><center><br /><b><i><small>'.&mt('No new course messages').'</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(&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;
@@ -1349,7 +1397,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 course').'</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>');
     }
 }
 
@@ -1368,8 +1416,9 @@ sub get_display_settings {
     if ($tmp=~ /^(con_lost|error|no_such_host)/i) {
         %settings = ();
         unless ($tmp =~ /^error: 2 /) {
+	    my $lctype = lc(&Apache::loncommon::course_type());
             &Apache::lonnet::logthis('Error retrieving whatsnew settings: '.
-            $tmp.' for '.$uname.':'.$udom.' for course: '.$cid);
+            $tmp.' for '.$uname.':'.$udom.' for '.$lctype.': '.$cid);
         }
     }
     return %settings;
@@ -1409,8 +1458,9 @@ sub store_interval_setting {
                   '<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />');
 
         } else {
+	    my $lctype = lc(&Apache::loncommon::course_type());
             &Apache::lonnet::logthis('Error storing whatsnew interval setting'.
-                     ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid);
+                ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
             $result = &mt('Unable to set interval to [_1] due to [_2].',
                          '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>',
                          '<tt>'.$outcome.'</tt>.<br />');
@@ -1432,8 +1482,9 @@ sub store_discussion_setting {
                   '<b>'.$env{'form.countunread'}.'</b><br />');
                                                                                   
         } else {
+	    my $lctype = lc(&Apache::loncommon::course_type());
             &Apache::lonnet::logthis('Error storing whatsnew countunread setting'.
-                     ' '.$outcome.' for '.$uname.':'.$udom.' in course '.$cid);
+                ' '.$outcome.' for '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
             $result = &mt('Unable to set "number unread posts display" to [_1]'.
                           ' due to [_2].',
                          '<b>'.$env{'form.countunread'}.'</b>',
@@ -1460,27 +1511,27 @@ sub store_courseinit_setting {
             }
         }
         if ($page_control) {
+	    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 course now set by [_1]',"<b>user's global preferences</b>.");
+                    $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 course set to [_1]','<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>.');
+                    $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 '.
                                          'setting: '.$outcome.' for '.$uname.
-                                                 ':'.$udom.' in course '.$cid);
+                                         ':'.$udom.' in '.$lctype.' '.$cid);
                 if ($page_control eq 'global preferences') {
                     $result = &mt('Unable to set control of page display to [_1]'.
                           ' due to [_2].',
                          '<b>'.$page_control.'</b>',
                          '<tt>'.$outcome.'</tt>.<br />');
                 } else {
-                    $result = &mt('Unable to set page display, after role selection, for this course to [_1] due to [_2].',
-                         '<b>'.$$initpage{$env{'form.courseinit_page'}}.'</b>',
-                         '<tt>'.$outcome.'</tt>.<br />');
+                    $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);
                 }
             }
         }
@@ -1495,7 +1546,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>';
@@ -1527,6 +1578,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('
@@ -1542,10 +1594,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;
 }