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

Diff for /loncom/interface/lonannounce.pm between versions 1.84 and 1.88

version 1.84, 2012/04/18 16:22:31 version 1.88, 2017/02/16 18:17:49
Line 68  sub editfield { Line 68  sub editfield {
   
     $r->print(<<ENDFORM);      $r->print(<<ENDFORM);
 <h2>$lt{'annon'} $help</h2>  <h2>$lt{'annon'} $help</h2>
 <form name="anno" method="post">  <form name="anno" method="post" action="">
 <input type="hidden" value='' name="action" />  <input type="hidden" value='' name="action" />
 <table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>  <table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>
 <tr><td>$lt{'end'}:</td><td>$enddateform</td></tr></table>  <tr><td>$lt{'end'}:</td><td>$enddateform</td></tr></table>
 <textarea name="msg" rows="4" cols="60">$text</textarea>  <textarea name="msg" rows="4" cols="60">$text</textarea>
 <br />  <br />
 <label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label>  <label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label>
 <br /><input type="button" onClick="trysubmit()" value="$lt{'post'}" /><hr />  <br /><input type="button" onclick="trysubmit()" value="$lt{'post'}" /><hr />
 ENDFORM  ENDFORM
 }  }
   
Line 117  sub readcalendar { Line 117  sub readcalendar {
     foreach my $thiskey (keys(%$resourcedata)) {      foreach my $thiskey (keys(%$resourcedata)) {
  if ($resourcedata->{$thiskey.'.type'}=~/^date/) {   if ($resourcedata->{$thiskey.'.type'}=~/^date/) {
     my ($course,$middle,$part,$name)=      my ($course,$middle,$part,$name)=
  ($thiskey=~/^(\Q$courseid\E)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);   ($thiskey=~/^(\Q$courseid\E)\.(?:(.+)\.)*([\w\s\-]+)\.(\w+)$/);
   
     my %data = ( 'section' => &mt('All Students'));      my %data = ( 'section' => &mt('All Students'));
     if ($middle=~/^\[(.*)\]\./) {      if ($middle=~/^\[(.*)\]\./) {
Line 228  sub normalcell { Line 228  sub normalcell {
        && ($env{'form.pickdate'} ne 'yes')         && ($env{'form.pickdate'} ne 'yes')
        && (!$internalflag)) {         && (!$internalflag)) {
                $output.='<input type="checkbox" name="remove_'.$start.'_'.                 $output.='<input type="checkbox" name="remove_'.$start.'_'.
    $end.'">';     $end.'" />';
                $showedcheck{$start.'_'.$end}=1;                 $showedcheck{$start.'_'.$end}=1;
       }        }
     }      }
Line 573  ENDDOCUMENT Line 573  ENDDOCUMENT
             my $rc;              my $rc;
             my $message;              my $message;
             foreach my $key (keys(%env)) {              foreach my $key (keys(%env)) {
                 if ($key=~/^form\.postto\_(\w+[\w|-]*)/) {                  if ($key=~/^form\.postto\_(\w+[\w\-]*)/) {
                      $rc = &Apache::lonnet::postannounce                       $rc = &Apache::lonnet::postannounce
                            ($1,$env{'form.serverannnounce'});                             ($1,$env{'form.serverannnounce'});
                     if ($rc eq 'ok') {                      if ($rc eq 'ok') {
Line 592  ENDDOCUMENT Line 592  ENDDOCUMENT
             }              }
             $r->print(&Apache::loncommon::confirmwrapper($message));              $r->print(&Apache::loncommon::confirmwrapper($message));
         }          }
  $r->print('<form name="serveranno" method="post">'   $r->print('<form name="serveranno" method="post" action="">'
                  .'<h2>'.&mt('Post Server Announcements').'</h2>'                   .'<h2>'.&mt('Post Server Announcements').'</h2>'
                  .&mt('Post announcements to the system login and roles screen').'<br />'                   .&mt('Post announcements to the system login and roles screen').'<br />'
                  .'<i>'.&mt('(leave blank to delete announcement)').'</i><br />'                   .'<i>'.&mt('(leave blank to delete announcement)').'</i><br />'
Line 775  ENDDOCUMENT Line 775  ENDDOCUMENT
 # ----------------------------------------------------------------- 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.'&amp;year='.$py.   '<a href="/adm/announcements?month='.$pm.'&amp;year='.$py.
Removed from v.1.84  
changed lines
  Added in v.1.88

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