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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.107 and 1.110

version 1.107, 2005/06/06 15:54:28 version 1.110, 2005/06/18 18:51:50
Line 258  The method used to restrict user input w Line 258  The method used to restrict user input w
 ##############################################  ##############################################
 sub date_setter {  sub date_setter {
     my ($formname,$dname,$currentvalue,$special,$includeempty,$state,      my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
         $no_hh_mm_ss) = @_;          $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_;
     my $wasdefined=1;      my $wasdefined=1;
     if (! defined($state) || $state ne 'disabled') {      if (! defined($state) || $state ne 'disabled') {
         $state = '';          $state = '';
Line 266  sub date_setter { Line 266  sub date_setter {
     if (! defined($no_hh_mm_ss)) {      if (! defined($no_hh_mm_ss)) {
         $no_hh_mm_ss = 0;          $no_hh_mm_ss = 0;
     }      }
     if (! defined($currentvalue) || $currentvalue eq 'now') {      if ($currentvalue eq 'now') {
  unless ($includeempty) {   $currentvalue=time;
     $currentvalue = time;      }
     $wasdefined=0;      if ((!defined($currentvalue)) || ($currentvalue eq '')) {
  } else {   $wasdefined=0;
    if ($includeempty) {
     $currentvalue = 0;      $currentvalue = 0;
    } else {
       $currentvalue = time;
  }   }
     }      }
     # other potentially useful values:     wkday,yrday,is_daylight_savings      # other potentially useful values:     wkday,yrday,is_daylight_savings
Line 282  sub date_setter { Line 285  sub date_setter {
  $year += 1900;   $year += 1900;
     }      }
     unless ($wasdefined) {      unless ($wasdefined) {
  $sec=0;   if (($defhour) || ($defmin) || ($defsec)) {
  $min=0;      ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = 
    localtime(time);
       $year += 1900;
       $sec=($defsec?$defsec:0);
       $min=($defmin?$defmin:0);
       $hour=($defhour?$defhour:0);
    } elsif (!$includeempty) {
       $sec=0;
       $min=0;
       $hour=0;
    }
     }      }
     my $result = "\n<!-- $dname date setting form -->\n";      my $result = "\n<!-- $dname date setting form -->\n";
     $result .= <<ENDJS;      $result .= <<ENDJS;
Line 512  parameter setting wizard. Line 525  parameter setting wizard.
 ##############################################  ##############################################
 sub pjump_javascript_definition {  sub pjump_javascript_definition {
     my $Str = <<END;      my $Str = <<END;
     function pjump(type,dis,value,marker,ret,call) {      function pjump(type,dis,value,marker,ret,call,hour,min,sec) {
         parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)          parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
                  +"&value="+escape(value)+"&marker="+escape(marker)                   +"&value="+escape(value)+"&marker="+escape(marker)
                  +"&return="+escape(ret)                   +"&return="+escape(ret)
                  +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",                   +"&call="+escape(call)+"&name="+escape(dis)
                    +"&defhour="+escape(hour)+"&defmin="+escape(min)
                    +"&defsec="+escape(sec),"LONCAPAparms",
                  "height=350,width=350,scrollbars=no,menubar=no");                   "height=350,width=350,scrollbars=no,menubar=no");
     }      }
 END  END
Removed from v.1.107  
changed lines
  Added in v.1.110

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