--- loncom/interface/lonmsgdisplay.pm	2009/05/11 16:51:27	1.124
+++ loncom/interface/lonmsgdisplay.pm	2010/02/15 03:37:59	1.124.4.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.124 2009/05/11 16:51:27 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.9 2010/02/15 03:37:59 raeburn 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'];
 
@@ -173,6 +173,7 @@ sub folderlist {
 
     $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
     my $output = qq|<script type="text/javascript">
+// <![CDATA[
 function folder_choice(targetform,caller) {
     var permfolders_keys = new Array('$permlistkeys');
     var permfolders_vals = new Array('$permlistvals');
@@ -214,11 +215,11 @@ 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">
@@ -239,7 +240,7 @@ function folder_choice(targetform,caller
      <td align="center"><b>'.$lt{'actn'}.'</b><br />'.
          &Apache::loncommon::select_form('view','folderaction',%actions).'
      </td><td><br />'.
-    '<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" />
+    '<input type="button" value="'.$lt{'go'}.'" onclick="javascript:folder_choice(this.form,'."'change'".');" />
      </td>
     </tr>
    </table>
@@ -247,7 +248,7 @@ function folder_choice(targetform,caller
   <td align="right">
    <table><tr><td><br />
     <input type="button" value="'.&mt('New Folder').
-    '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
+    '" onclick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
     '<td align="center"><b>'.&mt('Name').'</b><br />'.
     '<input type="text" size="15" name="newfolder" value="" />
     </td></tr></table>
@@ -271,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;
 }
@@ -289,17 +291,17 @@ 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};
     }
     return
    '<b>'.&mt('Page').'</b>: '. 
-   '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
-   '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
-   '<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
-   '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
-   '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
+   '<input type="submit" name="firstview" value="|&lt;" />'.
+   '<input type="submit" name="prevview" value="&lt;" />'.
+   '<input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> of '.$maxdis.
+   '<input type="submit" name="nextview" value="&gt;" />'.
+   '<input type="submit" name="lastview" value="&gt;|" /><br />'.
    &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
 }
 # =============================================================== Status Change
