--- loncom/interface/lonmsgdisplay.pm	2010/08/20 19:12:22	1.124.4.11
+++ loncom/interface/lonmsgdisplay.pm	2009/07/25 23:16:04	1.128
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.124.4.11 2010/08/20 19:12:22 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.128 2009/07/25 23:16:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -146,7 +146,7 @@ sub folderlist {
     );
     $actions{'select_form_order'} = ['view','rename','delete'];
 
-    my %statushash = &Apache::lonlocal::texthash(&get_msgstatus_types());
+    my %statushash = &get_msgstatus_types();
 
     $statushash{'select_form_order'} = ['','new','read','replied','forwarded'];
 
@@ -219,7 +219,8 @@ 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">
@@ -272,13 +273,12 @@ sub get_permanent_folders {
 }
 
 sub get_msgstatus_types {
-    # Don't translate here!
-    my %statushash = (
-        ''          => 'Any',
-        'new'       => 'Unread',
-        'read'      => 'Read',
-        'replied'   => 'Replied to',
-        'forwarded' => 'Forwarded',
+    my %statushash = &Apache::lonlocal::texthash(
+                                '' => '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 = 'All'; # Don't translate here!
+        $status = &mt('All');
     } else {
         $status = $statushash{$msgstatus};
     }
@@ -299,7 +299,7 @@ sub scrollbuttons {
    '<b>'.&mt('Page').'</b>: '. 
    '<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="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$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>';
@@ -509,7 +509,6 @@ sub movemsg {
 sub discourse {
     my ($statushash) = @_;
     my ($result,$active,$previous,$future);
-    my $crstype = &Apache::loncommon::course_type();
     my ($course_personnel,
 	$current_members,
 	$expired_members,
@@ -525,20 +524,14 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1,"selectedusers",1,'email')
        ) {
-        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;
-        }
+       $result .= '<fieldset id="LC_activeusers"><legend>'
+                 .&mt('Bcc: course members with current access')
+                 .'</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",
@@ -546,20 +539,15 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-        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 .= '<fieldset id="LC_previoususers"><legend>'
+                 .&mt('Bcc: course members with expired access')
+                 .'</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",
@@ -567,20 +555,15 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-        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 .= '<fieldset id="LC_futureusers"><legend>'
+                 .&mt('Bcc: course members with future access')
+                 .'</legend>'
+                 .'<form name="previoususers">';
        $result .= $tmptext.'</form></fieldset>';
        if (ref($statushash) eq 'HASH') {
            $statushash->{'future'} = 1;
        }
+
     }
     return $result;
 }
@@ -650,8 +633,9 @@ sub disgroup {
                     if (ref($access_status) eq 'HASH') {
                         $access_status->{$status} = $$numitems{$status};
                     }
-                    $r->print('<fieldset><legend><b>'.$lt{$status}.
-                              '</b></legend><form name="'.$formname.'">'.
+                    $r->print('<fieldset>'.
+                              '<legend>'.$lt{$status}.'</legend>'.
+                              '<form name="'.$formname.'">'.
                               '<span class="LC_nobreak">'.
                               '<input type="button" value="'.&mt('Check All').'" '.
                               'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
@@ -698,7 +682,7 @@ sub disgroup {
 sub group_check_uncheck {
     my $output = qq|
 <script type="text/javascript">
-/ <![CDATA[
+// <![CDATA[
 function toggleAll(form,action) {
     if (typeof(form.selectedusers_forminput.length)=="undefined") {
          if (action == 'check') {
@@ -746,16 +730,10 @@ 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=>$brtitle});
+              title=>"View course groups"});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
@@ -850,11 +828,8 @@ sub discrit {
     }
     # Check to see if there were any messages.
     if ($result eq '') {
-        $result =
-            '<p class="LC_info">'.
-            &mt('You have no critical messages.').
-            '</p>'.
-            '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
+        $result = "<h2>".&mt('You have no critical messages.')."</h2>".
+	    '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
             '<a href="/adm/email">'.&mt('Communicate').'</a>';
     } else {
         $r->print($header);
@@ -1056,22 +1031,19 @@ ENDDISHEADER
     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(&mt('There are no messages in this folder.'));
+	    $r->print('<h2>'.&mt('Empty Folder').'</h2>');
         } elsif ($msgstatus eq 'replied') {
-            $r->print(&mt('You have not replied to any messages in this folder.'));
+            $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');
         } else { 
-            $r->print(&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.'));
+            $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
         }
-        $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);
@@ -1088,44 +1060,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 = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
+	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {
-	$r->print('<a href = "/adm/email?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
+	$r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
     }
     $r->print('<th>');
     if ($env{'form.sortedby'} eq "revuser") {
-	$r->print('<a href = "/adm/email?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
+	$r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
     } else {
-	$r->print('<a href = "/adm/email?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
+	$r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revdomain") {
-	$r->print('<a href = "/adm/email?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
+	$r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
     } else {
-	$r->print('<a href = "/adm/email?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
+	$r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revsubject") {
-	$r->print('<a href = "/adm/email?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
+	$r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
     } else {
-    	$r->print('<a href = "/adm/email?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
+    	$r->print('<a href = "?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revcourse") {
-        $r->print('<a href = "/adm/email?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
     } else {
-        $r->print('<a href = "/adm/email?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revstatus") {
-	$r->print('<a href = "/adm/email?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
+	$r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
     } else {
-     	$r->print('<a href = "/adm/email?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
+     	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
     }
     $r->print("</tr>\n");
 
     my $suffix = &Apache::lonmsg::foldersuffix($folder);
-    my $count = $firstdis;
+    my $count = 0;
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
 	    $description,$recv_name,$recv_domain)= 
@@ -1292,8 +1264,8 @@ sub compout {
         &printheader($r,'/adm/email?compose=multiforward',
              'Forwarding Multiple Messages');
         if ($multiforward > 1) {
-            $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>')
+            $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked'
+                         .' will be forwarded to the recipient(s) you select below.',$multiforward)
                     .'<br />');
         } else {
             $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
@@ -1338,34 +1310,22 @@ 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" /> '.
-		  $rsstxt.'</label><br />';
+		  &mt('Include in course RSS newsfeed').'</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" /> '.
-                       $rectxt.
+                       &mt("Include in course's 'User records' for recipient(s)").
                        '</label><br />';
         }
     }
@@ -1743,7 +1703,7 @@ sub additional_rec_row {
     my $bcc = &mt('Bcc:');
     my $exmpl = &mt('username:domain,username:domain,...'); 
     my $output = <<"ENDADD";
-<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend><b>$lt->{'ad'}</b> <tt>($exmpl)</tt>:</legend><table>
+<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend>$lt->{'ad'} <tt>($exmpl)</tt></legend><table>
 <tr><td>&nbsp;</td><td>$lt->{'to'}</td><td><input type="text" size="50" name="additionalrec_to" /></td></tr>
 <tr><td>&nbsp;</td><td>$cc</td><td><input type="text" size="50" name="additionalrec_cc" /></td></tr> 
 <tr><td>&nbsp;</td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
@@ -1838,9 +1798,7 @@ sub disfacetoface {
     foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
-        if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
-            &Apache::lonfeedback::newline_to_br(\$content{'message'});
-        }
+	&Apache::lonfeedback::newline_to_br(\$content{'message'});
         if ($content{'subject'}=~/^Record/) {
 	    $result.='<h3>'.&mt('Record').'</h3>';
         } elsif ($content{'subject'}=~/^Broadcast/) {
@@ -1929,7 +1887,7 @@ sub facetoface {
     }
     my $crstype = &Apache::loncommon::course_type();
     my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
-                                        : 'faculty and staff';
+                                            : 'faculty and staff';
     &printheader($r,
 		 '/adm/email?recordftf=query',
 		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages");
@@ -1966,7 +1924,6 @@ sub facetoface {
              .&Apache::lonhtmlcommon::end_pick_box()
              .'<br />'
              .'<input type="submit" value="'.$lt{'subm'}.'" />'
-             .'</form>'
     );
 
     if (($stage ne 'query') &&
@@ -2016,18 +1973,12 @@ sub examblock {
 	$r->print('Not allowed');
 	return;
     }
-    my $usertype;
-    my $crstype = &Apache::loncommon::course_type();
-    if ($crstype eq 'Community') {
-        $usertype = 'members';
-    } else {
-	$usertype = 'students';
-    }
-    my $lctype = lc($crstype);
+    my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members'
+	                                                              : 'students';
     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 $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.",
+            '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.",
              'mecb' => 'Modify existing communication blocking periods',
              'ncbc' => 'No communication blocks currently saved',
              'stor' => 'Save',
@@ -2204,7 +2155,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}))) {
@@ -2224,7 +2175,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>
@@ -2234,16 +2185,11 @@ END
             if ($blocks->{$block} eq 'on') {
                 $blockstatus = 'checked="checked"';
             }
-            $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label></span><br />');
+            $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
         }
         $r->print(<<"END");
-        </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>
+        </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>
 END
         $r->print(&Apache::loncommon::end_data_table_row());
         $parmcount++;
@@ -2280,7 +2226,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());
@@ -2290,13 +2236,11 @@ END
      <td>
 END
     foreach my $block (@{$typeorder}) {
-        $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label></span><br />');
+        $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');
      }
      $r->print(<<"END");
-     </td>
-     <td><span class="LC_nobreak"><label>
-     <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
-     </label></span></td>
+     </td> 
+     <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
 END
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
@@ -2332,7 +2276,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.'));
-        $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,\%setters));
+        &build_block_table($r,$startblock,$endblock,\%setters);
         return;
     }
     if ($msgstatus eq '') {
@@ -2369,10 +2313,6 @@ 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'}) {
@@ -2402,20 +2342,6 @@ sub displaymessage {
                           .&mt('Next')
                           .'</a>');
     }
-# Print functions
-    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">'
-             .'<fieldset>'
-             .'<legend>'
-             .$legendtext
-             .'</legend>'
-             .$showfunctionlist
-             .'</fieldset>'
-             .'</div>'
-    );
 
 # Prepare available actions
     my $symb;
@@ -2424,8 +2350,8 @@ sub displaymessage {
     } elsif (defined($content{'baseurl'})) {
         $symb=&Apache::lonnet::symbread($content{'baseurl'});
     }
-    if ($env{'user.adv'}) {
         my @actionlist;
+    if ($env{'user.adv'}) {
 
 	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
 		push(@actionlist,&Apache::loncommon::track_student_link(
@@ -2450,23 +2376,31 @@ sub displaymessage {
                                      ,$symb
                                      ,'check'));
 	}
+    }
+
+# Print functionlist and actionlist in page header
+        my $functions='<div class="LC_columnSection">';
+
+        # Functionlist
+        $functions.=&Apache::lonhtmlcommon::start_funclist();
+        foreach my $item (@functionlist) {
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
+        }
+        $functions .= &Apache::lonhtmlcommon::end_funclist();
 
-# Print actions
+        # Actionlist
         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">'
-                     .'<fieldset>'
-                     .'<legend>'
-                     .$legendtext
-                     .'</legend>'
-                     .$showactionlist
-                     .'</fieldset>'
-                     .'</div>'
-            );
+            my $legendtext=&mt('Currently available actions (will open extra window)');
+            $functions.=&Apache::lonhtmlcommon::start_funclist($legendtext);
+            foreach my $item (@actionlist) {
+                $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
+            }
+            $functions.=&Apache::lonhtmlcommon::end_funclist();
         }
-    }
+
+        $functions.='</div>';
+        $r->print(&Apache::loncommon::head_subbox($functions));
+
 
     my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients);
     if ($content{'recipid'}) {
@@ -2894,10 +2828,10 @@ sub header {
     if ($baseurl) {
 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
-    $r->print(&Apache::loncommon::start_page('Messages',
+    $r->print(&Apache::loncommon::start_page('Communication',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
-     		(($title?$title:'Send and display messages')));
+     		(($title?$title:'Send and Receive Messages')));
 }
 
 # ---------------------------------------------------------------- Print header
@@ -3150,7 +3084,7 @@ sub sendoffmail {
 	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
             if ($toaddr{$address}) {
-	        $msgtxt.="\n".'<hr />'."\n".$toaddr{$address};
+	        $msgtxt.='<hr />'.$toaddr{$address};
             }
 	    my @thismsg;
 	    if ($msgtype eq 'critical') {
@@ -3257,9 +3191,8 @@ sub sendoffmail {
         }
         if (!$env{'form.multiforward'}) { 
             if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Completed.'));
-                $message = &Apache::loncommon::confirmwrapper($message);
-                $r->print($message);
+	        $r->print('<br /><span class="LC_success">'.&mt('Completed.').
+                          '</span>');
 	        if ($env{'form.displayedcrit'}) {
 	            &discrit($r);
                 }
@@ -3269,15 +3202,10 @@ sub sendoffmail {
 	            &Apache::loncommunicate::menu($r);
 	        }
             } else {
-                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);
+	        $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>');
             }
         }
-    } else {
-        &printheader($r,'','Messages cancelled.');
-        return 'cancelled';
     }
     return $sendstatus;
 }
@@ -3313,7 +3241,7 @@ sub handler {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/communicate",
-          text=>"Messages",
+          text=>"Communication/Messages",
           faq=>12,bug=>'Communication Tools',});
 
 # ------------------------------------------------------------------ Get Folder
@@ -3394,10 +3322,9 @@ sub handler {
 	my ($result,$msg) = 
 	    &statuschange($env{'form.markdel'},'deleted',$folder);
 	if (!$result) {
-            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);
+	    $r->print('<p class="LC_error">'.
+		      &mt('Failed to delete the message.').'</p>'.
+		      '<p class="LC_error">'.$msg."</p>\n");
 	}
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3419,9 +3346,7 @@ sub handler {
             $total ++;
         }
         &printheader($r,'','Marked Messages Read');
-        my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] read',$total));
-        $message = &Apache::loncommon::confirmwrapper($message);
-        $r->print($message);
+        $r->print(&mt('Marked [_1] message(s) read',$total).'<p>');
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedunread') {
@@ -3432,9 +3357,7 @@ sub handler {
             $total ++;
         }
         &printheader($r,'','Marked Messages Unread');
-        my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Marked [quant,_1,message] unread',$total));
-        $message = &Apache::loncommon::confirmwrapper($message);
-        $r->print($message);
+        $r->print(&mt('Marked [_1] message(s) unread',$total).'<p>');
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedmove') {
@@ -3457,16 +3380,15 @@ sub handler {
 		    push(@failed_msg,$msg);
 	        }
 	    }
-            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);
+	    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>');
         }
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3484,16 +3406,15 @@ sub handler {
 	    }
 	}
 	&printheader($r,'','Deleted Messages');
-        my $message;
 	if ($failed) {
-            $message = &Apache::lonhtmlcommon::confirm_success(&mt('Failed to delete [quant,_1,message]',$failed),1);
-            $message .= '<p class="LC_error">'.
+	    $r->print('<p class="LC_error">
+                          '.&mt('Failed to delete [_1] message(s)',$failed).
+		      '</p>');
+	    $r->print('<p class="LC_error">'.
 		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
-		      "</p>\n";
+		      "</p>\n");
 	}
-        $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Deleted [quant,_1,message]',$total));
-        $message = &Apache::loncommon::confirmwrapper($message);
-        $r->print($message);
+	$r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markunread'}) {
@@ -3549,19 +3470,19 @@ sub handler {
             }
             if (keys(%forwardok) > 0) {
                 my $count = keys(%forwardok);
-                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('[quant,_1,message] forwarded.',$count));
-                $message = &Apache::loncommon::confirmwrapper($message);
-                $r->print($message);
+                $r->print('<br /><span class="LC_success">'.
+                          &mt('[quant,_1,message] forwarded.',$count).
+                          '</span>');
             }
             if (keys(%forwardfail) > 0) {
                 my $count = keys(%forwardfail);
-                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
+                $r->print('<p><span class="LC_error">'.
+                          &mt('Could not forward [quant,_1,message].',$count).
+                          '</span> ');
                 foreach my $key (keys(%forwardfail)) {
-                    $message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.
-                                &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
+                    $r->print(&mt('Could not deliver forwarded message.').'</span> '.
+                              &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.').<br /><br />');
                 }
-                $message = &Apache::loncommon::confirmwrapper($message);
-                $r->print($message);
             }
             &Apache::loncommunicate::menu($r);
         } else {
@@ -3585,13 +3506,10 @@ sub handler {
         my $showfolder = $env{'form.newfolder'};
 	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
         if ($makeresult eq 'ok') {
-            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" created.',$showfolder));
-            $message = &Apache::loncommon::confirmwrapper($message);
-            $r->print($message);
+            $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
         } else {
-            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Creation failed.').' '.$makeresult.'<br />'.$warning,1);
-            $message = &Apache::loncommon::confirmwrapper($message);
-            $r->print($message);
+            $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
+                      $warning);
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
@@ -3603,14 +3521,10 @@ sub handler {
         my $showfolder = '';
         my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {
-            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" deleted.',$folder));
-            $message = &Apache::loncommon::confirmwrapper($message);
-            $r->print($message);
+            $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
             $env{'form.folder'} = '';
         } else {
-            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Deletion failed.').' '.$delresult,1);
-            $message = &Apache::loncommon::confirmwrapper($message);
-            $r->print($message);
+            $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
@@ -3620,13 +3534,9 @@ sub handler {
         my $showfolder = $env{'form.renamed'};
         my $renresult = &renamefolder($folder);
         if ($renresult eq 'ok') {
-            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder));
-            $message = &Apache::loncommon::confirmwrapper($message);
-            $r->print($message);
+            $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
         } else {
-            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Renaming failed.').' '.$renresult,1);
-            $message = &Apache::loncommon::confirmwrapper($message);
-            $r->print($message);
+            $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);