--- loncom/interface/lonwhatsnew.pm	2007/03/02 20:58:32	1.69
+++ loncom/interface/lonwhatsnew.pm	2008/03/18 22:00:28	1.76
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.69 2007/03/02 20:58:32 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.76 2008/03/18 22:00:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,28 +99,28 @@ sub handler {
               text=>"Display Action Items"});
     if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
+            ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
               text=>"Change thresholds"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Thresholds'
 	     ));
     } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
+            ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
               text=>"Change interval"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Intervals'
 	     ));
     } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
+            ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
               text=>"Change discussion display"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Intervals'
 	     ));
     } elsif ($command eq 'courseinit') {
         &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
+            ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
               text=>"Course initialization preference"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Initialization'
@@ -295,7 +295,7 @@ sub display_actions_box {
     my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')';
 
     unless ($cid) {
-        $r->print('<br /><b><center>'.$lt{'yacc'}.'</center></b><br /><br />');
+        $r->print('<p><span style="text-align: center; font-weight: bold;">'.$lt{'yacc'}.'</span></p>');
         return;
     }
 
@@ -304,14 +304,22 @@ sub display_actions_box {
             &GDBM_READER(),0640)) {
             my $furl=$bighash{'first_url'};
             untie(%bighash);
-            $r->print('<font size="+1"><a href="'.$furl.'">'.$lt{'gtfr'}.
-                  '</a></font><br />');
+            $r->print('<span style="font-size: larger;"><a href="'.$furl.'">'.$lt{'gtfr'}.
+                  '</a></span><br />');
         }
     }
