[Phpgroupware-cvs] CVS: phpgwapi/inc class.Template.inc.php,1.27,1.28 class.listbox.inc.php,1.8,1.9 class.portalbox.inc.php,1.15,1.16

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv5932

Modified Files:
        class.Template.inc.php class.listbox.inc.php 
        class.portalbox.inc.php 
Log Message:
update portal plus tpl

Index: class.Template.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.Template.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.Template.inc.php      28 Sep 2002 20:01:44 -0000      1.27
--- class.Template.inc.php      6 Oct 2002 16:18:03 -0000       1.28
***************
*** 138,141 ****
--- 138,147 ----
                        preg_match_all($reg, $str, $m);
                        $this->set_var($name, $m[1][0]);
+                       // ralfbecker: readded for compatibility with old way 
to set blocks
+                       
$this->set_var($parent,preg_replace($reg,'{'.$name.'}',$str));
+                       if ($name != $handle)
+                       {
+                               $this->set_var($handle, $m[1][0]);
+                       }
                }
  

Index: class.listbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.listbox.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.listbox.inc.php       5 Oct 2002 23:40:51 -0000       1.8
--- class.listbox.inc.php       6 Oct 2002 16:18:03 -0000       1.9
***************
*** 44,51 ****
                function listbox($param)
                {
-                       $this->setvar('outerwidth',300);
-                       $this->setvar('innerwidth',300);
-                       $this->setvar('width',300);
- 
                        @reset($param);
                        while(list($key,$value) = each($param))
--- 44,47 ----
***************
*** 58,62 ****
                        }
                        $this->portalbox($param['title']);
!                       //$this->start_template();
                }
  
--- 54,76 ----
                        }
                        $this->portalbox($param['title']);
! 
!                       if($param['app_id'])
!                       {
!                               $app_id = $this->getvar('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))
!                               {
!                                       $this->set_controls($key,$value);
!                               }
!                       }
                }
  

Index: class.portalbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.portalbox.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.portalbox.inc.php     5 Oct 2002 23:40:51 -0000       1.15
--- class.portalbox.inc.php     6 Oct 2002 16:18:03 -0000       1.16
***************
*** 28,36 ****
  
                var $app_name;
!               var $outerwidth;
!               var $width;
!               var $innerwidth;
                var $controls;
-               var $header_background_image;
                var $up;
                var $down;
--- 28,33 ----
  
                var $app_name;
!               var $app_id;
                var $controls;
                var $up;
                var $down;
***************
*** 40,44 ****
  
                var $output;
!               var $data = Array();
  
                // Textual variables
--- 37,41 ----
  
                var $output;
!               var $data = array();
  
                // Textual variables
***************
*** 86,90 ****
                function start_template($extra = '')
                {
!                       if ($extra)
                        {
                                
$GLOBALS['phpgw']->xslttpl->add_file(array('portal',$GLOBALS['phpgw']->common->get_tpl_dir($this->getvar('app_name'),'default')
 . SEP . 'extrabox'));
--- 83,87 ----
                function start_template($extra = '')
                {
!                       if ($extra && $this->getvar('app_name'))
                        {
                                
$GLOBALS['phpgw']->xslttpl->add_file(array('portal',$GLOBALS['phpgw']->common->get_tpl_dir($this->getvar('app_name'),'default')
 . SEP . 'extrabox'));
***************
*** 97,104 ****
                        $this->output = array
                        (
-                               'outer_width'                           => 
$this->getvar('width'),
                                'title'                                         
=> $this->getvar('title'),
!                               'inner_width'                           => 
$this->getvar('width'),
!                               'header_background_image'       => 
$this->getvar('header_background_image')
                        );
                }
--- 94,99 ----
                        $this->output = array
                        (
                                'title'                                         
=> $this->getvar('title'),
!                               'header_background_image'       => 
$GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler.png')
                        );
                }
***************
*** 118,124 ****
                        if($data=='' && !count($this->data))
                        {
!                               $data = ' ';
                        }
- 
                        $this->output['extrabox'] = $data;
                }
--- 113,118 ----
                        if($data=='' && !count($this->data))
                        {
!                               $data = '';
                        }
                        $this->output['extrabox'] = $data;
                }
***************
*** 128,132 ****
                        if($data=='' && !count($this->data))
                        {
!                               $data = ' ';
                        }
                        $this->output['xextrabox'] = $data;
--- 122,126 ----
                        if($data=='' && !count($this->data))
                        {
!                               $data = '';
                        }
                        $this->output['xextrabox'] = $data;