[BACK]Return to lonmsgdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.124.4.5 and 1.124.4.8

version 1.124.4.5, 2010/01/25 19:30:59 version 1.124.4.8, 2010/01/30 22:28:20
Line 146  sub folderlist { Line 146  sub folderlist {
     );      );
     $actions{'select_form_order'} = ['view','rename','delete'];      $actions{'select_form_order'} = ['view','rename','delete'];
   
     my %statushash = &get_msgstatus_types();      my %statushash = &Apache::lonlocal::texthash(&get_msgstatus_types());
   
     $statushash{'select_form_order'} = ['','new','read','replied','forwarded'];      $statushash{'select_form_order'} = ['','new','read','replied','forwarded'];
   
Line 219  function folder_choice(targetform,caller Line 219  function folder_choice(targetform,caller
 </script>|;  </script>|;
     my %show = ('select_form_order' => [10,20,50,100,200],      my %show = ('select_form_order' => [10,20,50,100,200],
  map {$_=>$_} (10,20,50,100,200));   map {$_=>$_} (10,20,50,100,200));
   
      
     $output .= '      $output .= '
 <form method="post" action="/adm/email" name="folderlist">  <form method="post" action="/adm/email" name="folderlist">
 <table border="0" cellspacing="2" cellpadding="2">  <table border="0" cellspacing="2" cellpadding="2">
Line 273  sub get_permanent_folders { Line 272  sub get_permanent_folders {
 }  }
   
 sub get_msgstatus_types {  sub get_msgstatus_types {
     my %statushash = &Apache::lonlocal::texthash(      # Don't translate here!
                                 '' => 'Any',      my %statushash = (
                                 new => 'Unread',          ''          => 'Any',
                                 read => 'Read',          'new'       => 'Unread',
                                 replied => 'Replied to',          'read'      => 'Read',
                                 forwarded => 'Forwarded',          'replied'   => 'Replied to',
           'forwarded' => 'Forwarded',
     );      );
     return %statushash;      return %statushash;
 }  }
Line 291  sub scrollbuttons { Line 291  sub scrollbuttons {
     my %statushash = &get_msgstatus_types();      my %statushash = &get_msgstatus_types();
     my $status;      my $status;
     if ($msgstatus eq '') {      if ($msgstatus eq '') {
         $status = &mt('All');          $status = 'All'; # Don't translate here!
     } else {      } else {
         $status = $statushash{$msgstatus};          $status = $statushash{$msgstatus};
     }      }
Line 532  sub discourse { Line 532  sub discourse {
             $bcc_curr_hdr = &mt('Bcc: course members with current access');              $bcc_curr_hdr = &mt('Bcc: course members with current access');
         }          }
         $result .= '<fieldset id="LC_activeusers"><legend>'          $result .= '<fieldset id="LC_activeusers"><legend>'
                    .'<b>'.$bcc_curr_hdr.'</b>'.                     .'<b>'.$bcc_curr_hdr.'</b>'
                    .'</legend>'                     .'</legend>'
                    .'<form name="activeusers">';                     .'<form name="activeusers">';
         $result .= $tmptext.'</form></fieldset><br />';          $result .= $tmptext.'</form></fieldset><br />';
Line 553  sub discourse { Line 553  sub discourse {
             $bcc_prev_hdr = &mt('Bcc: course members with expired access');              $bcc_prev_hdr = &mt('Bcc: course members with expired access');
         }          }
         $result .= '<fieldset id="LC_previoususers"><legend>'          $result .= '<fieldset id="LC_previoususers"><legend>'
                    .'<b>'.$bcc_prev_hdr.'</b>'.                     .'<b>'.$bcc_prev_hdr.'</b>'
                    .'</legend>'                     .'</legend>'
                    .'<form name="previoususers">';                     .'<form name="previoususers">';
        $result .= $tmptext.'</form></fieldset><br />';         $result .= $tmptext.'</form></fieldset><br />';
Line 574  sub discourse { Line 574  sub discourse {
             $bcc_future_hdr = &mt('Bcc: course members with future access');              $bcc_future_hdr = &mt('Bcc: course members with future access');
         }          }
         $result .= '<fieldset id="LC_futureusers"><legend>'          $result .= '<fieldset id="LC_futureusers"><legend>'
                    .'<b>'.$bcc_future_hdr.'</b>'.                     .'<b>'.$bcc_future_hdr.'</b>'
                    .'</legend>'                     .'</legend>'
                    .'<form name="futureusers">';                     .'<form name="futureusers">';
        $result .= $tmptext.'</form></fieldset>';         $result .= $tmptext.'</form></fieldset>';
Line 850  sub discrit { Line 850  sub discrit {
     }      }
     # Check to see if there were any messages.      # Check to see if there were any messages.
     if ($result eq '') {      if ($result eq '') {
         $result = "<h2>".&mt('You have no critical messages.')."</h2>".          $result =
     '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.              '<p class="LC_info">'.
               &mt('You have no critical messages.').
               '</p>'.
               '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
             '<a href="/adm/email">'.&mt('Communicate').'</a>';              '<a href="/adm/email">'.&mt('Communicate').'</a>';
     } else {      } else {
         $r->print($header);          $r->print($header);
Line 1053  ENDDISHEADER Line 1056  ENDDISHEADER
     my $fsqs='&amp;folder='.$folder;      my $fsqs='&amp;folder='.$folder;
     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);      my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;      my $totalnumber=$#temp+1;
   
     if ($totalnumber < 1) {      if ($totalnumber < 1) {
           $r->print('<p class="LC_info">');
         if ($msgstatus eq '') {          if ($msgstatus eq '') {
     $r->print('<h2>'.&mt('Empty Folder').'</h2>');              $r->print(&mt('There are no messages in this folder.'));
         } elsif ($msgstatus eq 'replied') {          } elsif ($msgstatus eq 'replied') {
             $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');              $r->print(&mt('You have not replied to any messages in this folder.'));
         } else {           } else { 
             $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');              $r->print(&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.'));
         }          }
           $r->print('</p>');
         if ($numblocked > 0) {          if ($numblocked > 0) {
             $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,              $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
                                          \%setters));                                           \%setters));
         }          }
  return;          return;
     }      }
     my $interdis = $env{'form.interdis'};      my $interdis = $env{'form.interdis'};
     my $number=int($totalnumber/$interdis);      my $number=int($totalnumber/$interdis);
