[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.33,1.66.2.34

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv14956

Modified Files:
      Tag: Version-0_9_14-branch
        class.uicalendar.inc.php 
Log Message:
- added a cancel button to edit_status and the return to the caller-pager
- removed Week-number on the 1. of the month in week-view

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.33
retrieving revision 1.66.2.34
diff -C2 -r1.66.2.33 -r1.66.2.34
*** class.uicalendar.inc.php    31 Oct 2002 00:57:23 -0000      1.66.2.33
--- class.uicalendar.inc.php    31 Oct 2002 02:00:24 -0000      1.66.2.34
***************
*** 1311,1315 ****
                        
$this->bo->set_status(intval($GLOBALS['HTTP_GET_VARS']['cal_id']),intval($GLOBALS['HTTP_GET_VARS']['action']));
  
!                       Header('Location: '.$this->page('',''));
                        $GLOBALS['phpgw']->common->phpgw_exit();
                }
--- 1311,1322 ----
                        
$this->bo->set_status(intval($GLOBALS['HTTP_GET_VARS']['cal_id']),intval($GLOBALS['HTTP_GET_VARS']['action']));
  
!                       if ($this->bo->return_to)
!                       {
!                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to));
!                       }
!                       else
!                       {
!                               Header('Location: '.$this->page('','')); 
!                       }
                        $GLOBALS['phpgw']->common->phpgw_exit();
                }
***************
*** 3794,3797 ****
--- 3801,3815 ----
                                $str .= 
'<td>'.$p->fp('out','form_button').'</td>'."\n";
                        }
+                       if ($this->bo->return_to)
+                       {
+                               $var = Array(
+                                       'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to),
+                                       'action_text_button'    => 
lang('cancel'),
+                                       'action_confirm_button' => '',
+                                       'action_extra_field'    => ''
+                               );
+                               $p->set_var($var);
+                               $str .= 
'<td>'.$p->fp('out','form_button').'</td>'."\n";
+                       }
                        $str = 
'<td><b>'.$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner).":</b></td>\n".$str;
  
***************
*** 4182,4186 ****
                                }
                                $week = '';
!                               if (!$j || ($j && substr($date,6,2) == '01'))
                                {
                                        $week = lang('week').' 
'.(int)((date('z',($startdate+(24*3600*4)))+7)/7);
--- 4200,4204 ----
                                }
                                $week = '';
!                               if (!$j || (!$weekly && $j && substr($date,6,2) 
== '01'))
                                {
                                        $week = lang('week').' 
'.(int)((date('z',($startdate+(24*3600*4)))+7)/7);