--- loncom/interface/lonmsgdisplay.pm	2008/11/17 17:19:52	1.96
+++ loncom/interface/lonmsgdisplay.pm	2008/12/11 14:55:15	1.102
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.96 2008/11/17 17:19:52 schafran Exp $
+# $Id: lonmsgdisplay.pm,v 1.102 2008/12/11 14:55:15 bisitz 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 e-mail folders record.');
     }
     return ($outcome,$warning);
 }
@@ -718,13 +718,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 E-mail"},);
+          title=>"Compose Group Message"},);
     if ($action eq 'sending') {
             &Apache::lonhtmlcommon::add_breadcrumb
-                         ({text=>"E-mails being sent.",
+                         ({text=>"Messages being 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;
@@ -738,7 +738,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;
@@ -1108,10 +1108,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.'">'.
@@ -1287,7 +1287,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 />';
     }
@@ -1571,7 +1571,7 @@ $sendmode
 $dispcrit
 $disbase
 ENDCOMP
-        $r->print(&submit_button_row($folder,$dismode,&mt($func1),
+        $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'ma'}),
                                      \%lt,$hasfloat,$group));
         $r->print($citation);
         if (exists($env{'form.ref'})) {
@@ -1676,6 +1676,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" />
@@ -1688,7 +1689,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>
 |;
@@ -2262,29 +2263,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>'
+             .'<fieldset>'
+             .'<legend>'
+             .&mt('Functions')
+             .'</legend>'
+             .$functionlist
+             .'</fieldset>'
+             .'</div>'
+    );
+
+# Prepare available actions
     my $symb;
     if (defined($content{'symb'})) {
         $symb = $content{'symb'};
@@ -2293,33 +2331,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>'
+            $r->print('<div>'
+                     .'<fieldset>'
+                     .'<legend>'
                      .&mt('Currently available actions (will open extra window):')
-                     .'</td>'
+                     .'</legend>'
                      .$actionlist
-                     .'</tr></table>');
+                     .'</fieldset>'
+                     .'</div>'
+            );
         }
     }
+
     my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients);
     if ($content{'recipid'}) {
         $tonum = &retrieve_recips('display',\%content,\%recipients);