@@ -507,6 +509,7 @@ sub movemsg {
 sub discourse {
     my ($statushash) = @_;
     my ($result,$active,$previous,$future);
+    my $crstype = &Apache::loncommon::course_type();
     my ($course_personnel,
 	$current_members,
 	$expired_members,
@@ -522,11 +525,20 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1,"selectedusers",1,'email')
        ) {
-       $result .= '<fieldset id="LC_activeusers"><legend><b>'.&mt('Bcc: course members with current access').'</b></legend><form name="activeusers">';
-       $result .= $tmptext.'</form></fieldset><br />';
-       if (ref($statushash) eq 'HASH') {
-           $statushash->{'active'} = 1;
-       }
+        my $bcc_curr_hdr;
+        if ($crstype eq 'Community') {
+            $bcc_curr_hdr = &mt('Bcc: community participants with current access');
+        } else {
+            $bcc_curr_hdr = &mt('Bcc: course members with current access');
+        }
+        $result .= '<fieldset id="LC_activeusers"><legend>'
+                   .'<b>'.$bcc_curr_hdr.'</b>'
+                   .'</legend>'
+                   .'<form name="activeusers">';
+        $result .= $tmptext.'</form></fieldset><br />';
+        if (ref($statushash) eq 'HASH') {
+            $statushash->{'active'} = 1;
+        }
     }
     if ($tmptext = &Apache::lonselstudent::render_student_list($expired_members,
                                                                "previoususers",
@@ -534,12 +546,20 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-       $result .= '<fieldset id="LC_previoususers"><legend><b>'.&mt('Bcc: course members with expired access').'</b></legend><form name="previoususers">';
+        my $bcc_prev_hdr;
+        if ($crstype eq 'Community') {
+            $bcc_prev_hdr = &mt('Bcc: community participants with expired access');
+        } else {
+            $bcc_prev_hdr = &mt('Bcc: course members with expired access');
+        }
+        $result .= '<fieldset id="LC_previoususers"><legend>'
+                   .'<b>'.$bcc_prev_hdr.'</b>'
+                   .'</legend>'
+                   .'<form name="previoususers">';
        $result .= $tmptext.'</form></fieldset><br />';
        if (ref($statushash) eq 'HASH') {
            $statushash->{'previous'} = 1;
        }
-
     }
     if ($tmptext = &Apache::lonselstudent::render_student_list($future_members,
                                                                "futureusers",
@@ -547,12 +567,20 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-       $result .= '<fieldset id="LC_futureusers"><legend><b>'.&mt('Bcc: course members with future access').'</b></legend><form name="previoususers">';
+        my $bcc_future_hdr;
+        if ($crstype eq 'Community') {
+            $bcc_future_hdr = &mt('Bcc: community participants with future access');
+        } else {
+            $bcc_future_hdr = &mt('Bcc: course members with future access');
+        }
+        $result .= '<fieldset id="LC_futureusers"><legend>'
+                   .'<b>'.$bcc_future_hdr.'</b>'
+                   .'</legend>'
+                   .'<form name="futureusers">';
        $result .= $tmptext.'</form></fieldset>';
        if (ref($statushash) eq 'HASH') {
            $statushash->{'future'} = 1;
        }
-
     }
     return $result;
 }
@@ -670,6 +698,7 @@ sub disgroup {
 sub group_check_uncheck {
     my $output = qq|
 <script type="text/javascript">
+/ <![CDATA[
 function toggleAll(form,action) {
     if (typeof(form.selectedusers_forminput.length)=="undefined") {
          if (action == 'check') {
@@ -687,6 +716,7 @@ function toggleAll(form,action) {
         }
     }
 }
+// ]]>
 </script>
     |;
 }
@@ -716,10 +746,16 @@ sub groupmail_header {
     }
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     if ($refarg) {
+        my $brtitle;
+        if (&Apache::loncommon::course_type() eq 'Community') {
+            $brtitle = 'View community groups';  
+        } else {
+            $brtitle = 'View course groups';
+        }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"/adm/coursegroups",
               text=>"Groups",
-              title=>"View course groups"});
+              title=>$brtitle});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
@@ -814,8 +850,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);
@@ -981,6 +1020,7 @@ sub disfolder {
     my $jscript = &Apache::loncommon::check_uncheck_jscript();
     $r->print(<<ENDDISHEADER);
 <script type="text/javascript">
+// <![CDATA[
     $jscript
 
     function validate_checkedaction() {
@@ -1009,26 +1049,29 @@ sub disfolder {
         }
         document.disall.submit();
     }
-
+// ]]>
 </script>
 ENDDISHEADER
 
-    my $fsqs='&folder='.$folder;
+    my $fsqs='&amp;folder='.$folder;
     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>');
+            $r->print(&mt('You have not replied to any messages in this folder.'));
         } else { 
-            $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
+            $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);
@@ -1045,44 +1088,44 @@ ENDDISHEADER
     $r->print('<form method="post" name="disall" action="/adm/email">'.
 	      '<table class="LC_mail_list"><tr><th colspan="1">&nbsp;</th><th>');
     if ($env{'form.sortedby'} eq "revdate") {
-	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {
-	$r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
     }
     $r->print('<th>');
     if ($env{'form.sortedby'} eq "revuser") {
-	$r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
     } else {
-	$r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revdomain") {
-	$r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
     } else {
-	$r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revsubject") {
-	$r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
+	$r->print('<a href = "/adm/email?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
     } else {
-    	$r->print('<a href = "?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
+    	$r->print('<a href = "/adm/email?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revcourse") {
-        $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "/adm/email?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
     } else {
-        $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "/adm/email?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revstatus") {
-	$r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
+	$r->print('<a href = "/adm/email?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
     } else {
-     	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
+     	$r->print('<a href = "/adm/email?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
     }
     $r->print("</tr>\n");
 
     my $suffix = &Apache::lonmsg::foldersuffix($folder);
-    my $count = 0;
+    my $count = $firstdis;
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
 	    $description,$recv_name,$recv_domain)= 
@@ -1127,7 +1170,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>':'').'</td>');
+                          $item.(($status eq 'new')?'</b>':'').'</a></td>');
             }
             my $showstatus;
             my %statushash = &get_msgstatus_types();
@@ -1249,8 +1292,8 @@ sub compout {
         &printheader($r,'/adm/email?compose=multiforward',
              'Forwarding Multiple Messages');
         if ($multiforward > 1) {
-            $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked'
-                         .' will be forwarded to the recipient(s) you select below.',$multiforward)
+            $r->print(&mt('Each of the[_1] [quant,_2,message] [_3]you checked'
+                         .' will be forwarded to the recipient(s) you select below.','<b>',$multiforward,'</b>')
                     .'<br />');
         } else {
             $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
@@ -1295,22 +1338,34 @@ sub compout {
     if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 				    '/'.$env{'request.course.sec'})) {
+         my $crstype = &Apache::loncommon::course_type();
 	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
+         my $rsstxt;
+         if (&Apache::loncommon::course_type() eq 'Community') {
+             $rsstxt = &mt('Include in community RSS newsfeed');
+         } else {
+             $rsstxt = &mt('Include in course RSS newsfeed');
+         }
          $dispcrit=
  '<span class="LC_nobreak"><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'.</label>'.$crithelp.'&nbsp;&nbsp;'.&mt('Require return receipt?').'<label><input type="radio" name="sendbck" value="1" />'.&mt('Yes').'</label>&nbsp;&nbsp;<label><input type="radio" name="sendbck" value="" checked="checked" />'.&mt('No').'</label></span><br />'.
  '<label><input type="checkbox" name="permanent" /> '.
 &mt('Send copy to permanent e-mail address (if known)').'</label><br />'.
 '<label><input type="checkbox" name="rsspost" /> '.
-		  &mt('Include in course RSS newsfeed').'</label><br />';
+		  $rsstxt.'</label><br />';
     }
     if ($broadcast ne 'group') {
         if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
             &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
                                      '/'.$env{'request.course.sec'})) {
-
+            my $rectxt;
+            if (&Apache::loncommon::course_type() eq 'Community') {
+                $rectxt = &mt("Include in community's 'User records' for recipient(s)");
+            } else {
+                $rectxt = &mt("Include in course's 'User records' for recipient(s)");
+            }
             $dispcrit.='<label>'.
                        '<input type="checkbox" name="courserecord" value="1" /> '.
-                       &mt("Include in course's 'User records' for recipient(s)").
+                       $rectxt.
                        '</label><br />';
         }
     }
@@ -1346,6 +1401,7 @@ sub compout {
             $sendmode = '<input type="hidden" name="sendmode" value="group" />'."\n";
             $broadcast_js = qq|
 <script type="text/javascript">
+// <![CDATA[
 function courseRecipients() {
 |;
         foreach my $type (keys(%access_status)) {
@@ -1372,6 +1428,7 @@ function courseRecipients() {
         $broadcast_js .= qq|
     return;
 }
+// ]]>
 </script>
 
 |;
@@ -1415,7 +1472,9 @@ function courseRecipients() {
         my $jscript = &Apache::loncommon::check_uncheck_jscript();
         $r->print(<<"ENDREPSCRIPT");
 <script type="text/javascript">
+// <![CDATA[
 $jscript
+// ]]>
 </script>
 ENDREPSCRIPT
     }
@@ -1779,7 +1838,9 @@ sub disfacetoface {
     foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
-	&Apache::lonfeedback::newline_to_br(\$content{'message'});
+        if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
+            &Apache::lonfeedback::newline_to_br(\$content{'message'});
+        }
         if ($content{'subject'}=~/^Record/) {
 	    $result.='<h3>'.&mt('Record').'</h3>';
         } elsif ($content{'subject'}=~/^Broadcast/) {
@@ -1867,7 +1928,7 @@ sub facetoface {
 	return;
     }
     my $crstype = &Apache::loncommon::course_type();
-    my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
+    my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
                                         : 'faculty and staff';
     &printheader($r,
 		 '/adm/email?recordftf=query',
@@ -1954,12 +2015,18 @@ sub examblock {
 	$r->print('Not allowed');
 	return;
     }
-    my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
-	                                                          : 'students';
+    my $usertype;
+    my $crstype = &Apache::loncommon::course_type();
+    if ($crstype eq 'Community') {
+        $usertype = 'members';
+    } else {
+	$usertype = 'students';
+    }
+    my $lctype = lc($crstype);
     my %lt=&Apache::lonlocal::texthash(
             'comb' => 'Communication Blocking',
             'cbds' => 'Communication blocking during scheduled exams',
-            'desc' => "You can use communication blocking to prevent $usertype enrolled in this course from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
+            'desc' => "You can use communication blocking to prevent $usertype enrolled in this $lctype from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course or community, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
              'mecb' => 'Modify existing communication blocking periods',
              'ncbc' => 'No communication blocks currently saved',
              'stor' => 'Save',
@@ -2136,7 +2203,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}))) {
@@ -2156,7 +2223,7 @@ END
                            $setuname,$setudom);
         $r->print(&Apache::loncommon::start_data_table_row());
         $r->print(<<"END");
-        <td>$ltext->{'star'}:&nbsp;$startform<br/>$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
+        <td>$ltext->{'star'}:&nbsp;$startform<br />$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
         <td>$settername</td>
         <td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$record" /></td>
         <td>
@@ -2166,11 +2233,16 @@ END
             if ($blocks->{$block} eq 'on') {
                 $blockstatus = 'checked="checked"';
             }
-            $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
+            $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label></span><br />');
         }
         $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>
+        <td><span class="LC_nobreak"><label>
+        <input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
+        </label></span><br /><span class="LC_nobreak">
+        <label>
+        <input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
+        </label></span>
 END
         $r->print(&Apache::loncommon::end_data_table_row());
         $parmcount++;
@@ -2207,7 +2279,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());
@@ -2217,11 +2289,13 @@ END
      <td>
 END
     foreach my $block (@{$typeorder}) {
-        $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');
+        $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label></span><br />');
      }
      $r->print(<<"END");
-     </td> 
-     <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
+     </td>
+     <td><span class="LC_nobreak"><label>
+     <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
+     </label></span></td>
 END
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
@@ -2257,7 +2331,7 @@ sub displaymessage {
     if ( $blocked{$msgid} eq 'ON' ) {
         &printheader($r,'/adm/email',&mt('Display a Message'));
         $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
-        &build_block_table($r,$startblock,$endblock,\%setters);
+        $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,\%setters));
         return;
     }
     if ($msgstatus eq '') {
@@ -2294,6 +2368,10 @@ sub displaymessage {
     &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
     my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
 
+# Functions and Actions
+    my $li_start='<span class="LC_nobreak">&bull; ';
+    my $li_end='</span> ';
+
 # Prepare available functions
     my @functionlist;
     if (!$content{'noreplies'}) {
@@ -2327,13 +2405,14 @@ sub displaymessage {
     my $legendtext='<span class="LC_mail_functions">'
                    .&mt('Functions')
                    .'</span>';
+    my $showfunctionlist = $li_start.join($li_end.$li_start,@functionlist).$li_end;
     $r->print('<div class="LC_left_float">'
-                     .&Apache::lontemplate::start_functionslist($legendtext)
-    );
-    foreach my $item (@functionlist) {
-        $r->print(&Apache::lontemplate::item_functionslist($item));
-    }
-    $r->print(&Apache::lontemplate::end_functionslist()
+             .'<fieldset>'
+             .'<legend>'
+             .$legendtext
+             .'</legend>'
+             .$showfunctionlist
+             .'</fieldset>'
              .'</div>'
     );
 
@@ -2373,15 +2452,16 @@ sub displaymessage {
 
 # Print actions
         if (@actionlist) {
+            my $showactionlist = $li_start.join($li_end.$li_start,@actionlist).$li_end;
             $legendtext=&mt('[_1]Currently available actions[_2] (will open extra window):'
                            ,'<span class="LC_mail_functions">','</span>');
             $r->print('<div class="LC_left_float">'
-                     .&Apache::lontemplate::start_functionslist($legendtext)
-            );
-            foreach my $item (@actionlist) {
-                $r->print(&Apache::lontemplate::item_functionslist($item));
-            }
-            $r->print(&Apache::lontemplate::end_functionslist()
+                     .'<fieldset>'
+                     .'<legend>'
+                     .$legendtext
+                     .'</legend>'
+                     .$showactionlist
+                     .'</fieldset>'
                      .'</div>'
             );
         }
@@ -2732,6 +2812,7 @@ sub recipients_link {
             $body =~ s{\n}{}g;
             $r->print(<<ENDJS);
 <script type="text/javascript">
+// <![CDATA[
 function showBroadcastList() {
     var caller = this;
     var newWindow = null;
@@ -2754,7 +2835,7 @@ function writeWin(caller) {
     caller.document.close();
     caller.focus();
 }
-
+// ]]>
 </script>
 
 ENDJS
@@ -2812,10 +2893,10 @@ sub header {
     if ($baseurl) {
 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
-    $r->print(&Apache::loncommon::start_page('Communication',
+    $r->print(&Apache::loncommon::start_page('Messages',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
-     		(($title?$title:'Send and Receive Messages')));
+     		(($title?$title:'Send and display messages')));
 }
 
 # ---------------------------------------------------------------- Print header
@@ -3175,8 +3256,9 @@ sub sendoffmail {
         }
         if (!$env{'form.multiforward'}) { 
             if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	        $r->print('<br /><span class="LC_success">'.&mt('Completed.').
-                          '</span>');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Completed.'));
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
 	        if ($env{'form.displayedcrit'}) {
 	            &discrit($r);
                 }
@@ -3186,8 +3268,10 @@ sub sendoffmail {
 	            &Apache::loncommunicate::menu($r);
 	        }
             } else {
-	        $r->print('<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1).'<br /> '.
-		          &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'</p>');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1);
+                $message .= '<br />'.&mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus);
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
             }
         }
     }
@@ -3213,7 +3297,7 @@ sub handler {
          'recordftf','sortedby','block','folder','startdis','interdis',
 	 'showcommentbaseurl','dismode','group','subject','text','ref',
          'msgstatus']);
-    $sqs='&sortedby='.$env{'form.sortedby'};
+    $sqs='&amp;sortedby='.$env{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email
     unless ($env{'form.block'}) {
@@ -3225,7 +3309,7 @@ sub handler {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/communicate",
-          text=>"Communication/Messages",
+          text=>"Messages",
           faq=>12,bug=>'Communication Tools',});
 
 # ------------------------------------------------------------------ Get Folder
@@ -3234,7 +3318,7 @@ sub handler {
     unless ($folder) { 
 	$folder=''; 
     } else {
-	$sqs.='&folder='.&escape($folder);
+	$sqs.='&amp;folder='.&escape($folder);
     }
 # ------------------------------------------------------------ Get Display Mode
 
@@ -3266,7 +3350,7 @@ sub handler {
 	$startdis++;
     }
     my $postedstartdis=$startdis+1;
-    $sqs.='&startdis='.$postedstartdis;
+    $sqs.='&amp;startdis='.$postedstartdis;
 
 # --------------------------------------------------------------- Render Output
 
@@ -3306,9 +3390,10 @@ sub handler {
 	my ($result,$msg) = 
 	    &statuschange($env{'form.markdel'},'deleted',$folder);
 	if (!$result) {
-	    $r->print('<p class="LC_error">'.
-		      &mt('Failed to delete the message.').'</p>'.
-		      '<p class="LC_error">'.$msg."</p>\n");
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete the message.'),1);
+            $message .= '<p class="LC_error">'.$msg.'</p>';
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
 	}
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3330,7 +3415,9 @@ sub handler {
             $total ++;
         }
         &printheader($r,'','Marked Messages Read');
-        $r->print(&mt('Marked [_1] message(s) read',$total).'<p>');
+        my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] read',$total));
+        $message = &Apache::loncommon::confirmwrapper($message);
+        $r->print($message);
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedunread') {
@@ -3341,7 +3428,9 @@ sub handler {
             $total ++;
         }
         &printheader($r,'','Marked Messages Unread');
-        $r->print(&mt('Marked [_1] message(s) unread',$total).'<p>');
+        my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] unread',$total));
+        $message = &Apache::loncommon::confirmwrapper($message);
+        $r->print($message);
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedmove') {
@@ -3364,15 +3453,16 @@ sub handler {
 		    push(@failed_msg,$msg);
 	        }
 	    }
-	    if ($failed) {
-	        $r->print('<p class="LC_error">
-                          '.&mt('Failed to move [_1] message(s)',$failed).
-		      '</p>');
-	        $r->print('<p class="LC_error">'.
-	   	          join("</p>\n<p class=\"LC_error\">",@failed_msg).
-		          "</p>\n");
-	    }
-	    $r->print(&mt('Moved [_1] message(s)',$total).'<p>');
+            my $message;
+            if ($failed) {
+                $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to move [quant,_1,message]',$failed),1);
+                $message .= '<p class="LC_error">'.
+		            join("</p>\n<p class=\"LC_error\">",@failed_msg).
+		            "</p>\n";
+            }
+            $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Moved [quant,_1,message]',$total));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         }
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3390,15 +3480,16 @@ sub handler {
 	    }
 	}
 	&printheader($r,'','Deleted Messages');
+        my $message;
 	if ($failed) {
-	    $r->print('<p class="LC_error">
-                          '.&mt('Failed to delete [_1] message(s)',$failed).
-		      '</p>');
-	    $r->print('<p class="LC_error">'.
+            $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1);
+            $message .= '<p class="LC_error">'.
 		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
-		      "</p>\n");
+		      "</p>\n";
 	}
-	$r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
+        $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total));
+        $message = &Apache::loncommon::confirmwrapper($message);
+        $r->print($message);
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markunread'}) {
@@ -3454,19 +3545,19 @@ sub handler {
             }
             if (keys(%forwardok) > 0) {
                 my $count = keys(%forwardok);
-                $r->print('<br /><span class="LC_success">'.
-                          &mt('[quant,_1,message] forwarded.',$count).
-                          '</span>');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('[quant,_1,message] forwarded.',$count));
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
             }
             if (keys(%forwardfail) > 0) {
                 my $count = keys(%forwardfail);
-                $r->print('<p><span class="LC_error">'.
-                          &mt('Could not forward [quant,_1,message].',$count).
-                          '</span> ');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
                 foreach my $key (keys(%forwardfail)) {
-                    $r->print(&mt('Could not deliver forwarded message.').'</span> '.
-                              &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.').<br /><br />');
+                    $message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.
+                                &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
                 }
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
             }
             &Apache::loncommunicate::menu($r);
         } else {
@@ -3490,10 +3581,13 @@ sub handler {
         my $showfolder = $env{'form.newfolder'};
 	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
         if ($makeresult eq 'ok') {
-            $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" created.',$showfolder));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         } else {
-            $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
-                      $warning);
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Creation failed.').' '.$makeresult.'<br />'.$warning,1);
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
@@ -3505,10 +3599,14 @@ sub handler {
         my $showfolder = '';
         my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {
-            $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" deleted.',$folder));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
             $env{'form.folder'} = '';
         } else {
-            $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Deletion failed.').' '.$delresult,1);
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
@@ -3518,9 +3616,13 @@ sub handler {
         my $showfolder = $env{'form.renamed'};
         my $renresult = &renamefolder($folder);
         if ($renresult eq 'ok') {
-            $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         } else {
-            $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Renaming failed.').' '.$renresult,1);
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);