--- loncom/interface/lonmsgdisplay.pm	2009/08/13 16:58:36	1.124.4.1
+++ loncom/interface/lonmsgdisplay.pm	2009/06/05 12:49:50	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.124.4.1 2009/08/13 16:58:36 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.125 2009/06/05 12:49:50 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -173,7 +173,6 @@ sub folderlist {
 
     $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
     my $output = qq|<script type="text/javascript">
-// <![CDATA[
 function folder_choice(targetform,caller) {
     var permfolders_keys = new Array('$permlistkeys');
     var permfolders_vals = new Array('$permlistvals');
@@ -215,7 +214,6 @@ function folder_choice(targetform,caller
         }
     }
 }
-// ]]>
 </script>|;
     my %show = ('select_form_order' => [10,20,50,100,200],
 		map {$_=>$_} (10,20,50,100,200));
@@ -241,7 +239,7 @@ function folder_choice(targetform,caller
      <td align="center"><b>'.$lt{'actn'}.'</b><br />'.
          &Apache::loncommon::select_form('view','folderaction',%actions).'
      </td><td><br />'.
-    '<input type="button" value="'.$lt{'go'}.'" onclick="javascript:folder_choice(this.form,'."'change'".');" />
+    '<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" />
      </td>
     </tr>
    </table>
@@ -249,7 +247,7 @@ function folder_choice(targetform,caller
   <td align="right">
    <table><tr><td><br />
     <input type="button" value="'.&mt('New Folder').
-    '" onclick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
+    '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
     '<td align="center"><b>'.&mt('Name').'</b><br />'.
     '<input type="text" size="15" name="newfolder" value="" />
     </td></tr></table>
@@ -297,11 +295,11 @@ sub scrollbuttons {
     }
     return
    '<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="submit" name="nextview" value="&gt;" />'.
-   '<input type="submit" name="lastview" value="&gt;|" /><br />'.
+   '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
+   '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
+   '<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
+   '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
+   '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
    &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
 }
 # =============================================================== Status Change
@@ -524,7 +522,10 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1,"selectedusers",1,'email')
        ) {
-       $result .= '<fieldset id="LC_activeusers"><legend><b>'.&mt('Bcc: course members with current access').'</b></legend><form name="activeusers">';
+       $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;
@@ -536,7 +537,10 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-       $result .= '<fieldset id="LC_previoususers"><legend><b>'.&mt('Bcc: course members with expired access').'</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;
@@ -549,7 +553,10 @@ sub discourse {
                                                                \%defaultUsers,
                                                                1, "selectedusers",0,'email')
        ) {
-       $result .= '<fieldset id="LC_futureusers"><legend><b>'.&mt('Bcc: course members with future access').'</b></legend><form name="previoususers">';
+       $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;
@@ -624,8 +631,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'".')" />'.
@@ -672,7 +680,6 @@ sub disgroup {
 sub group_check_uncheck {
     my $output = qq|
 <script type="text/javascript">
-/ <![CDATA[
 function toggleAll(form,action) {
     if (typeof(form.selectedusers_forminput.length)=="undefined") {
          if (action == 'check') {
@@ -690,7 +697,6 @@ function toggleAll(form,action) {
         }
     }
 }
-// ]]>
 </script>
     |;
 }
@@ -985,7 +991,6 @@ sub disfolder {
     my $jscript = &Apache::loncommon::check_uncheck_jscript();
     $r->print(<<ENDDISHEADER);
 <script type="text/javascript">
-// <![CDATA[
     $jscript
 
     function validate_checkedaction() {
@@ -1014,11 +1019,11 @@ sub disfolder {
         }
         document.disall.submit();
     }
-// ]]>
+
 </script>
 ENDDISHEADER
 
-    my $fsqs='&amp;folder='.$folder;
+    my $fsqs='&folder='.$folder;
     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;
     if ($totalnumber < 1) {
@@ -1132,7 +1137,7 @@ ENDDISHEADER
             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
-                          $item.(($status eq 'new')?'</b>':'').'</a></td>');
+                          $item.(($status eq 'new')?'</b>':'').'</td>');
             }
             my $showstatus;
             my %statushash = &get_msgstatus_types();
@@ -1351,7 +1356,6 @@ sub compout {
             $sendmode = '<input type="hidden" name="sendmode" value="group" />'."\n";
             $broadcast_js = qq|
 <script type="text/javascript">
-// <![CDATA[
 function courseRecipients() {
 |;
         foreach my $type (keys(%access_status)) {
@@ -1378,7 +1382,6 @@ function courseRecipients() {
         $broadcast_js .= qq|
     return;
 }
-// ]]>
 </script>
 
 |;
@@ -1422,9 +1425,7 @@ function courseRecipients() {
         my $jscript = &Apache::loncommon::check_uncheck_jscript();
         $r->print(<<"ENDREPSCRIPT");
 <script type="text/javascript">
-// <![CDATA[
 $jscript
-// ]]>
 </script>
 ENDREPSCRIPT
     }
@@ -1693,7 +1694,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>
@@ -1876,7 +1877,7 @@ sub facetoface {
 	return;
     }
     my $crstype = &Apache::loncommon::course_type();
-    my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders'
+    my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders'
                                         : 'faculty and staff';
     &printheader($r,
 		 '/adm/email?recordftf=query',
@@ -1963,7 +1964,7 @@ sub examblock {
 	$r->print('Not allowed');
 	return;
     }
-    my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members'
+    my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members'
 	                                                          : 'students';
     my %lt=&Apache::lonlocal::texthash(
             'comb' => 'Communication Blocking',
@@ -2741,7 +2742,6 @@ sub recipients_link {
             $body =~ s{\n}{}g;
             $r->print(<<ENDJS);
 <script type="text/javascript">
-// <![CDATA[
 function showBroadcastList() {
     var caller = this;
     var newWindow = null;
@@ -2764,7 +2764,7 @@ function writeWin(caller) {
     caller.document.close();
     caller.focus();
 }
-// ]]>
+
 </script>
 
 ENDJS
@@ -3223,7 +3223,7 @@ sub handler {
          'recordftf','sortedby','block','folder','startdis','interdis',
 	 'showcommentbaseurl','dismode','group','subject','text','ref',
          'msgstatus']);
-    $sqs='&amp;sortedby='.$env{'form.sortedby'};
+    $sqs='&sortedby='.$env{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email
     unless ($env{'form.block'}) {
@@ -3244,7 +3244,7 @@ sub handler {
     unless ($folder) { 
 	$folder=''; 
     } else {
-	$sqs.='&amp;folder='.&escape($folder);
+	$sqs.='&folder='.&escape($folder);
     }
 # ------------------------------------------------------------ Get Display Mode
 
@@ -3276,7 +3276,7 @@ sub handler {
 	$startdis++;
     }
     my $postedstartdis=$startdis+1;
-    $sqs.='&amp;startdis='.$postedstartdis;
+    $sqs.='&startdis='.$postedstartdis;
 
 # --------------------------------------------------------------- Render Output