Diff for /loncom/interface/lonannounce.pm between versions 1.80 and 1.81

version 1.80, 2009/11/04 20:01:24 version 1.81, 2010/02/13 16:47:38
Line 420  sub picklink { Line 420  sub picklink {
 sub dialscript {  sub dialscript {
     return (<<ENDDIA);      return (<<ENDDIA);
 <script type="text/javascript" language="JavaScript">  <script type="text/javascript" language="JavaScript">
   // <![CDATA[
 function dialin(day,month,year) {  function dialin(day,month,year) {
  opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year;   opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year;
     var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month;      var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month;
Line 431  function dialin(day,month,year) { Line 432  function dialin(day,month,year) {
     opener.$env{'form.element'}\_checkday();      opener.$env{'form.element'}\_checkday();
     self.close();      self.close();
 }  }
   // ]]>
 </script>  </script>
 ENDDIA  ENDDIA
 }  }
Line 506  sub handler { Line 508  sub handler {
   
 # ---------------------------------------------- See if we are in pickdate mode  # ---------------------------------------------- See if we are in pickdate mode
     my $pickdatemode=($env{'form.pickdate'} eq 'yes');      my $pickdatemode=($env{'form.pickdate'} eq 'yes');
     my $pickinfo='&pickdate=yes&formname='.$env{'form.formname'}.      my $pickinfo='&amp;pickdate=yes&amp;formname='.$env{'form.formname'}.
  '&element='.$env{'form.element'};   '&amp;element='.$env{'form.element'};
 # --------------------------------------------- Find out first day of the month  # --------------------------------------------- Find out first day of the month
   
     my $tk = &Apache::loncommon::maketime( 'day' => 1,      my $tk = &Apache::loncommon::maketime( 'day' => 1,
Line 522  sub handler { Line 524  sub handler {
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
     my $js = <<ENDDOCUMENT;      my $js = <<ENDDOCUMENT;
 <script type="text/javascript" language="JavaScript">  <script type="text/javascript" language="JavaScript">
   // <![CDATA[
   
     function trysubmit() {      function trysubmit() {
         document.anno.action.value="new";          document.anno.action.value="new";
Line 532  sub handler { Line 535  sub handler {
         document.anno.action.value="del";          document.anno.action.value="del";
  document.anno.submit();   document.anno.submit();
     }      }
   // ]]>
 </script>  </script>
 ENDDOCUMENT  ENDDOCUMENT
   
Line 667  ENDDOCUMENT Line 671  ENDDOCUMENT
                  .&mt('No calendar available for this date.')                   .&mt('No calendar available for this date.')
                  .'</p>'                   .'</p>'
                  .'<a href="/adm/announcements?month='.$todayhash{'month'}                   .'<a href="/adm/announcements?month='.$todayhash{'month'}
                  .'&year='.$todayhash{'year'}.'">'.&mt('Current Month').'</a>'                   .'&amp;year='.$todayhash{'year'}.'">'.&mt('Current Month').'</a>'
  .&Apache::loncommon::end_page());   .&Apache::loncommon::end_page());
  return OK;   return OK;
     }      }
Line 706  ENDDOCUMENT Line 710  ENDDOCUMENT
     }      }
   
     $r->print(      $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.   '<a href="/adm/announcements?month='.$pm.'&amp;year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.   ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.   '<a href="/adm/announcements?month='.$fm.'&amp;year='.$fy.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.   '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.   '&amp;year='.$todayhash{'year'}.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><div>'.
         '<table class="'.$class.'" cols="7" rows="5"><tr>');          '<table class="'.$class.'"><tr>');
     for (my $i=0; $i<@localdays; $i++) {      for (my $i=0; $i<@localdays; $i++) {
         $r->print('<th>'.&mt($localdays[$i]).'</th>');          $r->print('<th>'.&mt($localdays[$i]).'</th>');
     }      }
Line 753  ENDDOCUMENT Line 757  ENDDOCUMENT
         }          }
     }      }
 # ------------------------------------------------------------------- End table  # ------------------------------------------------------------------- End table
     $r->print('</table>');      $r->print('</table></div>');
 # ----------------------------------------------------------------- Check marks  # ----------------------------------------------------------------- Check marks
     undef(%showedcheck);      undef(%showedcheck);
 # --------------------------------------------------------------- Remove button  # --------------------------------------------------------------- Remove button
     if ($allowed) { $r->print('<br /><input type="button" onClick="removesub()" value="'.&mt('Remove Checked Entries').'">'.      if ($allowed) { $r->print('<br /><input type="button" onClick="removesub()" value="'.&mt('Remove Checked Entries').'">'.
       &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }        &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }
     $r->print('<p>'.      $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.   '<a href="/adm/announcements?month='.$pm.'&amp;year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.   ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.   '<a href="/adm/announcements?month='.$fm.'&amp;year='.$fy.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.   '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.   '&amp;year='.$todayhash{'year'}.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
  ($pickdatemode?'</font>':'').&Apache::loncommon::end_page());   ($pickdatemode?'</font>':'').
     $r->print('<a href="/adm/announcements.ics">'.&mt('Download your Calendar as iCalendar File').'</a>');   '<a href="/adm/announcements.ics">'.&mt('Download your Calendar as iCalendar File').'</a>'.
       &Apache::loncommon::end_page());
     return OK;      return OK;
 }   } 
   

Removed from v.1.80  
changed lines
  Added in v.1.81


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