-    $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 />');
+    $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
+              .' <span class="LC_nobreak">'
+              .&mt('Currently: <i>[_1]</i>',$currinit)
+              .'.&nbsp;&nbsp;'
+#              &mt('<b>Change</b> for just <a href="/adm/whatsnew?command=courseinit&amp;refpage=[_1]">this '.$lctype.'</a>',$refpage).' '.
+#              &mt('or for all <a href="/adm/preferences?action=changecourseinit&amp;refpage=[_1]">your courses</a>.',$refpage).'</span><br /><hr />');
+              .&mt('<b>Change</b> for just [_1]this course[_2]'
+                  .' or for all [_3]your courses[_2].'
+                  ,'<a href="/adm/whatsnew?command=courseinit&amp;refpage='.$refpage.'">'
+                  ,'</a>'
+                  ,'<a href="/adm/preferences?action=changecourseinit&amp;refpage='.$refpage.'">')
+              .' </span><br /><hr />');
 
     if ($command eq 'reset') {
         $result = &process_reset($cdom,$crs);
@@ -326,9 +334,9 @@ sub display_actions_box {
     my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed);
 
     unless ($store_result eq 'ok') { 
-        &Apache::lonnet::logthis('Error storing whatsnew settings: '.
+        &Apache::lonnet::logthis('Error saving whatsnew settings: '.
             $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid);
-        $result .= &mt('Unable to store visibility settings due to [_1]',
+        $result .= &mt('Unable to save visibility settings due to [_1]',
                        $store_result); 
     }
 
@@ -411,7 +419,7 @@ sub display_actions_box {
         }
     }
 
-    $r->print('<input type="hidden" name="refpage" value="'.$refpage.'"></form><br /><table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">');
+    $r->print('<input type="hidden" name="refpage" value="'.$refpage.'" /></form><table class="LC_double_column"><tr><td class="LC_left_col">');
 
     my $displayed = 0;
     my $totalboxes = 0;
@@ -426,20 +434,17 @@ sub display_actions_box {
     foreach my $actionitem (@actionorder) {
         if ($$checkallowed{$actionitem}) {
             if ($displayed == $halfway) {
-                $r->print('</td><td width="6%">&nbsp;</td><td align="left" valign="top" width="47%">');
+                $r->print('</td><td>&nbsp;</td><td class="LC_right_col" >');
             }
             &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 ++; 
         }
     }
     $r->print('
-           </table>
-          </td>
-         </tr>
-        </table>
       </td>
     </tr>
-   </table>');
+   </table>
+');
 }
 
 #-------------------------------
@@ -470,9 +475,9 @@ sub display_threshold_config {
     $r->print('<br /><form name="thresholdform" method="post" action="/adm/whatsnew">'.
               &Apache::loncommon::start_data_table().
               &Apache::loncommon::start_data_table_header_row().
-             '<th>Threshold Name</th>'."\n".
-             '<th>Current value</th>'."\n".
-             '<th>Change?</th>'."\n".
+             '<th>'.&mt('Threshold Name').'</th>'."\n".
+             '<th>'.&mt('Current value').'</th>'."\n".
+             '<th>'.&mt('Change?').'</th>'."\n".
               &Apache::loncommon::end_data_table_header_row());
     foreach my $type (@thresholditems) {
         my $parameter = $env{'request.course.id'}.':threshold_'.$type;
@@ -491,7 +496,7 @@ sub display_threshold_config {
                  &Apache::loncommon::end_data_table_row());
     }
     $r->print(&Apache::loncommon::end_data_table()."\n".
-          '<br /><input type="submit" name="threshold" value="Make changes" />
+          '<br /><input type="submit" name="threshold" value="'.&mt('Make changes').'" />
                  <input type="hidden" name="command" value="update" />
                  <input type="hidden" name="refpage" value="'.$refpage.'" />
                </form>');
@@ -509,10 +514,10 @@ sub display_interval_config {
     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 '.$lctype.'.'));
+    $r->print('<br />'.&mt('Choose the time window to use for display of version changes for resources in the '.$lctype.'.').'<br />');
     unless ($current eq '') {
-        $r->print(' '.&mt('Current value is [_1]','<b>'.
-                  $$interval_titles{$current}.'</b>.'));
+        $r->print(' '.&mt('Current value is [_1].','<b>'.
+                  $$interval_titles{$current}.'</b>'));
     }
     $r->print('<br /><br />
 <form method="post" name="intervalswitch" action="/adm/whatsnew">
@@ -521,7 +526,7 @@ sub display_interval_config {
 <select name="interval">
 ');
     foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles})))) {
-        $r->print('<option value="'.$key.'">Version changes '.$$interval_titles{$key}.
+        $r->print('<option value="'.$key.'">'.&mt('Version changes').' '.$$interval_titles{$key}.
                   '</option>'."\n");
     }
     $r->print('</select>&nbsp;&nbsp;
@@ -556,7 +561,7 @@ function toggle_countunread(choice) {
     document.discussionswitch.submit();
 }
 </script>');
-    $r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"<i>What's New?</i>").'&nbsp;&nbsp;'.&mt('Currently set to [_1].','<b>'.$current.'</b>'));
+    $r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt("This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.").'&nbsp;&nbsp;'.&mt("Currently set to <b>$current</b>."));
     $r->print('<br /><br />
 <form method="post" name="discussionswitch" action="/adm/whatsnew">
 <input type="hidden" name="command" value="newdiscconf" />
@@ -565,7 +570,7 @@ function toggle_countunread(choice) {
 ');
     $r->print('<br/>
                <input type="button" name="display" value="'.
-               &mt('Change to [_1]',$opposite{$current}).'" 
+               &mt('Change to [_1]',&mt($opposite{$current})).'" 
                onclick="javascript:toggle_countunread('."'change'".')" />
                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;
                <input type="button" name="nochange" value="'.
@@ -612,9 +617,9 @@ END
         if ($choice eq $control) {
             $chkstring = ' checked="checked" ';
         }  
-        $r->print('<nobr><label><input type="radio" name="courseinit_control" value="'.
+        $r->print('<span class="LC_nobreak"><label><input type="radio" name="courseinit_control" value="'.
                    $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
-                   '&nbsp;&nbsp;</label></nobr>');
+                   '&nbsp;&nbsp;</label></span>');
     }
     $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}.
               ' - <br />'.$lt{'chce'}.": \n");
@@ -623,9 +628,9 @@ END
         if (($choice eq $current) && ($control eq 'coursespecific')) {
             $chkstring = ' checked="checked" ';
         }
-        $r->print('<nobr><label><input type="radio" name="courseinit_page" value="'.
+        $r->print('<span class="LC_nobreak"><label><input type="radio" name="courseinit_page" value="'.
                   $choice.'"'.$chkstring.'/>'.$$initpage{$choice}.
-                  '&nbsp;&nbsp;</label></nobr>');
+                  '&nbsp;&nbsp;</label></span>');
     }
     $r->print('<br /><br /><input type="submit" name="display" value="'.
                $lt{'moce'}.'" /></form>');
@@ -869,10 +874,10 @@ sub check_thresholds {
                 my $resettitle = 'title_'.&escape($symb."\0".$part);
                 if (@parts > 1) {
                     $$triggered{$symb}{text}[$partcount] = '
-                     <td>part - '.$part.'</td>';
+                     <td>'.&mt('part - ').$part.'</td>';
                 } else {
                     $$triggered{$symb}{text}[$partcount] = '
-                     <td>single part</td>';
+                     <td>'.&mt('single part').'</td>';
                 }
                 $$triggered{$symb}{text}[$partcount] .= '
                      <td>'.$stats{$part}{users}.'</td>
@@ -982,7 +987,7 @@ sub process_reset {
 
 sub process_update {
     my ($uname,$udom,$threshold_titles) = @_;
-    my $setoutput = '<b>Changes to threshold(s) for problem tracking:</b><br />';
+    my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br />';
     foreach (keys %env) {
         next if ($_!~/^form\.(.+)\_setparmval$/);
         my $name  = $1;
@@ -1302,7 +1307,7 @@ sub display_coursediscussion {
             my $css_class = $rowNum%2?' class="LC_odd_row"':'';
             my $lastpost = &Apache::lonnavmaps::timeToHumanString(
                                                $$unread{$ressymb}{'lastpost'});
-            $r->print('<tr'.$css_class.'><td><a href="'.$disclink.'">'.$forum_title.'</a>&nbsp;</td><td>'.$type.'&nbsp;</td>');
+            $r->print('<tr'.$css_class.'><td><a href="'.$disclink.'">'.$forum_title.'</a>&nbsp;</td><td>'.&mt($type).'&nbsp;</td>');
             if ($countunread eq 'on') {
                 my $unreadnum = $$unread{$ressymb}{'unreadcount'};
                 $r->print('<td>'.$lastpost.'</td><td class="LC_right_item">'.
@@ -1329,11 +1334,12 @@ sub display_coursenormalmail {
         foreach my $msg (@{$newmsgs}) {
             $mailcount ++;
             my $css_class = $mailcount%2?' class="LC_odd_row"':'';
-            $r->print('<tr'.$css_class.'><td>'.$mailcount.
-                      '. &nbsp;</td><td><a href="/adm/communicate">'.
-                      $msg->{'shortsub'}.'</a>&nbsp; &nbsp;</td><td>&nbsp;'.
-                      $msg->{'from'}.'@'.$msg->{'fromdom'}.'&nbsp;</td><td>'.
-                      $msg->{'sendtime'}.'</td></tr>');
+            $r->print('<tr'.$css_class.'><td>'.$mailcount
+                      .'.&nbsp;</td><td><a href="/adm/email?display='
+                      .$msg->{'msgid'}.'">'
+                      .$msg->{'shortsub'}.'</a>&nbsp;&nbsp;</td><td>&nbsp;'
+                      .$msg->{'from'}.':'.$msg->{'fromdom'}.'&nbsp;</td><td>'
+                      .$msg->{'sendtime'}.'</td></tr>');
         }
     } else {
         $r->print('<tr class="LC_empty_row"><td>'.
@@ -1356,7 +1362,7 @@ sub display_coursecritmail {
             $r->print('<tr'.$css_class.'><td>'.$mailcount.
                       '. &nbsp;</td><td><a href="/adm/email?folder=critical">'.
                       $msg->{'shortsub'}.'</a>&nbsp; &nbsp;</td><td>&nbsp;'.
-                      $msg->{'from'}.'@'.$msg->{'fromdom'}.'&nbsp;</td><td>'.
+                      $msg->{'from'}.':'.$msg->{'fromdom'}.'&nbsp;</td><td>'.
                       $msg->{'sendtime'}.'</td></tr>');
         }
     } else {
@@ -1420,11 +1426,11 @@ sub store_interval_setting {
                                              \%interval_settings,$udom,$uname);
         if ($outcome eq 'ok') {
             $result = &mt('Interval set to version changes [_1]',
-                  '<b>'.$$interval_titles{$env{'form.interval'}}.'</b><br />');
+                  '<b>'.$$interval_titles{$env{'form.interval'}}.'</b>').'<br />';
 
         } else {
 	    my $lctype = lc(&Apache::loncommon::course_type());
-            &Apache::lonnet::logthis('Error storing whatsnew interval setting'.
+            &Apache::lonnet::logthis('Error saving whatsnew interval setting'.
                 ' '.$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>',
@@ -1444,15 +1450,15 @@ sub store_discussion_setting {
                                              \%discussion_settings,$udom,$uname);
         if ($outcome eq 'ok') {
             $result = &mt('Count unread posts in discussions display set to [_1]',
-                  '<b>'.$env{'form.countunread'}.'</b><br />');
+                  '<b>'.&mt($env{'form.countunread'}).'</b>').'<br />';
                                                                                   
         } else {
 	    my $lctype = lc(&Apache::loncommon::course_type());
-            &Apache::lonnet::logthis('Error storing whatsnew countunread setting'.
+            &Apache::lonnet::logthis('Error saving whatsnew countunread setting'.
                 ' '.$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>',
+                         '<b>'.&mt($env{'form.countunread'}).'</b>',
                          '<tt>'.$outcome.'</tt>.<br />');
         }
     }
@@ -1486,7 +1492,7 @@ sub store_courseinit_setting {
                     $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 '.
+                &Apache::lonnet::logthis('Error saving whatsnew courseinit '.
                                          'setting: '.$outcome.' for '.$uname.
                                          ':'.$udom.' in '.$lctype.' '.$cid);
                 if ($page_control eq 'global preferences') {
@@ -1514,17 +1520,19 @@ sub start_box {
     my $showhide;
     if ($$show{$caller}) {
         $showhide = '<b><a href="javascript:change_display(document.visible.'.
-                               'display_'.$caller.",'hide'".');">Hide</a></b>';
+                               'display_'.$caller.",'hide'".');">'.
+                               &mt('Hide').'</a></b>';
    
     } else {
         $showhide = '<b><a href="javascript:change_display(document.visible.'.
-                               'display_'.$caller.",'show'".');">Show</a></b>';
+                               'display_'.$caller.",'show'".');">'.
+                               &mt('Show').'</a></b>';
     }
     
     $r->print('
          <table class="LC_nested_outer">
           <tr>
-           <th>'.$$heading{$caller}.'</th>
+           <th class="LC_left_item">'.$$heading{$caller}.'</th>
            <th class="LC_right_item">'.$showhide.'</th>
           </tr>');
      if (($caller eq 'abovethreshold') && ($$show{$caller})) {