--- loncom/interface/lonmsgdisplay.pm	2008/11/04 06:22:53	1.95
+++ loncom/interface/lonmsgdisplay.pm	2009/01/06 21:38:43	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.95 2008/11/04 06:22:53 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.108 2009/01/06 21:38:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -243,9 +243,9 @@ function folder_choice(targetform,caller
   </td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
   <td align="right">
    <table><tr><td><br />
-    <input type="button" value="'.&mt('Make New Folder').
+    <input type="button" value="'.&mt('New Folder').
     '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
-    '<td align="center"><b>'.&mt('New Folder').'</b><br />'.
+    '<td align="center"><b>'.&mt('Name').'</b><br />'.
     '<input type="text" size="15" name="newfolder" value="" />
     </td></tr></table>
   </td>
@@ -353,7 +353,7 @@ sub makefolder {
         }
     } else {
         $outcome = 
-	    &mt('Error - could not obtain lock on email folders record.');
+	    &mt('Error - could not obtain lock on message folders record.');
     }
     return ($outcome,$warning);
 }
@@ -555,16 +555,16 @@ sub discourse {
 }
 
 sub disgroup {
-    my ($cdom,$cnum,$group,$access_status) = @_;
-    my $result;
+    my ($r,$cdom,$cnum,$group,$access_status) = @_;
+    my $hasfloat;
     #  Needs to be in a course
     if (!($env{'request.course.fn'})) {
-        $result = &mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.');
-        return $result;
+        $r->print('<span class="LC_error">'.&mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.').'</span>');
+        return;
     }
     if ($cdom eq '' || $cnum eq '') {
-        $result = &mt('Error: could not determine domain or number of course');
-        return $result;
+        $r->print('<span class="LC_error">'.&mt('Error: could not determine domain or number of course').'</span>');
+        return;
     }
     my ($memberinfo,$numitems) =
                  &Apache::longroup::group_memberlist($cdom,$cnum,$group,{},[]);
@@ -577,10 +577,13 @@ sub disgroup {
         push(@statustypes,('future','previous'));
     }
     if (keys(%{$memberinfo}) == 0) {
-        $result = &mt('As this group has no members, there are no '.
-                      'recipients to select.');
-        return $result;
+        $r->print('<span class="LC_warning">'.
+                  &mt('As this group has no members, there are no recipients to select').
+                  '</span>');
+        return;
     } else {
+        $hasfloat = 1;
+        $r->print('<div class="LC_left_float">');
         my %Sortby = (
                          active   => {},
                          previous => {},
@@ -606,7 +609,7 @@ sub disgroup {
                 push(@{$Sortby{$status}{$$memberinfo{$user}{fullname}}},$user);
             }
         }
-        $result .= &group_check_uncheck();
+        $r->print(&group_check_uncheck());
         foreach my $status (@statustypes)  {
             if (ref($numitems) eq 'HASH') {
                 if ((defined($$numitems{$status})) && ($$numitems{$status})) {
@@ -614,46 +617,46 @@ sub disgroup {
                     if (ref($access_status) eq 'HASH') {
                         $access_status->{$status} = $$numitems{$status};
                     }
-                    $result.='<fieldset><legend><b>'.$lt{$status}.
-                             '</b></legend><form name="'.$formname.'">'.
-                             '<span class="LC_nobreak">'.
-                             '<input type="button" value="'.&mt('Check All').'" '.
-                             'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
-                             '&nbsp;&nbsp;'.
-                             '<input type="button" value="'.&mt('Uncheck All').'" '.
-                             'onclick="javascript:toggleAll('."this.form,'uncheck'".')" />'.
-                             '</span>';
+                    $r->print('<fieldset><legend><b>'.$lt{$status}.
+                              '</b></legend><form name="'.$formname.'">'.
+                              '<span class="LC_nobreak">'.
+                              '<input type="button" value="'.&mt('Check All').'" '.
+                              'onclick="javascript:toggleAll('."this.form,'check'".')" />'.
+                              '&nbsp;&nbsp;'.
+                              '<input type="button" value="'.&mt('Uncheck All').'" '.
+                              'onclick="javascript:toggleAll('."this.form,'uncheck'".')" />'.
+                              '</span>');
                     if ($status eq 'active') {
-                        $result .= '&nbsp;&nbsp;&nbsp;<select name="groupmail">'.
-                                   '<option value="bcc" selected="selected">'.&mt('Bcc').'</option>'.
-                                   '<option value="cc">'.&mt('Cc').'</option>'.
-                               '</select>';
+                        $r->print(('&nbsp;'x3).'<select name="groupmail">'.
+                                 '<option value="bcc" selected="selected">'.&mt('Bcc').'</option>'.
+                                 '<option value="cc">'.&mt('Cc').'</option>'.
+                               '</select>');
                     }
-                    $result .= '<br />'.&Apache::loncommon::start_data_table().
+                    $r->print('<br />'.&Apache::loncommon::start_data_table().
                                &Apache::loncommon::start_data_table_header_row().
-                               "<th>$lt{'name'}</a></th>".
-                               "<th>$lt{'usnm'}</a></th>".
-                               "<th>$lt{'doma'}</a></th>".
-                               &Apache::loncommon::end_data_table_header_row();
+                               "<th>$lt{'name'}</th>".
+                               "<th>$lt{'usnm'}</th>".
+                               "<th>$lt{'doma'}</th>".
+                               &Apache::loncommon::end_data_table_header_row());
                     foreach my $key (sort(keys(%{$Sortby{$status}}))) {
                         foreach my $user (@{$Sortby{$status}{$key}}) {
-                            $result .=
-                                &Apache::loncommon::start_data_table_row().
-                                '<td><input type="checkbox" '.
+                            $r->print(&Apache::loncommon::start_data_table_row().
+                                '<td><span class="LC_nobreak"><input type="checkbox" '.
                                 'name="selectedusers_forminput" value="'.
                                 $user.':'.$status.'" />'.
-                                $$memberinfo{$user}{'fullname'}.'</td>'.
+                                $$memberinfo{$user}{'fullname'}.'</span></td>'.
                                 '<td>'.$$memberinfo{$user}{'uname'}.'</td>'.
                                 '<td>'.$$memberinfo{$user}{'udom'}.'</td>'.
-                                &Apache::loncommon::end_data_table_row();
+                                &Apache::loncommon::end_data_table_row());
                         }
                     }
-                    $result .= &Apache::loncommon::end_data_table().'</form></fieldset><br />';
+                    $r->print(&Apache::loncommon::end_data_table().'</form>'.
+                              '</fieldset><br /></div>');
                 }
             }
         }
     }
-    return $result;
+    return $hasfloat;
 }
 
 sub group_check_uncheck {
@@ -717,13 +720,13 @@ sub groupmail_header {
          {href=>"/adm/email?compose=group&amp;group=".
                 "$env{'form.group'}&amp;$refarg",
           text=>"Send a Message in a Group",
-          title=>"Compose Group Email Message"},);
+          title=>"Compose Group Message"},);
     if ($action eq 'sending') {
             &Apache::lonhtmlcommon::add_breadcrumb
                          ({text=>"Messages being sent.",
-                           title=>"Messages sent"},);
+                           title=>"E-mails sent"},);
     }
