[Phpgroupware-cvs] CVS: calendar/inc class.uipreferences.inc.php,1.2.2.1,1.2.2.2

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.uipreferences.inc.php 
Log Message:
Cleanup to use a single preference template.

Index: class.uipreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uipreferences.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** class.uipreferences.inc.php 17 Apr 2002 01:33:58 -0000      1.2.2.1
--- class.uipreferences.inc.php 28 Apr 2002 19:05:50 -0000      1.2.2.2
***************
*** 34,38 ****
                {
                        $GLOBALS['phpgw']->nextmatchs = 
CreateObject('phpgwapi.nextmatchs');
!                       $this->template = $GLOBALS['phpgw']->template;
                        $this->theme = $GLOBALS['phpgw_info']['theme'];
                        $this->bo = CreateObject('calendar.bopreferences');
--- 34,38 ----
                {
                        $GLOBALS['phpgw']->nextmatchs = 
CreateObject('phpgwapi.nextmatchs');
!                       $this->template = 
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('calendar'));
                        $this->theme = $GLOBALS['phpgw_info']['theme'];
                        $this->bo = CreateObject('calendar.bopreferences');
***************
*** 49,57 ****
                        $this->template->set_file(
                           Array(
!                          'pref'      =>'pref.tpl',
!                          'pref_colspan' =>'pref_colspan.tpl',
!                          'pref_list' =>'pref_list.tpl'
                           )
                        );
  
                        $var = Array(
--- 49,59 ----
                        $this->template->set_file(
                           Array(
!                          'pref_temp'      =>'pref.tpl'
                           )
                        );
+ 
+                       $this->template->set_block('pref_temp','pref','pref');
+                       
$this->template->set_block('pref_temp','pref_colspan','pref_colspan');
+                       
$this->template->set_block('pref_temp','pref_list','pref_list');
  
                        $var = Array(