[Phpgroupware-cvs] CVS: infolog/inc class.uiinfolog.inc.php,1.37,1.38

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv10515

Modified Files:
        class.uiinfolog.inc.php 
Log Message:
some changes to be compatible with seek3r new template-system

Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** class.uiinfolog.inc.php     14 May 2002 13:19:53 -0000      1.37
--- class.uiinfolog.inc.php     1 Jun 2002 10:09:42 -0000       1.38
***************
*** 71,76 ****
  
                        $this->html = CreateObject('infolog.html');
!                       $this->template = CreateObject('phpgwapi.Template',
!                                                                               
                         $GLOBALS['phpgw']->common->get_tpl_dir('infolog'));
                        $this->categories = CreateObject('phpgwapi.categories');
                        $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
--- 71,76 ----
  
                        $this->html = CreateObject('infolog.html');
!                       $this->template = $GLOBALS['phpgw']->template;
!                       
$this->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('infolog'));   
// for the hooks to work
                        $this->categories = CreateObject('phpgwapi.categories');
                        $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
***************
*** 253,256 ****
--- 253,258 ----
                {
                        $headers['th_bg'] = 
$GLOBALS['phpgw_info']['theme']['th_bg'];
+                       $headers['row_off'] = 
$GLOBALS['phpgw_info']['theme']['row_off'];
+                       $headers['row_on'] = 
$GLOBALS['phpgw_info']['theme']['row_on'];
  
                        $fields = array(
***************
*** 336,340 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                        }
                        if ($action == '')
--- 338,341 ----
***************
*** 346,350 ****
--- 347,354 ----
  
                        $t->set_file(array( 'info_list_t' => 'list.tpl' ));
+                       
$t->set_block('info_list_t','projdetails','projdetailshandle');
+                       $t->set_block('info_list_t','info_headers');
                        $t->set_block('info_list_t','info_list','list');
+                       $t->set_block('info_list_t','get_list');
  
                        if ($cat_filter) $cat_id = $cat_filter;
***************
*** 423,426 ****
--- 427,431 ----
                        $t->set_var(h_lang_sub,lang('Sub'));
                        $t->set_var(h_lang_action,lang('Action'));
+                       $t->parse('info_headers','info_headers');
                        // -------------- end header declaration 
-----------------
  
***************
*** 445,450 ****
                        // ==========================================
  
-                       
$t->set_block('info_list_t','projdetails','projdetailshandle');
- 
                        switch ($action)
                        {
--- 450,453 ----
***************
*** 452,456 ****
                                        $t->set_var( $this->infoHeaders(  ));
                                        $t->set_var( $this->formatInfo( 
$action_id ));
!                                       
$t->parse('projdetailshandle','projdetails',True);
                                        break;
                          case 'addr':
--- 455,459 ----
                                        $t->set_var( $this->infoHeaders(  ));
                                        $t->set_var( $this->formatInfo( 
$action_id ));
!                                       
$t->parse('projdetails','projdetailshandle');
                                        break;
                          case 'addr':
***************
*** 495,499 ****
                        if (intval($for_include) == 2)
                        {
!                               
$t->set_block('info_list_t','info_headers','headershandle');
                        }
                        while (list($id,$parent) = each($ids))
--- 498,502 ----
                        if (intval($for_include) == 2)
                        {
!                               $t->set_var('info_headers','');
                        }
                        while (list($id,$parent) = each($ids))
***************
*** 560,564 ****
                          }
  
!                         $t->parse('list','info_list',True);
                          // -------------- end record declaration 
------------------------
                        }
--- 563,567 ----
                          }
  
!                         $t->parse('info_list','list',True);
                          // -------------- end record declaration 
------------------------
                        }
***************
*** 577,585 ****
                        if (intval($for_include) == 2)
                        {
!                               return $t->fp('out','info_list_t',true);
                        }
                        else
                        {
!                               $t->pfp('out','info_list_t',true);
                        }
                }
--- 580,588 ----
                        if (intval($for_include) == 2)
                        {
!                               return $t->fp('out','get_list',true);
                        }
                        else
                        {
!                               $t->pfp('out','get_list',true);
                        }
                }
***************
*** 649,653 ****
                        }
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $t->set_file(array('info_add_file' => 'add_file.tpl'));
--- 652,655 ----
***************
*** 870,884 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
!                       $t->set_file(array('info_edit' => 'form.tpl'));
! 
!                       // 
====================================================================
!                       // create two seperate blocks, addblock will be cut off 
from template
!                       // editblock contains the buttons and forms for edit
!                       // 
====================================================================
!                       $t->set_block('info_edit', 'add', 'addhandle');
!                       $t->set_block('info_edit', 'edit', 'edithandle');
!                       $t->set_block('info_edit', 'subpro', 'subprohandle');
  
                        if (is_array($error))
