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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.65 and 1.67

version 1.65, 2004/04/16 15:06:56 version 1.67, 2004/04/23 17:49:25
Line 219  The method used to restrict user input w Line 219  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) = @_;
     if (! defined($state) || $state ne 'disabled') {      if (! defined($state) || $state ne 'disabled') {
         $state = '';          $state = '';
     }      }
       if (! defined($no_hh_mm_ss)) {
           $no_hh_mm_ss = 0;
       }
     if (! defined($currentvalue) || $currentvalue eq 'now') {      if (! defined($currentvalue) || $currentvalue eq 'now') {
  unless ($includeempty) {   unless ($includeempty) {
     $currentvalue = time;      $currentvalue = time;
Line 305  ENDJS Line 309  ENDJS
     $result .= "  <nobr><select name=\"$dname\_month\" ".$special.' '.      $result .= "  <nobr><select name=\"$dname\_month\" ".$special.' '.
         $state.' '.          $state.' '.
         "onChange=\"javascript:$dname\_checkday()\" >\n";          "onChange=\"javascript:$dname\_checkday()\" >\n";
       # Month
     my @Months = qw/January February  March     April   May      June       my @Months = qw/January February  March     April   May      June 
                     July    August    September October November December/;                      July    August    September October November December/;
     # Pad @Months with a bogus value to make indexing easier      # Pad @Months with a bogus value to make indexing easier
Line 316  ENDJS Line 321  ENDJS
         $result .= "> ".&mt($Months[$m])." </option>\n";          $result .= "> ".&mt($Months[$m])." </option>\n";
     }      }
     $result .= "  </select>\n";      $result .= "  </select>\n";
       # Day
     $result .= "  <input type=\"text\" name=\"$dname\_day\" ".$state.' '.      $result .= "  <input type=\"text\" name=\"$dname\_day\" ".$state.' '.
             "value=\"$mday\" size=\"3\" ".$special.' '.              "value=\"$mday\" size=\"3\" ".$special.' '.
             "onChange=\"javascript:$dname\_checkday()\" />\n";              "onChange=\"javascript:$dname\_checkday()\" />\n";
       # Year
     $result .= "  <input type=\"year\" name=\"$dname\_year\" ".$state.' '.      $result .= "  <input type=\"year\" name=\"$dname\_year\" ".$state.' '.
             "value=\"$year\" size=\"5\" ".$special.' '.              "value=\"$year\" size=\"5\" ".$special.' '.
             "onChange=\"javascript:$dname\_checkday()\" />\n";              "onChange=\"javascript:$dname\_checkday()\" />\n";
     $result .= "&nbsp;&nbsp;";      $result .= "&nbsp;&nbsp;";
     $result .= "  <select name=\"$dname\_hour\" ".$special." ".$state.' '.">\n";      if (! $no_hh_mm_ss) {
     if ($includeempty) { $result.="<option value=''></option>"; }          # Hours
     for (my $h = 0;$h<24;$h++) {          $result .= "  <select name=\"$dname\_hour\" ".$special." ".$state.' '.
         $result .= "      <option value=\"$h\" ";              ">\n";
         $result .= "selected " if (defined($hour) && $hour == $h);          if ($includeempty) { $result.="<option value=''></option>"; }
         $result .= "> ";          for (my $h = 0;$h<24;$h++) {
  my $timest='';              $result .= "      <option value=\"$h\" ";
         if ($h == 0) {              $result .= "selected " if (defined($hour) && $hour == $h);
             $timest .= "12 am";              $result .= "> ";
         } elsif($h == 12) {              my $timest='';
             $timest .= "12 noon";              if ($h == 0) {
         } elsif($h < 12) {                  $timest .= "12 am";
             $timest .= "$h am";              } elsif($h == 12) {
         } else {                  $timest .= "12 noon";
             $timest .= $h-12 ." pm";              } elsif($h < 12) {
         }                  $timest .= "$h am";
  $timest=&mt($timest);              } else {
         $result .= $timest." </option>\n";                  $timest .= $h-12 ." pm";
     }               }
     $result .= "  </select>\n";              $timest=&mt($timest);
     $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".$special.' '.              $result .= $timest." </option>\n";
         $state.' '.          } 
         "value=\"$min\" size=\"3\" /> m\n";          $result .= "  </select>\n";
     $result .= "  <input type=\"text\" name=\"$dname\_second\" ".$special.' '.          $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".
         $state.' '.              $special.' '.
         "value=\"$sec\" size=\"3\" /> s\n";              $state.' '.
               "value=\"$min\" size=\"3\" /> m\n";
           $result .= "  <input type=\"text\" name=\"$dname\_second\" ".
               $special.' '.
               $state.' '.
               "value=\"$sec\" size=\"3\" /> s\n";
       }
     $result .= "<a href=\"javascript:$dname\_opencalendar()\">".      $result .= "<a href=\"javascript:$dname\_opencalendar()\">".
     &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";      &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";
     return $result;      return $result;
Line 393  sub get_date_from_form { Line 406  sub get_date_from_form {
             $sec = $tmpsec;              $sec = $tmpsec;
         }          }
  if (!defined($tmpsec) || $tmpsec eq '') { $sec = 0; }   if (!defined($tmpsec) || $tmpsec eq '') { $sec = 0; }
       } else {
           $sec = 0;
     }      }
     if (defined($ENV{'form.'.$dname.'_minute'})) {      if (defined($ENV{'form.'.$dname.'_minute'})) {
         my $tmpmin = $ENV{'form.'.$dname.'_minute'};          my $tmpmin = $ENV{'form.'.$dname.'_minute'};
Line 400  sub get_date_from_form { Line 415  sub get_date_from_form {
             $min = $tmpmin;              $min = $tmpmin;
         }          }
  if (!defined($tmpmin) || $tmpmin eq '') { $min = 0; }   if (!defined($tmpmin) || $tmpmin eq '') { $min = 0; }
       } else {
           $min = 0;
     }      }
     if (defined($ENV{'form.'.$dname.'_hour'})) {      if (defined($ENV{'form.'.$dname.'_hour'})) {
         my $tmphour = $ENV{'form.'.$dname.'_hour'};          my $tmphour = $ENV{'form.'.$dname.'_hour'};
         if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) {          if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) {
             $hour = $tmphour;              $hour = $tmphour;
         }          }
       } else {
           $hour = 0;
     }      }
     if (defined($ENV{'form.'.$dname.'_day'})) {      if (defined($ENV{'form.'.$dname.'_day'})) {
         my $tmpday = $ENV{'form.'.$dname.'_day'};          my $tmpday = $ENV{'form.'.$dname.'_day'};
Line 952  returns: nothing Line 971  returns: nothing
         #          #
         # The first one should be the course, I guess.          # The first one should be the course, I guess.
  if (!defined($menulink)) { $menulink=1; }   if (!defined($menulink)) { $menulink=1; }
         if ($menulink && exists($ENV{'request.course.id'})) {          if ($menulink && exists($ENV{'request.course.id'}) && $ENV{'request.course.id'} ne '') {
             my $cid = $ENV{'request.course.id'};              my $cid = $ENV{'request.course.id'};
             unshift(@Crumbs,{              unshift(@Crumbs,{
                              href=>'/adm/menu',                               href=>'/adm/menu',
Removed from v.1.65  
changed lines
  Added in v.1.67

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