loncom/interface/lonhtmlcommon.pm - diff

Return to lonhtmlcommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.362 and 1.363

-version 1.362, 2015/05/05 21:45:55
+version 1.363, 2015/05/10 01:05:50
  Line 484  the date/time fields are left empty.
  =item $state
  Specifies the initial state of the form elements.  Either 'disabled' or empty.
- Defaults to empty, which indiciates the form elements are not disabled.
+ Defaults to empty, which indicates the form elements are not disabled.
+ =item $no_hh_mm_ss
+ If true, text boxes for hours, minutes and seconds are omitted.
+ =item $defhour
+ Default value for hours (a default of 0 is used otherwise).
+ =item $defmin
+ Default value for minutes (a default of 0 is used otherwise).
+ =item defsec
+ Default value for seconds (a default of 0 is used otherwise).
+ =item $nolink
+ If true, a "Select calendar" link (to pop-up a calendar) is not displayed
+ to the right of the items.
+ =item $no_mm_ss
+ If true, text boxes for minutes and seconds are omitted.
+ =item $no_ss
+ If true, text boxes for seconds are omitted.
  =back
- Line 500  The method used to restrict user input w
+ Line 529  The method used to restrict user input w
  ##############################################
  sub date_setter {
      my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
-         $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_;
+         $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink,$no_mm_ss,$no_ss) = @_;
      my $now = time;
      my $tzname;
- Line 653  ENDJS
+ Line 682  ENDJS
          $result .= &mt('[_1] [_2] [_3] ',
                         $monthselector,$dayselector,$yearselector).
                     $tzone;
-         if (!$nolink) {
+     } elsif ($no_mm_ss) {
-             $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
+         $result .= &mt('[_1] [_2] [_3] [_4]',
-         }
+                       $monthselector,$dayselector,$yearselector,
+                       $hourselector).
+                    $tzone;
+     } elsif ($no_ss) {
+         $result .= &mt('[_1] [_2] [_3] [_4] [_5]m',
+                       $monthselector,$dayselector,$yearselector,
+                       $hourselector,$minuteselector).
+                    $tzone;
      } else {
          $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',
                        $monthselector,$dayselector,$yearselector,
                        $hourselector,$minuteselector,$secondselector).
                     $tzone;
-         if (!$nolink) {
+     }
-             $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
+     if (!$nolink) {
-         }
+         $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
      }
      $result .= "</span>\n<!-- end $dname date setting form -->\n";
      return $result;

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

Removed from v.1.362
changed lines
	Added in v.1.363