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

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.138 and 1.142

version 1.138, 2009/11/04 18:30:17 version 1.142, 2010/01/14 17:20:44
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};
     }      }
     return      my $output = '<b>'.&mt('Page:').'</b> ';
    '<b>'.&mt('Page').'</b>: '.       if ($maxdis == 1) {
    '<input type="submit" name="firstview" value="|&lt;" />'.          # No buttons if only one page is displayed
    '<input type="submit" name="prevview" value="&lt;" />'.          $output .= '1/1';
    ' <input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$maxdis.' '.      } else {
    '<input type="submit" name="nextview" value="&gt;" />'.          $output .=
    '<input type="submit" name="lastview" value="&gt;|" /><br />'.             '<input type="submit" name="firstview" value="|&lt;" />'.
    &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';             '<input type="submit" name="prevview" value="&lt;" />'.
              ' <input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$maxdis.' '.
              '<input type="submit" name="nextview" value="&gt;" />'.
              '<input type="submit" name="lastview" value="&gt;|" />';
       }
       $output .=
           '<br />'
          .'<b>'.&mt($status.' messages:').'</b> '
          .&mt('showing messages [_1] through [_2] of [_3].',
               $first,$finish,$total)
          .'</form>';
   
       return $output;
 }  }
 # =============================================================== Status Change  # =============================================================== Status Change
   
Line 854  sub discrit { Line 866  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 1058  ENDDISHEADER Line 1073  ENDDISHEADER
     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 1845  sub disfacetoface { Line 1862  sub disfacetoface {
     foreach my $key (sort(keys(%records))) {      foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});          my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');          next if ($content{'senderdomain'} eq '');
  &Apache::lonfeedback::newline_to_br(\$content{'message'});      if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
    &Apache::lonfeedback::newline_to_br(\$content{'message'});
    }
         if ($content{'subject'}=~/^Record/) {          if ($content{'subject'}=~/^Record/) {
     $result.='<h3>'.&mt('Record').'</h3>';      $result.='<h3>'.&mt('Record').'</h3>';
         } elsif ($content{'subject'}=~/^Broadcast/) {          } elsif ($content{'subject'}=~/^Broadcast/) {
Line 2210  sub display_blocker_status { Line 2229  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 2244  END Line 2263  END
         }          }
         $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><br />
           <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 2281  END Line 2305  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 2295  END Line 2319  END
      }       }
      $r->print(<<"END");       $r->print(<<"END");
      </td>        </td> 
      <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>       <td><label>
        <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
        </label></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());
Removed from v.1.138  
changed lines
  Added in v.1.142

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