--- loncom/interface/lonmsgdisplay.pm	2009/01/04 17:43:19	1.107
+++ loncom/interface/lonmsgdisplay.pm	2009/03/31 21:04:12	1.120
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.107 2009/01/04 17:43:19 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.120 2009/03/31 21:04:12 kaisler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -136,6 +136,9 @@ sub folderlist {
 
     );
 
+	# set se lastvisit for the new mail check in the toplevel menu
+	&Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time});
+
     my %actions = &Apache::lonlocal::texthash(
                                 view => 'View Folder',
                                 rename => 'Rename Folder',
@@ -583,7 +586,9 @@ sub disgroup {
         return;
     } else {
         $hasfloat = 1;
-        $r->print('<div class="LC_left_float">');
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('<div class="LC_left_float">');
+        }
         my %Sortby = (
                          active   => {},
                          previous => {},
@@ -651,10 +656,13 @@ sub disgroup {
                         }
                     }
                     $r->print(&Apache::loncommon::end_data_table().'</form>'.
-                              '</fieldset><br /></div>');
+                              '</fieldset><br />');
                 }
             }
         }
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('</div>');
+        }
     }
     return $hasfloat;
 }
@@ -833,6 +841,7 @@ sub sortedmessages {
     }
 
     foreach my $msgid (@messages) {
+        next if ($msgid eq '');
 	my $esc_msgid=&escape($msgid);
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) =
 	    &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
@@ -1073,11 +1082,13 @@ ENDDISHEADER
     $r->print("</tr>\n");
 
     my $suffix = &Apache::lonmsg::foldersuffix($folder);
+    my $count = 0;
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
 	    $description,$recv_name,$recv_domain)= 
 		@{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+            $count ++;
 	    if ($status eq 'new') {
 		$r->print('<tr class="LC_mail_new">');
 	    } elsif ($status eq 'read') {
@@ -1109,7 +1120,6 @@ ENDDISHEADER
 		}
 	    }
             my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
-            my $count = $n +1;
 	    $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
                       $count.'.'.(($status eq 'new')?'</b>':'').'&nbsp;'.
                       '<input type="checkbox" name="delmark"'. 
@@ -1319,7 +1329,11 @@ sub compout {
         if ($group eq '') {
             my $studentsel = &discourse(\%access_status);
             if ($studentsel) {
-                $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
+                if ($env{'environment.wysiwygeditor'} eq 'on') {
+                    $r->print($studentsel);
+                } else {
+                    $r->print('<div class="LC_left_float">'.$studentsel.'</div>');
+                }
                 $hasfloat = 1;
             }
         } else {
@@ -1411,7 +1425,11 @@ ENDREPSCRIPT
     if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
     if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
     if ($hasfloat) {
-        $r->print($broadcast_js.'<div class="LC_left_float">');
+        if ($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print($broadcast_js);
+        } else {
+            $r->print($broadcast_js.'<div class="LC_left_float">');
+        }
         $onsubmit = ' onsubmit="javascript:courseRecipients();" ';
     }
     $r->print(
@@ -1520,7 +1538,7 @@ ENDREPSCRIPT
             $r->print(&recipient_input_row($defdom,%lt));
         }
     }
-    my $latexHelp = &Apache::loncommon::helpLatexCheatsheet();
+    my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
     my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'<br />';
     my $subj_size;
     if ($multiforward) {
@@ -1563,7 +1581,7 @@ $wysiwyglink);
         $r->print(<<"ENDCOMP");
 $attachrow
 </table><br />
-$latexHelp
+$latexHelp<br />
 <textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
 </textarea>$wysiwyglink
 $sendmode
@@ -1617,7 +1635,9 @@ ENDUPLOAD
     }
     $r->print('</form>');
     if ($hasfloat) {
-        $r->print('</div><div class="LC_clear_float_footer"></div>');
+        unless($env{'environment.wysiwygeditor'} eq 'on') {
+            $r->print('</div><div class="LC_clear_float_footer"></div>');
+        }
     }
     $r->print(&generate_preview_form);
 }
@@ -1667,7 +1687,7 @@ sub additional_rec_row {
 <tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend><b>$lt->{'ad'}</b> <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>
+<tr><td>&nbsp;</td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
 ENDADD
     return $output;
 }
@@ -2133,7 +2153,7 @@ END
         foreach my $block (@{$typeorder}) {
             my $blockstatus = '';
             if ($blocks->{$block} eq 'on') {
-                $blockstatus = 'checked="true"';
+                $blockstatus = 'checked="checked"';
             }
             $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
         }