-    my $groupheader = &Apache::loncommon::start_page('Group Email');
+    my $groupheader = &Apache::loncommon::start_page('Group Message');
     $groupheader .= &Apache::lonhtmlcommon::breadcrumbs
                 ('Group - '.$env{'form.group'}.' Email');
     return $groupheader;
@@ -737,7 +740,7 @@ sub groupmail_sent {
     }
     my $output .= '<br /><br /><a href="/adm/email?compose=group&amp;group='.
                   $group.'&amp;'.$refarg.'">'.
-                  &mt('Send another group email').'</a>'.'&nbsp;&nbsp;&nbsp;'.
+                  &mt('Send another group message').'</a>'.'&nbsp;&nbsp;&nbsp;'.
                   '<a href="/adm/'.$cdom.'/'.$cnum.'/'.$group.'/smppg?'.
                   $refarg.'">'. &mt('Return to group page').'</a>';
     return $output;
@@ -1107,10 +1110,10 @@ ENDDISHEADER
 	    }
             my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
             my $count = $n +1;
-	    $r->print('<td align="right"><nobr>'.(($status eq 'new')?'<b>':'').
+	    $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
                       $count.'.'.(($status eq 'new')?'</b>':'').'&nbsp;'.
                       '<input type="checkbox" name="delmark"'. 
-                      ' value="'.$origID.'" /></nobr></td>');
+                      ' value="'.$origID.'" /></span></td>');
             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
@@ -1286,7 +1289,7 @@ sub compout {
          $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 email address (if known)').'</label><br />'.
+&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 />';
     }