Line 2195  sub display_blocker_status { Line 2201  sub display_blocker_status {
     <th>$ltext->{'setb'}</th>      <th>$ltext->{'setb'}</th>
     <th>$ltext->{'even'}</th>      <th>$ltext->{'even'}</th>
     <th>$ltext->{'blck'}</th>      <th>$ltext->{'blck'}</th>
     <th>$ltext->{'actn'}?</th>      <th>$ltext->{'actn'}</th>
   </tr>    </tr>
 END  END
     foreach my $record (sort(keys(%{$records}))) {      foreach my $record (sort(keys(%{$records}))) {
Line 2225  END Line 2231  END
             if ($blocks->{$block} eq 'on') {              if ($blocks->{$block} eq 'on') {
                 $blockstatus = 'checked="checked"';                  $blockstatus = 'checked="checked"';
             }              }
             $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');              $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label></span><br />');
         }          }
         $r->print(<<"END");          $r->print(<<"END");
         </td>                </td>
         <td><label>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount" /></label>          <td><span class="LC_nobreak"><label>
           <input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
           </label></span><br /><span class="LC_nobreak">
           <label>
           <input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
           </label></span>
 END  END
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_row());
         $parmcount++;          $parmcount++;
Line 2266  END Line 2277  END
      <th>$ltext->{'dura'}</th>       <th>$ltext->{'dura'}</th>
      <th>$ltext->{'even'} $lt{'exam'}</th>       <th>$ltext->{'even'} $lt{'exam'}</th>
      <th>$ltext->{'blck'}</th>       <th>$ltext->{'blck'}</th>
      <th>$ltext->{'actn'}?</th>       <th>$ltext->{'actn'}</th>
    </tr>     </tr>
 END  END
     $r->print(&Apache::loncommon::start_data_table_row());      $r->print(&Apache::loncommon::start_data_table_row());
Line 2276  END Line 2287  END
      <td>       <td>
 END  END
     foreach my $block (@{$typeorder}) {      foreach my $block (@{$typeorder}) {
         $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');          $r->print('<span class="LC_nobreak"><label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label></span><br />');
      }       }
      $r->print(<<"END");       $r->print(<<"END");
      </td>        </td>
      <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>       <td><span class="LC_nobreak"><label>
        <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
        </label></span></td>
 END  END
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
Line 2316  sub displaymessage { Line 2329  sub displaymessage {
     if ( $blocked{$msgid} eq 'ON' ) {      if ( $blocked{$msgid} eq 'ON' ) {
         &printheader($r,'/adm/email',&mt('Display a Message'));          &printheader($r,'/adm/email',&mt('Display a Message'));
         $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));          $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
         &build_block_table($r,$startblock,$endblock,\%setters);          $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,\%setters));
         return;          return;
     }      }
     if ($msgstatus eq '') {      if ($msgstatus eq '') {
Removed from v.1.124.4.5  
changed lines
  Added in v.1.124.4.8

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>