@@ -2200,7 +2220,7 @@ END
 sub blocktype_text {
     my %types = &Apache::lonlocal::texthash(
         'com' => 'Messaging',
-        'chat' => 'Chat',
+        'chat' => 'Chat Room',
         'boards' => 'Discussion',
         'port' => 'Portfolio',
         'groups' => 'Groups',
@@ -2263,61 +2283,46 @@ 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='';
+    my @functionlist;
     if (!$content{'noreplies'}) {
-        $functionlist.=$li_start
-                     .'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
+        push(@functionlist,'<a href="/adm/email?replyto='.&escape($msgid).$sqs.'">'
                      .&mt('Reply')
-                     .'</a>'
-                     .$li_end;
+                     .'</a>');
     }
-    $functionlist.=$li_start
-                  .'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
+    push(@functionlist,'<a href="/adm/email?forward='.&escape($msgid).$sqs.'">'
                   .&mt('Forward')
-                  .'</a>'
-                  .$li_end;
-    $functionlist.=$li_start
-                  .'<a href="/adm/email?markunread='.&escape($msgid).$sqs.'">'
+                  .'</a>');
+    push(@functionlist,'<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.'">'
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
                   .&mt('Delete')
-                  .'</a>'
-                  .$li_end;
-    $functionlist.=$li_start
-                  .'<a href="/adm/email?'.$sqs.'">'
+                  .'</a>');
+    push(@functionlist,'<a href="/adm/email?'.$sqs.'">'
                   .&mt('Back to Folder Display')
-                  .'</a>'
-                  .$li_end;
+                  .'</a>');
     if ($counter > 0){
-        $functionlist.=$li_start
-              .'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
-              .&mt('Previous')
-              .'</a>'
-              .$li_end;
+        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
+                          .&mt('Previous')
+                          .'</a>');
     }
     if ($counter < $number_of_messages - 1){
-        $functionlist.=$li_start
-              .'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
-              .&mt('Next')
-              .'</a>'
-              .$li_end;
+        push(@functionlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
+                          .&mt('Next')
+                          .'</a>');
     }
 # Print functions
+    my $legendtext='<span class="LC_mail_functions">'
+                   .&mt('Functions')
+                   .'</span>';
     $r->print('<div class="LC_left_float">'
-             .'<fieldset>'
-             .'<legend><span class="LC_mail_functions">'
-             .&mt('Functions')
-             .'</span></legend>'
-             .$functionlist
-             .'</fieldset>'
+                     .&Apache::lontemplate::start_functionslist($legendtext)
+    );
+    foreach my $item (@functionlist) {
+        $r->print(&Apache::lontemplate::item_functionslist($item));
+    }
+    $r->print(&Apache::lontemplate::end_functionslist()
              .'</div>'
     );
 
@@ -2329,36 +2334,43 @@ sub displaymessage {
         $symb=&Apache::lonnet::symbread($content{'baseurl'});
     }
     if ($env{'user.adv'}) {
-        my $actionlist='';
+        my @actionlist;
 
 	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
-		$actionlist.=$li_start
-                            .&Apache::loncommon::track_student_link(
-                                 &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check')
-                            .$li_end;
+		push(@actionlist,&Apache::loncommon::track_student_link(
+                                      &mt('View recent activity')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,'check'));
 	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
-	    $actionlist.=$li_start
-                        .&Apache::loncommon::pprmlink(
-                             &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-                        .$li_end;
+	    push(@actionlist,&Apache::loncommon::pprmlink(
+                                  &mt('Set/Change parameters')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,$symb
+                                     ,'check'));
 	}
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
-	    $actionlist.=$li_start
-                       .&Apache::loncommon::pgrdlink(
-                            &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-                       .$li_end;
+	    push(@actionlist,&Apache::loncommon::pgrdlink(
+                                 &mt('Set/Change grades')
+                                     ,$content{'sendername'}
+                                     ,$content{'senderdomain'}
+                                     ,$symb
+                                     ,'check'));
 	}
 
 # Print actions
-        if ($actionlist) {
+        if (@actionlist) {
+            $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>'
-                     .&mt('[_1]Currently available actions[_2] (will open extra window):','<span class="LC_mail_functions">','</span>')
-                     .'</legend>'
-                     .$actionlist
-                     .'</fieldset>'
+                     .&Apache::lontemplate::start_functionslist($legendtext)
+            );
+            foreach my $item (@actionlist) {
+                $r->print(&Apache::lontemplate::item_functionslist($item));
+            }
+            $r->print(&Apache::lontemplate::end_functionslist()
                      .'</div>'
             );
         }
@@ -2682,13 +2694,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'}}) {
@@ -2785,15 +2797,14 @@ sub displayresource {
 
 sub header {
     my ($r,$title,$baseurl)=@_;
-    
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
-    $r->print(&Apache::loncommon::start_page('Communication and Messages',
+    $r->print(&Apache::loncommon::start_page('Communication',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
-     		(($title?$title:'Communication and Messages')));
+     		(($title?$title:'Send and Receive Messages')));
 }
 
 # ---------------------------------------------------------------- Print header
@@ -3468,7 +3479,7 @@ sub handler {
         my $showfolder = $env{'form.newfolder'};
 	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
         if ($makeresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'<br />');
+            $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
         } else {
             $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
                       $warning);
@@ -3483,7 +3494,7 @@ sub handler {
         my $showfolder = '';
         my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+            $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
             $env{'form.folder'} = '';
         } else {
             $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
@@ -3496,7 +3507,7 @@ sub handler {
         my $showfolder = $env{'form.renamed'};
         my $renresult = &renamefolder($folder);
         if ($renresult eq 'ok') {
-            $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />');
+            $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
         } else {
             $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
             $showfolder = $folder;