--- loncom/interface/lonmsgdisplay.pm	2006/07/19 10:20:11	1.35.2.3
+++ loncom/interface/lonmsgdisplay.pm	2006/10/04 20:26:48	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.35.2.3 2006/07/19 10:20:11 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.41 2006/10/04 20:26:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -270,12 +270,14 @@ sub discourse {
 	    &Apache::lonselstudent::get_people_in_class($env{'request.course.sec'});
     unshift @$current_members, (@$course_personnel);
     my %defaultUsers;
+    
+    $result .= '<input type="hidden" name="sendmode" value="group" />'."\n";
 
-    $result = &Apache::lonselstudent::render_student_list($current_members,
-							  "compemail",
-							  "current",
-							  \%defaultUsers,
-							  1,"selectedusers",1);
+    $result .= &Apache::lonselstudent::render_student_list($current_members,
+							   "compemail",
+							   "current",
+							   \%defaultUsers,
+							   1,"selectedusers",1);
 
     $result .= &Apache::lonselstudent::render_student_list($expired_members,
 							   "compemail",
@@ -345,7 +347,7 @@ sub disgroup {
         foreach my $status (@statustypes)  {
             if (ref($numitems) eq 'HASH') {
                 if ((defined($$numitems{$status})) && ($$numitems{$status})) {
-                    $result.='<td align="top">'.
+                    $result.='<td valign="top">'.
                              '<fieldset><legend><b>'.$lt{$status}.
                              '</b></legend><nobr>'.
                              '<input type="button" value="check all" '.
@@ -356,12 +358,9 @@ sub disgroup {
                              '</nobr></fieldset><br />'.
                              &Apache::loncommon::start_data_table().
                              &Apache::loncommon::start_data_table_header_row();
-                    $result .= "<th><a href=\"javascript:changeSort('fullname')\">".
-                    "$lt{'name'}</a></th>".
-                    "<th><a href=\"javascript:changeSort('username')\">".
-                    "$lt{'usnm'}</a></th>".
-                    "<th><a href=\"javascript:changeSort('domain')\">".
-                    "$lt{'doma'}</a></th>".
+                    $result .= "<th>$lt{'name'}</a></th>".
+                               "<th>$lt{'usnm'}</a></th>".
+                               "<th>$lt{'doma'}</a></th>".
                     &Apache::loncommon::end_data_table_header_row();
                     foreach my $key (sort(keys(%{$Sortby{$status}}))) {
                         foreach my $user (@{$Sortby{$status}{$key}}) {
@@ -641,7 +640,7 @@ sub disnew {
     my %lt=&Apache::lonlocal::texthash(
 				       'nm' => 'New Messages',
 				       'su' => 'Subject',
-                                       'co' => 'Course',
+                                       'co' => 'Course/Group',
 				       'da' => 'Date',
 				       'us' => 'Username',
 				       'op' => 'Open',
@@ -810,9 +809,9 @@ ENDDISHEADER
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revcourse") {
-        $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course/Group').'</a>');
     } else {
-        $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
+        $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course/Group').'</a>');
     }
     $r->print('</th><th>');
     if ($env{'form.sortedby'} eq "revstatus") {
@@ -1021,7 +1020,6 @@ sub compout {
     $r->print('<table>');
     if (($broadcast eq 'group') && ($group ne '') && 
         (!$can_grp_broadcast && !$viewgrps && !$editgrps)) {
-        print STDERR "$broadcast AND $env{'form.group'} AND $can_grp_broadcast\n";
         $r->print(&recipient_input_row($cdom,%lt));
     } 
     if (($broadcast ne 'group') && ($broadcast ne 'upload')) {
@@ -1612,7 +1610,7 @@ sub build_block_table {
     my ($r,$startblock,$endblock,$setters) = @_;
     my %lt = &Apache::lonlocal::texthash(
         'cacb' => 'Currently active communication blocks',
-        'cour' => 'Course',
+        'cour' => 'Course/Group',
         'dura' => 'Duration',
         'blse' => 'Block set by'
     );
@@ -1792,7 +1790,7 @@ sub header {
     
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
-	$extra .= "<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />";
+	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
     $r->print(&Apache::loncommon::start_page('Communication and Messages',
  					$extra));