--- loncom/interface/lonmsgdisplay.pm	2010/01/13 16:39:19	1.140
+++ loncom/interface/lonmsgdisplay.pm	2010/01/14 17:20:44	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.140 2010/01/13 16:39:19 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.142 2010/01/14 17:20:44 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -146,7 +146,7 @@ sub folderlist {
     );
     $actions{'select_form_order'} = ['view','rename','delete'];
 
-    my %statushash = &get_msgstatus_types();
+    my %statushash = &Apache::lonlocal::texthash(&get_msgstatus_types());
 
     $statushash{'select_form_order'} = ['','new','read','replied','forwarded'];
 
@@ -219,8 +219,7 @@ function folder_choice(targetform,caller
 </script>|;
     my %show = ('select_form_order' => [10,20,50,100,200],
 		map {$_=>$_} (10,20,50,100,200));
-		
-		   
+
     $output .= '
 <form method="post" action="/adm/email" name="folderlist">
 <table border="0" cellspacing="2" cellpadding="2">
@@ -273,12 +272,13 @@ sub get_permanent_folders {
 }
 
 sub get_msgstatus_types {
-    my %statushash = &Apache::lonlocal::texthash(
-                                '' => 'Any',
-                                new => 'Unread',
-                                read => 'Read',
-                                replied => 'Replied to',
-                                forwarded => 'Forwarded',
+    # Don't translate here!
+    my %statushash = (
+        ''          => 'Any',
+        'new'       => 'Unread',
+        'read'      => 'Read',
+        'replied'   => 'Replied to',
+        'forwarded' => 'Forwarded',
     );
     return %statushash;
 }
@@ -291,7 +291,7 @@ sub scrollbuttons {
     my %statushash = &get_msgstatus_types();
     my $status;
     if ($msgstatus eq '') {
-        $status = &mt('All');
+        $status = 'All'; # Don't translate here!
     } else {
         $status = $statushash{$msgstatus};
     }
@@ -866,8 +866,11 @@ sub discrit {
     }
     # Check to see if there were any messages.
     if ($result eq '') {
-        $result = "<h2>".&mt('You have no critical messages.')."</h2>".
-	    '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
+        $result =
+            '<p class="LC_info">'.
+            &mt('You have no critical messages.').
+            '</p>'.
+            '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
             '<a href="/adm/email">'.&mt('Communicate').'</a>';
     } else {
         $r->print($header);
@@ -1070,18 +1073,20 @@ ENDDISHEADER
     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;
     if ($totalnumber < 1) {
+        $r->print('<p class="LC_info">');
         if ($msgstatus eq '') {
-	    $r->print('<h2>'.&mt('Empty Folder').'</h2>');
+            $r->print(&mt('There are no messages in this folder.'));
         } elsif ($msgstatus eq 'replied') {
-            $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');
-        } else { 
-            $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
+            $r->print(&mt('You have not replied to any messages in this folder.'));
+        } else {
+            $r->print(&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.'));
         }
+        $r->print('</p>');
         if ($numblocked > 0) {
             $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
                                          \%setters));
         }
-	return;
+        return;
     }
     my $interdis = $env{'form.interdis'};
     my $number=int($totalnumber/$interdis);
@@ -2224,7 +2229,7 @@ sub display_blocker_status {
     <th>$ltext->{'setb'}</th>
     <th>$ltext->{'even'}</th>
     <th>$ltext->{'blck'}</th>
-    <th>$ltext->{'actn'}?</th>
+    <th>$ltext->{'actn'}</th>
   </tr>
 END
     foreach my $record (sort(keys(%{$records}))) {
@@ -2258,7 +2263,12 @@ END
         }
         $r->print(<<"END");
         </td>      
-        <td><label>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount" /></label>
+        <td><span class="LC_nobreak"><label>
+        <input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
+        </label><br />
+        <label>
+        <input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
+        </label></span>
 END
         $r->print(&Apache::loncommon::end_data_table_row());
         $parmcount++;
@@ -2295,7 +2305,7 @@ END
      <th>$ltext->{'dura'}</th>
      <th>$ltext->{'even'} $lt{'exam'}</th>
      <th>$ltext->{'blck'}</th>
-     <th>$ltext->{'actn'}?</th>
+     <th>$ltext->{'actn'}</th>
    </tr>
 END
     $r->print(&Apache::loncommon::start_data_table_row());
@@ -2309,7 +2319,9 @@ END
      }
      $r->print(<<"END");
      </td> 
-     <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
+     <td><label>
+     <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
+     </label></td>
 END
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());