--- 872,880 ----
  
                        $GLOBALS['phpgw']->common->phpgw_header();
  
!                       $t->set_file(array('info_edit_t' => 'form.tpl'));
!                       $t->set_block('info_edit_t','info_edit');
!                       $t->set_block('info_edit_t','add');
!                       $t->set_block('info_edit_t','edit');
  
                        if (is_array($error))
***************
*** 891,894 ****
--- 887,891 ----
                                case 'sp':
                                        $info_action = 'InfoLog - New 
Subproject';
+                                       $t->set_block('info_edit_t', 'subpro');
                                        break;
                                case 'new': case 'addr': case 'proj': case 
'event':
***************
*** 898,902 ****
                                        break;
                                default:
!                                       $info_action = 'InfoLog - Edit'; break;
                        }
                        $t->set_var('lang_info_action',lang($info_action) .
--- 895,901 ----
                                        break;
                                default:
!                                       $info_action = 'InfoLog - Edit';
!                                       $is_edit = True;
!                                       break;
                        }
                        $t->set_var('lang_info_action',lang($info_action) .
***************
*** 1003,1011 ****
                                
$t->set_var('delete_button',$html->submit_button('delete','Delete'));
                        }
!                       $t->set_var('edithandle','');
!                       $t->set_var('addhandle','');
!                       $t->set_var('subprohandle','');
                        $t->pfp('out','info_edit');
-                       $t->pfp('edithandle','edit');
                }
  
--- 1002,1007 ----
                                
$t->set_var('delete_button',$html->submit_button('delete','Delete'));
                        }
!                       $t->parse('buttons',$is_edit ? 'edit' : 'add');
                        $t->pfp('out','info_edit');
                }
  
***************
*** 1039,1043 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
  
                                $t->set_file(array( 'info_delete' => 
'delete.tpl' ));
--- 1035,1038 ----
***************
*** 1108,1114 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
!                       $this->template->set_file(array('info_admin' => 
'admin.tpl'));
  
                        $this->template->set_var(Array(
--- 1103,1110 ----
  
                        $GLOBALS['phpgw']->common->phpgw_header();
  
!                       $this->template->set_file(array('info_admin_t' => 
'admin.tpl'));
!                       $this->template->set_block('info_admin_t', 
'admin_line');
!                       $this->template->set_block('info_admin_t', 
'info_admin');
  
                        $this->template->set_var(Array(
***************
*** 1123,1127 ****
                                'lang_ip'     => lang('reg. expr. for local 
IP\'s<br>eg. ^192\\.168\\.1\\.')
                        ));
-                       $this->template->set_block('info_admin', 'admin_line', 
'admin_linehandle');
  
                        $i = 0; @reset($this->bo->link_pathes);
--- 1119,1122 ----
***************
*** 1135,1139 ****
                                        'val_ip'    => 
$this->html->input("ip[$i]",$this->bo->send_file_ips[$valid])
                                ));
!                               
$this->template->parse('admin_linehandle','admin_line',True);
                                ++$i;
                        } while ($valid);
--- 1130,1134 ----
                                        'val_ip'    => 
$this->html->input("ip[$i]",$this->bo->send_file_ips[$valid])
                                ));
!                               
$this->template->parse('admin_lines','admin_line',True);
                                ++$i;
                        } while ($valid);
***************
*** 1170,1178 ****
                        }
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $t = $this->template; $html = $this->html;
  
!                       $t->set_file(array('info_prefs' => 'preferences.tpl'));
  
                        $vars = Array(
--- 1165,1174 ----
                        }
                        $GLOBALS['phpgw']->common->phpgw_header();
  
                        $t = $this->template; $html = $this->html;
  
!                       $t->set_file(array('info_prefs_t' => 
'preferences.tpl'));
!                       $t->set_block('info_prefs_t','pref_line');
!                       $t->set_block('info_prefs_t','info_prefs');
  
                        $vars = Array(
***************
*** 1185,1190 ****
                        $t->set_var($vars);
  
-                       $t->set_block('info_prefs', 'pref_line', 
'pref_linehandle');
- 
                        while (list($pref,$lang) = each($prefs))
                        {
--- 1181,1184 ----
***************
*** 1205,1209 ****
                                                                
$GLOBALS['phpgw_info']['user']['preferences']['infolog'][$pref]));
                                }
!                               $t->parse('pref_linehandle','pref_line',True);
                        }
                        $t->pfp('out','info_prefs');
--- 1199,1203 ----
                                                                
$GLOBALS['phpgw_info']['user']['preferences']['infolog'][$pref]));
                                }
!                               $t->parse('pref_lines','pref_line',True);
                        }
                        $t->pfp('out','info_prefs');