Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.161 and 1.162

version 1.161, 2012/10/02 16:42:07 version 1.162, 2012/11/30 14:57:17
Line 222  function folder_choice(targetform,caller Line 222  function folder_choice(targetform,caller
   
     $output .= '      $output .= '
 <form method="post" action="/adm/email" name="folderlist">  <form method="post" action="/adm/email" name="folderlist">
      <div class="LC_columnSection"><fieldset>
      <legend>'.&mt('Folder Actions').'</legend>
    <table border="0" cellspacing="2" cellpadding="8">     <table border="0" cellspacing="2" cellpadding="8">
     <tr>      <tr>
      <td><b>'.$lt{'fold'}.'</b><br />'."\n".       <td><b>'.$lt{'fold'}.'</b><br />'."\n".
Line 241  function folder_choice(targetform,caller Line 243  function folder_choice(targetform,caller
          '" onclick="javascript:folder_choice(this.form,'."'change'".');" />           '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
          </span>           </span>
      </td>       </td>
      <td><b>'.&mt('New Folder').'</b><br />'."\n".'      </tr>
       <tr>
        <td colspan="4"><b>'.&mt('New Folder').'</b><br />'."\n".'
          <span class="LC_nobreak">           <span class="LC_nobreak">
          <input type="text" size="15" name="newfolder" value="" />           <input type="text" size="15" name="newfolder" value="" />
          <input type="button" value="'.$lt{'go'}.           <input type="button" value="'.$lt{'go'}.
Line 250  function folder_choice(targetform,caller Line 254  function folder_choice(targetform,caller
      </td>       </td>
     </tr>      </tr>
    </table>     </table>
      </fieldset></div>
 '."\n".  '."\n".
     '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.      '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
     '<input type="hidden" name="renamed" value="" />'.      '<input type="hidden" name="renamed" value="" />'.
Line 877  sub discrit { Line 882  sub discrit {
             '<p class="LC_info">'.              '<p class="LC_info">'.
             &mt('You have no critical messages.').              &mt('You have no critical messages.').
             '</p>'.              '</p>'.
             '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.              &Apache::lonhtmlcommon::actionbox(
             '<a href="/adm/email">'.&mt('Communicate').'</a>';                  ['<a href="/adm/roles">'.&mt('Select a course').'</a>',
                    '<a href="/adm/email">'.&mt('Communicate').'</a>']);
     } else {      } else {
         $r->print($header);          $r->print($header);
     }      }
Line 1232  ENDDISHEADER Line 1238  ENDDISHEADER
   
   
     # Bottom Functions      # Bottom Functions
     $r->print('<table border="0" cellspacing="2" cellpadding="8">      $r->print('
   <div class="LC_columnSection"><fieldset>
   <legend>'.&mt('Message Actions').'</legend>
   <table border="0" cellspacing="2" cellpadding="8">
  <tr>   <tr>
   <td>    <td><b>'.&mt('Select Messages').'</b><br />
    <fieldset>  
    <legend>'.&mt('Select').'</legend>  
    <span class="LC_nobreak">     <span class="LC_nobreak">
    <input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" />'."\n".     <input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" />'."\n".
   ' <input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".    ' <input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
   '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />    '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />
   </span>    </span>
   </fieldset>  
   </td>'."\n".    </td>'."\n".
   '<td><b>'.&mt('Action').'</b><br />'."\n".    '<td><b>'.&mt('Action').'</b><br />'."\n".
   '  <select name="checkedaction">'."\n");    '  <select name="checkedaction">'."\n");
Line 1266  ENDDISHEADER Line 1272  ENDDISHEADER
     $r->print("\n".'</select></td>'."\n");      $r->print("\n".'</select></td>'."\n");
   
     if (keys(%gotfolders) > 0) {      if (keys(%gotfolders) > 0) {
         $r->print('<td><b>'.&mt('Destination folder').'<b><br />');          $r->print('<td><b>'.&mt('Destination folder').'</b><br />');
  my %userfolders;   my %userfolders;
         foreach my $key (keys(%gotfolders)) {          foreach my $key (keys(%gotfolders)) {
             $userfolders{$key} = $key;              $userfolders{$key} = $key;
Line 1275  ENDDISHEADER Line 1281  ENDDISHEADER
         $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders).          $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders).
                   '</td>');                    '</td>');
     }      }
     $r->print('<td>'.      $r->print('<td style="vertical-align:bottom;">'.
               '<input type="button" name="go" value="'.&mt('Go').                '<input type="button" name="go" value="'.&mt('Go').
               '" onclick="javascript:validate_checkedaction()"/></td>'."\n".                '" onclick="javascript:validate_checkedaction()"/></td>'."\n".
               '</tr></table>');                '</tr></table>'."\n".
                 '</fieldset></div>'."\n"
       );
     my $postedstartdis=$startdis+1;      my $postedstartdis=$startdis+1;
     $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');      $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');
     if ($numblocked > 0) {      if ($numblocked > 0) {
Line 2129  sub displaymessage { Line 2137  sub displaymessage {
     push(@functionlist,'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'      push(@functionlist,'<a href="/adm/email?markdel='.&escape($msgid).$sqs.'">'
                   .&mt('Delete')                    .&mt('Delete')
                   .'</a>');                    .'</a>');
     push(@functionlist,'<a href="/adm/email?'.$sqs.'">'  
                   .&mt('Back to Folder Display')  # Prepare available navigation
                   .'</a>');      my @navigationlist;
     if ($counter > 0){      if ($counter > 0){
         push(@functionlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'          push(@navigationlist,'<a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.'">'
                           .&mt('Previous')                            .&mt('Previous')
                           .'</a>');                            .'</a>');
     }      }
     if ($counter < $number_of_messages - 1){      if ($counter < $number_of_messages - 1){
         push(@functionlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'          push(@navigationlist,'<a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.'">'
                           .&mt('Next')                            .&mt('Next')
                           .'</a>');                            .'</a>');
     }      }
       push(@navigationlist,'<a href="/adm/email?'.$sqs.'">'
                     .&mt('Back to Folder Display')
                     .'</a>');
   
 # Prepare available actions  # Prepare available actions
     my $symb;      my $symb;
Line 2150  sub displaymessage { Line 2161  sub displaymessage {
     } elsif (defined($content{'baseurl'})) {      } elsif (defined($content{'baseurl'})) {
         $symb=&Apache::lonnet::symbread($content{'baseurl'});          $symb=&Apache::lonnet::symbread($content{'baseurl'});
     }      }
         my @actionlist;      my @actionlist;
     if ($env{'user.adv'}) {      if ($env{'user.adv'}) {
   
  if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {   if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
Line 2178  sub displaymessage { Line 2189  sub displaymessage {
  }   }
     }      }
   
 # Print functionlist and actionlist in page header  # Print functionlist, navigationlist, and actionlist in page header
         my $functions='<div class="LC_columnSection">';          my $functions='<div class="LC_columnSection">';
   
         # Functionlist          # Functionlist
Line 2188  sub displaymessage { Line 2199  sub displaymessage {
         }          }
         $functions .= &Apache::lonhtmlcommon::end_funclist();          $functions .= &Apache::lonhtmlcommon::end_funclist();
   
           # Navigationlist
           $functions.=&Apache::lonhtmlcommon::start_funclist(
                       &mt('Navigation'));
           foreach my $item (@navigationlist) {
               $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
           }
           $functions .= &Apache::lonhtmlcommon::end_funclist();
   
         # Actionlist          # Actionlist
         if (@actionlist) {          if (@actionlist) {
             my $legendtext=&mt('Currently available actions (will open extra window)');              $functions.=&Apache::lonhtmlcommon::start_funclist(
             $functions.=&Apache::lonhtmlcommon::start_funclist($legendtext);                              &mt('Currently available actions (will open extra window)'));
             foreach my $item (@actionlist) {              foreach my $item (@actionlist) {
                 $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);                  $functions.=&Apache::lonhtmlcommon::add_item_funclist($item);
             }              }

Removed from v.1.161  
changed lines
  Added in v.1.162


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