@@ -1322,10 +1325,7 @@ sub compout {
         } else {
             $can_grp_broadcast = &check_group_priv($group);
             if ($can_grp_broadcast) {
-                $r->print('<div class="LC_left_float">'.
-                          &disgroup($cdom,$cnum,$group,\%access_status).
-                         '</div>');
-                $hasfloat = 1;
+                $hasfloat = &disgroup($r,$cdom,$cnum,$group,\%access_status);
             }
         }
         if ($hasfloat) {
@@ -1675,6 +1675,7 @@ ENDADD
 sub submit_button_row {
     my ($folder,$dismode,$sendtext,$lt,$is_crsform,$group) = @_;
     my $pre=&mt("Show Preview and Check Spelling");
+    my $value=&mt('Send');
     my $prevbutton = '<input type="button" name="preview" value="'.$pre.'" onclick="if (typeof(document.compemail.onsubmit)=='."'function'".') {document.compemail.onsubmit();};document.preview.comment.value=document.compemail.message.value;document.preview.subject.value=document.compemail.subject.value;document.preview.submit();" />';
     my $output = qq|
 <input type="hidden" name="folder" value="$folder" />
@@ -1687,7 +1688,7 @@ sub submit_button_row {
     }
     $output .= qq|
 <table><tr><td align="left">
-<input type="submit" name="send" value="$sendtext" />
+<input type="submit" name="send" value="$value" title="$sendtext" />
 <input type="submit" name="cancel" value="$lt->{'ca'}" />
 </td><td width="60">&nbsp;</td><td align="right">$prevbutton</td></tr></table>
 |;
@@ -1812,7 +1813,7 @@ $content{'sendername'}.':'.
      }
     # Check to see if there were any messages.
     if ($result eq '') {
-        my $lctype = lc(&Apache::loncommon::course_type());
+        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>");
 	} else {
@@ -2261,29 +2262,66 @@ sub displaymessage {
 # start output
     &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
     my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
-# Functions
-    $r->print('<table border="2" width="100%"><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>');
+
+# Functions and Actions
+    my $li_start='<span class="LC_nobreak">&bull; ';
+    my $li_end='</span> ';
+
+# Prepare available functions
+    my $functionlist='';
     if (!$content{'noreplies'}) {
-        $r->print('<td><a href="/adm/email?replyto='.&escape($msgid).$sqs.
-	          '"><b>'.&mt('Reply').'</b></a></td>');
-    }
-    $r->print('<td><a href="/adm/email?forward='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Forward').'</b></a></td>'.
-	      '<td><a href="/adm/email?markunread='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
-	      '<td><a href="/adm/email?markdel='.&escape($msgid).$sqs.
-	      '"><b>'.&mt('Delete').'</b></a></td>'.
-	      '<td><a href="/adm/email?'.$sqs.
-	      '"><b>'.&mt('Back to Folder Display').'</b></a></td>');
+        $functionlist.=$li_start
+                     .'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
+                     .&mt('Reply')
+                     .'</a>'
+                     .$li_end;
+    }
+    $functionlist.=$li_start
+                  .'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
+                  .&mt('Forward')
+                  .'</a>'
+                  .$li_end;
+    $functionlist.=$li_start
+                  .'<a href="/adm/email?markunread='.&escape($msgid).$sqs.'">'
+                  .&mt('Mark Unread')
+                  .'</a>'
+                  .$li_end;
+    $functionlist.=$li_start
+                  .'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
+                  .&mt('Delete')
+                  .'</a>'
+                  .$li_end;
+    $functionlist.=$li_start
+                  .'<a href="/adm/email?'.$sqs.'">'
+                  .&mt('Back to Folder Display')
+                  .'</a>'
+                  .$li_end;
     if ($counter > 0){
-	$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
-		  '"><b>'.&mt('Previous').'</b></a></td>');
+        $functionlist.=$li_start
+              .'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
+              .&mt('Previous')
+              .'</a>'
+              .$li_end;
     }
     if ($counter < $number_of_messages - 1){
-	$r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
-		  '"><b>'.&mt('Next').'</b></a></td>');
-    }
-    $r->print('</tr></table>');
+        $functionlist.=$li_start
+              .'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
+              .&mt('Next')
+              .'</a>'
+              .$li_end;
+    }
+# Print functions
+    $r->print('<div class="LC_left_float">'
+             .'<fieldset>'
+             .'<legend><span class="LC_mail_functions">'
+             .&mt('Functions')
+             .'</span></legend>'
+             .$functionlist
+             .'</fieldset>'
+             .'</div>'
+    );
+
+# Prepare available actions
     my $symb;
     if (defined($content{'symb'})) {
         $symb = $content{'symb'};
@@ -2292,33 +2330,40 @@ sub displaymessage {
     }
     if ($env{'user.adv'}) {
         my $actionlist='';
+
 	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
-		$actionlist.='<td><b>'
+		$actionlist.=$li_start
                             .&Apache::loncommon::track_student_link(
                                  &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check')
-                            .'</b></td>';
+                            .$li_end;
 	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
-	    $actionlist.='<td><b>'
+	    $actionlist.=$li_start
                         .&Apache::loncommon::pprmlink(
                              &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-                        .'</b></td>';
+                        .$li_end;
 	}
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
-	    $actionlist.='<td><b>'
+	    $actionlist.=$li_start
                        .&Apache::loncommon::pgrdlink(
                             &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-                       .'</b></td>';
+                       .$li_end;
 	}
+
+# Print actions
         if ($actionlist) {
-            $r->print('<table border="2" width="100%">'
-                     .'<tr bgcolor="#FFAAAA"><td>'
-                     .&mt('Currently available actions (will open extra window):')
-                     .'</td>'
+            $r->print('<div class="LC_left_float">'
+                     .'<fieldset>'
+                     .'<legend>'
+                     .&mt('[_1]Currently available actions[_2] (will open extra window):','<span class="LC_mail_functions">','</span>')
+                     .'</legend>'
                      .$actionlist
-                     .'</tr></table>');
+                     .'</fieldset>'
+                     .'</div>'
+            );
         }
     }
+
     my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients);
     if ($content{'recipid'}) {
         $tonum = &retrieve_recips('display',\%content,\%recipients);
@@ -2332,7 +2377,16 @@ sub displaymessage {
             $bcclist = join(', ',@{$recipients{'bcc'}});
         }
     }
-    if (!$tolist && ref($content{'recuser'}) eq 'ARRAY') {
+
+    my $broadcast_link;
+    if (($content{'courseid'}) && ($content{'recipid'} &&
+        (ref($recipients{'course_broadcast'}) eq 'ARRAY') ||
+        (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') ||
+        (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) {
+        $broadcast_link = &recipients_link($r,\%content,\%recipients);
+    }
+
+    if (((!$tolist) && (!$broadcast_link)) && ref($content{'recuser'}) eq 'ARRAY') {
         my @recipients;
         for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
             $recipients[$i] =  &Apache::loncommon::aboutmewrapper(
@@ -2354,21 +2408,14 @@ sub displaymessage {
     if (defined($content{'baseurl'})) {
         $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
     }
+    $r->print('<div class="LC_clear_float_footer">');
     if ($from_student && $see_anonymous ) {
-	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
-    }
-
-    my $broadcast_link;
-    if (($content{'courseid'}) && ($content{'recipid'} && 
-        (ref($recipients{'course_broadcast'}) eq 'ARRAY') || 
-        (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') ||
-        (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) {
-        $broadcast_link = &recipients_link($r,\%content,\%recipients);
+	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'</br>');
     }
 
     # Display LON-CAPA Message (Start)
     # Subject
-    $r->print('<br />'
+    $r->print('</div>'
              .&Apache::lonhtmlcommon::start_pick_box()
              .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
              .$content{'subject'}
@@ -2376,10 +2423,12 @@ sub displaymessage {
     );
     if ($folder eq 'sent') {
         # To
-        $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
-                 .$tolist
-                 .&Apache::lonhtmlcommon::row_closure()
-        );
+        if ($tolist) {
+            $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
+                     .$tolist
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
+        }
         if ($cclist) {
             $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc'))
                      .$cclist
@@ -2633,13 +2682,13 @@ sub recipients_link {
             $nothing=&Apache::lonhtmlcommon::javascript_nothing();
             $height = 400;
             $width = 600;
-            my $start_page =
-                    &Apache::loncommon::start_page('Broadcast List', undef,
-                                       {only_body => 1,
-                                        js_ready  => 1,});
-            my $end_page = &Apache::loncommon::end_page({js_ready => 1,});
-            my $body = '<h3>'.&mt("Recipients of broadcast message").'</h3>'.
-                       &Apache::loncommon::start_data_table();
+            $start_page =
+                &Apache::loncommon::start_page('Broadcast List', undef,
+                                               {only_body => 1,
+                                                js_ready  => 1,});
+            $end_page = &Apache::loncommon::end_page({js_ready => 1,});
+            $body = '<h3>'.&mt("Recipients of broadcast message").'</h3>'.
+                    &Apache::loncommon::start_data_table();
             my $cell = 0;
             $body .= &Apache::loncommon::start_data_table_row();
             foreach my $item (@{$recipients->{$show.'_broadcast'}}) {