[Phpgroupware-cvs] CVS: etemplate/inc class.date_widget.inc.php,1.11,1.12

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv16066

Modified Files:
        class.date_widget.inc.php 
Log Message:
1min steps for minutes via parameter or fallback vi value is not in 5min steps

Index: class.date_widget.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.date_widget.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.date_widget.inc.php   13 Apr 2003 21:47:03 -0000      1.11
--- class.date_widget.inc.php   14 Apr 2003 21:59:24 -0000      1.12
***************
*** 17,21 ****
        @author ralfbecker
        @abstract widget that reads a date and/or time 
!       @param Options/$cell['size'] = $format[,$year_no_select], $format: 
''=timestamp or eg. 'Y-m-d' for 2002-12-31
        @discussion This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
        */
--- 17,24 ----
        @author ralfbecker
        @abstract widget that reads a date and/or time 
!       @param Options/$cell['size'] = $format[,$options], 
!       @param $format: ''=timestamp or eg. 'Y-m-d H:i' for 2002-12-31 23:59
!       @param $options: &1 = year is int-input not selectbox, &2 = show a 
[Today] button, \
!               &4 = 1min steps for time (default is 5min, with fallback to 
1min if value is not in 5min-steps)
        @discussion This widget is independent of the UI as it only uses 
etemplate-widgets and has therefor no render-function
        */
***************
*** 124,128 ****
                        $opts = array(
                                'H' => $this->timeformat == '12' ? ',0,12' : 
',0,23',
!                               'i' => ',0,59,5'
                        );
                        $help = array(
--- 127,131 ----
                        $opts = array(
                                'H' => $this->timeformat == '12' ? ',0,12' : 
',0,23',
!                               'i' => $value['i'] % 5 || $options & 4 ? 
',0,59' : ',0,59,5' // 5min steps, if ok with value
                        );
                        $help = array(
***************
*** 141,144 ****
--- 144,151 ----
                                $dcell['name'] = $format[$n];
                                $dcell['help'] = lang($help[$format[$n]]).': 
'.$cell['help'];   // note: no lang on help, already done
+                               if ($n == 4)
+                               {
+                                       $dcell['label'] = ':';  // put a : 
between hour and minute
+                               }
                                $dcell['no_lang'] = True;
                                $row[$tpl->num2chrs($i)] = &$dcell;