--- loncom/interface/lonmsgdisplay.pm	2013/07/15 16:13:21	1.163
+++ loncom/interface/lonmsgdisplay.pm	2014/12/11 01:52:30	1.178
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.163 2013/07/15 16:13:21 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.178 2014/12/11 01:52:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,11 +128,8 @@ sub folderlist {
                 go   => 'Go',
                 nnff => 'New Name for Folder',
                 newn => 'New Name',
-                thfm => 'The folder may not be renamed',
-                fmnb => 'folder may not be renamed as it is a folder provided by the system.',
-                asth => 'as this name is already in use for a system-provided or user-defined folder.',
-                the => 'The',
-                tnfm => 'The new folder may not be named',
+                fmnb => 'Folder may not be renamed as it is a folder provided by the system.',
+                asth => 'Requested name already in use for a system-provided or user-defined folder.',
 
     );
 
@@ -182,7 +179,7 @@ function folder_choice(targetform,caller
         if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') {
             for (var i=0; i<permfolders_keys.length; i++) {
                 if (permfolders_keys[i] == targetform.folder.value) {
-                    alert("$lt{'the'} '"+permfolders_vals[i]+"' $lt{'fmnb'}");
+                    alert("'"+permfolders_vals[i]+"' -- $lt{'fmnb'}");
                     return;
                 }
             }
@@ -191,7 +188,7 @@ function folder_choice(targetform,caller
                 targetform.renamed.value=foldername;
                 for (var i=0; i<allfolders.length; i++) {
                     if (allfolders[i] == foldername) {
-                        alert("$lt{'thfm'} '"+foldername+"' $lt{'asth'}");
+                        alert("'"+foldername+"' $lt{'asth'}");
                         return;
                     }
                 }
@@ -207,7 +204,7 @@ function folder_choice(targetform,caller
         if (newname) {
             for (var i=0; i<allfolders.length; i++) {
                 if (allfolders[i] == newname) {
-                    alert("$lt{'tnfm'} '"+newname+"' $lt{'asth'}");
+                    alert("'"+newname+"' -- $lt{'asth'}");
                     return;
                 }
             }
@@ -236,16 +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>
-    </tr>
-    <tr>
-     <td colspan="4"><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'}.
@@ -266,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;
 }
@@ -383,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})) {
@@ -816,7 +813,8 @@ 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))) {    
         my %content=&Apache::lonmsg::unpackagemsg($what{$key});
         next if ($content{'senderdomain'} eq '');
         my $description;
@@ -1026,6 +1024,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;
 
@@ -1207,7 +1212,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;
@@ -1257,7 +1262,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");
@@ -1665,8 +1670,8 @@ ENDREPSCRIPT
         $r->print(&additional_rec_row(\%lt));
         $r->print('<tr><td colspan="2">'.
                   &mt('Unless you choose otherwise:').'<ul><li>'.
-        &mt("The subject in each forwarded message will be <i>'Forwarding:'</i> followed by the original subject.").'</li><li>'.
-        &mt("The message itself will begin with a first line: <i>'Forwarded message from'</i> followed by the original sender's name.").'</li></ul></td></tr>');
+        &mt("The subject in each forwarded message will be [_1]'Forwarding:'[_2] followed by the original subject.",'<i>','</i>').'</li><li>'.
+        &mt("The message itself will begin with a first line: [_1]'Forwarded message from'[_2] followed by the original sender's name.",'<i>','</i>').'</li></ul></td></tr>');
         $func1='Forward'; # do not translate here!
         $dissub = &mt('Forwarding').': ';
         $subj_size = '10';
@@ -1741,7 +1746,7 @@ ENDBLOCK
 '</pre>
 </p>
 <p>
-'.&mt('The messages will be assembled from all lines with the respective'."\n".'<tt>username:domain</tt>, and appended to the general message text.'));
+'.&mt('The messages will be assembled from all lines with the respective [_1][_2]username:domain[_3], and appended to the general message text.','<br />','<tt>','</tt>'));
         $r->print(<<ENDUPLOAD);
 </p>
 <p>
@@ -1895,7 +1900,7 @@ sub disfacetoface {
 			 $env{'course.'.$env{'request.course.id'}.'.domain'},
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
-    my $result='<div>';
+    my $result='';
     foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
@@ -1927,8 +1932,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 {
@@ -1957,15 +1961,15 @@ $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>');
+    } elsif ($target eq 'tex') {
+        $r->print(&Apache::lonxml::xmlparse($r,$target,$result));
     } else {
-		$r->print(&Apache::lonxml::xmlparse($r, 'tex', $result));
-	}
+        $r->print('<div>'.$result.'</div>');
+    }
 }
 
 sub general_message {
@@ -2166,7 +2170,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'));
@@ -2694,7 +2698,7 @@ sub storedcommentlisting {
        '^'.&escape(&escape($env{'form.showcommentbaseurl'})));
     $r->print(&Apache::loncommon::start_page('Saved Comment Listing',undef,
 					     {'onlybody' => 1}));
-    if ((keys %msgs)[0]=~/^error\:/) {
+    if ((keys(%msgs))[0]=~/^error\:/) {
 	$r->print(&mt('No saved comments yet.'));
     } else {
 	my $found=0;