[Phpgroupware-cvs] CVS: calendar/inc hook_home.inc.php,1.36,1.37 hook_home_day.inc.php,1.2,1.3 hook_home_month.inc.php,1.2,1.3 hook_home_week.inc.php,1.2,1.3 hook_home_year.inc.php,1.2,1.3

[Bettina Gille <address@hidden>]

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

Modified Files:
        hook_home.inc.php hook_home_day.inc.php 
        hook_home_month.inc.php hook_home_week.inc.php 
        hook_home_year.inc.php 
Log Message:
update hook_home

Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** hook_home.inc.php   3 Oct 2002 00:23:10 -0000       1.36
--- hook_home.inc.php   26 Oct 2002 00:26:51 -0000      1.37
***************
*** 37,42 ****
                $GLOBALS['g_day'] = substr($GLOBALS['date'],6,2);
                $GLOBALS['owner'] = 
$GLOBALS['phpgw_info']['user']['account_id'];
-               $GLOBALS['css'] = "\n".'<STYLE 
type="text/css">'."\n".'<!--'."\n"
-                       . 
ExecMethod('calendar.uicalendar.css').'-->'."\n".'</style>';
  
                $page_ = 
explode('.',$GLOBALS['phpgw_info']['user']['preferences']['calendar']['defaultcalendar']);
--- 37,40 ----
***************
*** 55,90 ****
                
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php');
                
- 
-               $title = '<font color="#FFFFFF">'.lang('Calendar').'</font>';
-               
-               $portalbox = CreateObject('phpgwapi.listbox',
-                       Array(
-                               'title' => $title,
-                               'width' => '100%',
-                               'outerborderwidth'      => '0',
-                               'header_background_image'       => 
$GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler')
-                       )
-               );
- 
                $app_id = $GLOBALS['phpgw']->applications->name2id('calendar');
                $GLOBALS['portal_order'][] = $app_id;
-               $var = Array(
-                       'up'    => Array('url'  => '/set_box.php', 'app'        
=> $app_id),
-                       'down'  => Array('url'  => '/set_box.php', 'app'        
=> $app_id),
-                       'close' => Array('url'  => '/set_box.php', 'app'        
=> $app_id),
-                       'question'      => Array('url'  => '/set_box.php', 
'app'        => $app_id),
-                       'edit'  => Array('url'  => '/set_box.php', 'app'        
=> $app_id)
-               );
- 
-               while(list($key,$value) = each($var))
-               {
-                       $portalbox->set_controls($key,$value);
-               }
- 
-               $portalbox->data = Array();
  
!               $GLOBALS['phpgw']->template->set_var('phpgw_body', "\n".'<!-- 
BEGIN Calendar info 
-->'."\n".$portalbox->draw($GLOBALS['extra_data'])."\n".'<!-- END Calendar info 
-->'."\n",True);
!               unset($cal);
!       } 
!       flush();
  ?>
--- 53,62 ----
                
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php');
                
                $app_id = $GLOBALS['phpgw']->applications->name2id('calendar');
                $GLOBALS['portal_order'][] = $app_id;
  
!               $GLOBALS['phpgw']->portalbox->set_params(array('app_id' => 
$app_id,
!                                                                               
                                'title' => lang('calendar')));
!               $GLOBALS['phpgw']->portalbox->draw($GLOBALS['extra_data'])
!       }
  ?>

Index: hook_home_day.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home_day.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hook_home_day.inc.php       28 Sep 2002 20:01:43 -0000      1.2
--- hook_home_day.inc.php       26 Oct 2002 00:26:51 -0000      1.3
***************
*** 24,28 ****
        unset($d1);
  
!       $GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table 
border="0" cols="3"><tr><td align="center" width="35%" valign="top">'
                . ExecMethod('calendar.uicalendar.mini_calendar',
                        Array(
--- 24,28 ----
        unset($d1);
  
!       $GLOBALS['extra_data'] = '<td>'."\n".'<table border="0" 
cols="3"><tr><td align="center" width="35%" valign="top">'
                . ExecMethod('calendar.uicalendar.mini_calendar',
                        Array(

Index: hook_home_month.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home_month.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hook_home_month.inc.php     28 Sep 2002 20:01:43 -0000      1.2
--- hook_home_month.inc.php     26 Oct 2002 00:26:51 -0000      1.3
***************
*** 24,28 ****
        unset($d1);
  
!       $GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table 
border="0" cols="3"><tr><td align="center" width="100%" valign="top">'
                . ExecMethod('calendar.uicalendar.get_month')
                .'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";
--- 24,28 ----
        unset($d1);
  
!       $GLOBALS['extra_data'] = '<td>'."\n".'<table border="0" 
cols="3"><tr><td align="center" width="100%" valign="top">'
                . ExecMethod('calendar.uicalendar.get_month')
                .'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";

Index: hook_home_week.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home_week.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hook_home_week.inc.php      28 Sep 2002 20:01:43 -0000      1.2
--- hook_home_week.inc.php      26 Oct 2002 00:26:51 -0000      1.3
***************
*** 24,28 ****
        unset($d1);
  
!       $GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table 
border="0" cols="3"><tr><td align="center" width="100%" valign="top">'
                . ExecMethod('calendar.uicalendar.get_week')
                .'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";
--- 24,28 ----
        unset($d1);
  
!       $GLOBALS['extra_data'] = '<td>'."\n".'<table border="0" 
cols="3"><tr><td align="center" width="100%" valign="top">'
                . ExecMethod('calendar.uicalendar.get_week')
                .'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";

Index: hook_home_year.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home_year.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hook_home_year.inc.php      28 Sep 2002 20:01:43 -0000      1.2
--- hook_home_year.inc.php      26 Oct 2002 00:26:51 -0000      1.3
***************
*** 24,28 ****
        unset($d1);
  
!       $GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table 
border="0" cols="3"><tr><td align="center" width="100%" valign="top">'
                . ExecMethod('calendar.uicalendar.get_year')
                .'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";
--- 24,28 ----
        unset($d1);
  
!       $GLOBALS['extra_data'] = '<td>'."\n".'<table border="0" 
cols="3"><tr><td align="center" width="100%" valign="top">'
                . ExecMethod('calendar.uicalendar.get_year')
                .'</td>'."\n".'</tr>'."\n".'</table>'."\n".'</td>'."\n";