--- loncom/interface/lonmsgdisplay.pm	2013/08/30 13:40:49	1.168
+++ loncom/interface/lonmsgdisplay.pm	2014/05/21 17:36:58	1.175
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.168 2013/08/30 13:40:49 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.175 2014/05/21 17:36:58 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -233,18 +233,16 @@ function folder_choice(targetform,caller
      <td><b>'.$lt{'status'}.'</b><br />'."\n".
        &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
      </td>
-     <td><b>'.$lt{'actn'}.'</b><br />'."\n".'
+     <td style="padding-right: 40px;">
+         <b>'.$lt{'actn'}.'</b><br />'."\n".'
          <span class="LC_nobreak">'.
          &Apache::loncommon::select_form('view','folderaction',\%actions).
          ' <input type="button" value="'.$lt{'go'}.
          '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
          </span>
      </td>
-     <td>&nbsp;</td>
-     <td>&nbsp;</td>
-     <td valign="top" style="border-left: 1px solid;">&nbsp;</td>
-     <td>&nbsp;</td>
-     <td><b>'.&mt('New Folder').'</b><br />'."\n".'
+     <td style="border-left: 1px solid;padding-left: 40px;">
+         <b>'.&mt('New Folder').'</b><br />'."\n".'
          <span class="LC_nobreak">
          <input type="text" size="15" name="newfolder" value="" />
          <input type="button" value="'.$lt{'go'}.
@@ -265,8 +263,8 @@ sub get_permanent_folders {
     my %permfolders = 
 	&Apache::lonlocal::texthash(''         => 'INBOX',
 				    'trash'    => 'TRASH',
-				    'critical' => 'Critical',
-				    'sent'     => 'Sent Messages',
+				    'critical' => 'CRITICAL',
+				    'sent'     => 'SENT MESSAGES',
 				    );
     return %permfolders;
 }
@@ -382,7 +380,7 @@ sub deletefolder {
     my ($folder)=@_;
     my %permfolders = &get_permanent_folders();
     if (defined($permfolders{$folder})) {
-        return &mt('The folder "[_1]" may not be deleted.',$folder); 
+        return &mt('The folder "[_1]" may not be deleted.',$permfolders{$folder}); 
     }
     my %userfolders = &Apache::lonmsg::get_user_folders();
     if (!defined($userfolders{$folder})) {
@@ -815,7 +813,9 @@ sub discrit {
                 .'<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
-    foreach my $key (sort(keys(%what))) {
+    # Sort by date in descending order
+    foreach my $key (sort{$b <=> $a}(keys(%what))) {    
+        print STDERR "key = ||$key||\n";
         my %content=&Apache::lonmsg::unpackagemsg($what{$key});
         next if ($content{'senderdomain'} eq '');
         my $description;
@@ -1025,6 +1025,13 @@ sub disall {
     &Apache::loncommon::store_settings('user','mail',\%saveable);
     &Apache::loncommon::restore_settings('user','mail',\%saveable);
     $folder    ||= $env{'form.folder'};
+    # Always show critical messages if present
+    my @what=&Apache::lonnet::dump('critical',$env{'user.domain'},$env{'user.name'});
+    if ($what[0]) {
+	if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
+            $folder = 'critical';
+        }
+    }
     $msgstatus ||= $env{'form.msgstatus'};
     $env{'form.interdis'} ||= 20;
 
@@ -1206,7 +1213,7 @@ ENDDISHEADER
             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
-                          $item.(($status eq 'new')?'</b>':'').'</a></td>');
+                          $item.'</a>'.(($status eq 'new')?'</b>':'').'</td>');
             }
             # Description and Status
             my $showstatus;
@@ -1256,7 +1263,7 @@ ENDDISHEADER
         $r->print('    <option value="markeddel">'.&mt('Delete').'</option>'."\n");
     }
     if ($msgstatus ne 'read') {
-        $r->print('    <option value="markedread">'.&mt('Mark Read').'</option>."\n"');
+        $r->print('    <option value="markedread">'.&mt('Mark Read').'</option>'."\n");
     }
     if ($msgstatus ne 'unread') {
         $r->print('    <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n");
@@ -1926,8 +1933,7 @@ sub disfacetoface {
             } else {
                 %content=&Apache::lonmsg::unpackagemsg($content{'message'});
                 $content{'message'} =
-                '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br
-'.
+                '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
                 $content{'message'};
             }
         } else {
@@ -1956,9 +1962,9 @@ $content{'sendername'}.':'.
     if ($result eq '') {
         my $lctype = &mt(lc(&Apache::loncommon::course_type()));
 	if ($target ne 'tex') { 
-	    $r->print("<p><b>".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."</b></p>");
+	    $r->print("<p><b>".&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this '.$lctype.'.')."</b></p>");
 	} else {
-	    $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this [_1].',$lctype).'}\\\\');
+	    $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this '.$lctype.'.').'}\\\\');
 	}
     } elsif ($target ne 'tex') {
        $r->print($result.'</div>');
@@ -2165,7 +2171,7 @@ sub displaymessage {
 
 	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
 		push(@actionlist,&Apache::loncommon::track_student_link(
-                                      &mt('View recent activity')
+                                      'View recent activity'
                                      ,$content{'sendername'}
                                      ,$content{'senderdomain'}
                                      ,'check'));