[Phpgroupware-cvs] CVS: etemplate/inc class.date_widget.inc.php,1.10,1.11 class.uietemplate.inc.php,1.55,1.56

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.date_widget.inc.php class.uietemplate.inc.php 
Log Message:
fix for the date-widget of the today button and javascript


Index: class.date_widget.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.date_widget.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.date_widget.inc.php   13 Apr 2003 19:14:50 -0000      1.10
--- class.date_widget.inc.php   13 Apr 2003 21:47:03 -0000      1.11
***************
*** 122,126 ****
                                'i' => 'select-number'
                        );
!                       $options = array(
                                'H' => $this->timeformat == '12' ? ',0,12' : 
',0,23',
                                'i' => ',0,59,5'
--- 122,126 ----
                                'i' => 'select-number'
                        );
!                       $opts = array(
                                'H' => $this->timeformat == '12' ? ',0,12' : 
',0,23',
                                'i' => ',0,59,5'
***************
*** 138,142 ****
                                $dcell = $tpl->empty_cell();
                                $dcell['type'] = $types[$format[$n]];
!                               $dcell['size'] = $options[$format[$n]];
                                $dcell['name'] = $format[$n];
                                $dcell['help'] = lang($help[$format[$n]]).': 
'.$cell['help'];   // note: no lang on help, already done
--- 138,142 ----
                                $dcell = $tpl->empty_cell();
                                $dcell['type'] = $types[$format[$n]];
!                               $dcell['size'] = $opts[$format[$n]];
                                $dcell['name'] = $format[$n];
                                $dcell['help'] = lang($help[$format[$n]]).': 
'.$cell['help'];   // note: no lang on help, already done
***************
*** 144,157 ****
                                $row[$tpl->num2chrs($i)] = &$dcell;
                                unset($dcell);
! 
!                               if ($n == 2 && $options & 2)    // Today button
                                {
                                        $dcell = $tpl->empty_cell();
-                                       $dcell['type'] = 'button';
                                        $dcell['name'] = 'today';
!                                       $dcell['label'] = $type == 'Today';
                                        $dcell['help'] = 'sets today as date';
!                                       $dcell['onchange'] = 
"this.form.elements['$name"."[Y]'].value='".date('Y')."'; 
this.form.elements['$name"."[m]'].value='".date('n')."';this.form.elements['$name"."[d]'].value='".(0+date('d'))."';
 return false;";
!                                       $row[$tpl->num2chrs(3)] = &$dcell;
                                        unset($dcell);
                                }
--- 144,161 ----
                                $row[$tpl->num2chrs($i)] = &$dcell;
                                unset($dcell);
!                               
!                               if ($n == 2 && ($options & 2))  // Today button
                                {
                                        $dcell = $tpl->empty_cell();
                                        $dcell['name'] = 'today';
!                                       $dcell['label'] = 'Today';
                                        $dcell['help'] = 'sets today as date';
!                                       if (($js = $tmpl->java_script()))
!                                       {
!                                               $dcell['needed'] = True;        
// to get a button
!                                               $dcell['onchange'] = 
"this.form.elements['$name"."[Y]'].value='".date('Y')."'; 
this.form.elements['$name"."[m]'].value='".date('n')."';this.form.elements['$name"."[d]'].value='".(0+date('d'))."';
 return false;";
!                                       }
!                                       $dcell['type'] = $js ? 'button' : 
'checkbox';
!                                       $row[$tpl->num2chrs(++$i)] = &$dcell;
                                        unset($dcell);
                                }
***************
*** 194,202 ****
                function 
post_process($name,&$value,&$extension_data,&$loop,&$tmpl)
                {
                        if (!isset($value))
                        {
                                return False;
                        }
!                       if ($value['d'] || $value['H'] !== '' || $value['i'] 
!== '')
                        {
                                if ($value['d'])
--- 198,216 ----
                function 
post_process($name,&$value,&$extension_data,&$loop,&$tmpl)
                {
+                       //echo 
"date_widget::post_process('$name','$extension_data') value=<pre>"; 
print_r($value); echo "</pre>\n";
                        if (!isset($value))
                        {
                                return False;
                        }
!                       if ($value['today'])
!                       {
!                               $set = array('Y','m','d');
!                               foreach($set as $d)
!                               {
!                                       $value[$d] = date($d);
!                               }
!                       }
!                       if ($value['d'] || isset($value['H']) && $value['H'] 
!== '' || 
!                                          isset($value['i']) && $value['i'] 
!== '')
                        {
                                if ($value['d'])

Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** class.uietemplate.inc.php   13 Apr 2003 19:14:50 -0000      1.55
--- class.uietemplate.inc.php   13 Apr 2003 21:47:03 -0000      1.56
***************
*** 605,609 ****
                                case 'button':
                                        list($app) = explode('.',$this->name);
!                                       if ($this->java_script() && 
$cell['onchange'] != '') // use a link instead of a button
                                        {
                                                if ($cell['onchange'] == 1)
--- 605,609 ----
                                case 'button':
                                        list($app) = explode('.',$this->name);
!                                       if ($this->java_script() && 
$cell['onchange'] != '' && !$cell['needed']) // use a link instead of a button
                                        {
                                                if ($cell['onchange'] == 1)
***************
*** 857,861 ****
                                        $label = 
$this->html->label($label,$form_name,$accesskey[1]);
                                }
!                               if ($type == 'radio' || strstr($label,'%s'))    
// default for radio is label after the button
                                {
                                        $html = strstr($label,'%s') ? 
str_replace('%s',$html,$label) : $html.' '.$label;
--- 857,861 ----
                                        $label = 
$this->html->label($label,$form_name,$accesskey[1]);
                                }
!                               if ($type == 'radio' || $type == 'checkbox' || 
strstr($label,'%s'))     // default for radio is label after the button
                                {
                                        $html = strstr($label,'%s') ? 
str_replace('%s',$html,$label) : $html.' '.$label;
***************
*** 999,1002 ****
--- 999,1007 ----
                function java_script($consider_not_tested_as_enabled = True)
                {
+                       $ret = 
!!$GLOBALS['phpgw_info']['etemplate']['java_script'] ||
+                               $consider_not_tested_as_enabled && 
!isset($GLOBALS['phpgw_info']['etemplate']['java_script']);
+                       //echo 
"<p>java_script($consider_not_tested_as_enabled)='$ret', 
java_script='".$GLOBALS['phpgw_info']['etemplate']['java_script']."', 
isset(java_script)=".isset($GLOBALS['phpgw_info']['etemplate']['java_script'])."</p>\n";
+                       
+                       return $ret;
                        return 
!!$GLOBALS['phpgw_info']['etemplate']['java_script'] ||
                                $consider_not_tested_as_enabled &&