[Phpgroupware-cvs] phpgwapi/inc class.listbox.inc.php class.portal...

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/12/27 12:24:48

Modified files:
        inc            : class.listbox.inc.php class.portalbox.inc.php 

Log message:
        some changes to the 'portal' markup and css, make it more css based, 
needs to be rolled out for other template sets

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.listbox.inc.php?cvsroot=phpgwapi&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.portalbox.inc.php?cvsroot=phpgwapi&r1=1.34&r2=1.35

Patches:
Index: class.listbox.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.listbox.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.listbox.inc.php       20 Dec 2006 10:48:27 -0000      1.21
+++ class.listbox.inc.php       27 Dec 2006 12:24:48 -0000      1.22
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.listbox.inc.php,v 1.21 2006/12/20 10:48:27 
skwashd Exp $
+       * @version $Id: class.listbox.inc.php,v 1.22 2006/12/27 12:24:48 
skwashd Exp $
        */
 
        CreateObject('phpgwapi.portalbox');
@@ -41,13 +41,17 @@
                        $this->setvar('innerwidth',300);
                        $this->setvar('width',300);
 
-                       @reset($param);
-                       while(list($key,$value) = each($param))
+                       if ( !is_array($param) )
+                       {
+                               $param = array();
+                       }
+
+                       foreach ( $param as $key => $value )
                        {
                                if($key != 'title' && $key != 'primary' && $key 
!= 'secondary' && $key != 'tertiary')
                                {
 //echo 'Setting '.$key.':'.$value."<br>\n";
-                                       $this->setvar($key,$value);
+                                       $this->setvar($key, $value);
                                }
                        }
                        $this->portalbox($param['title'], $param['primary'], 
$param['secondary'], $param['tertiary']);

Index: class.portalbox.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.portalbox.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- class.portalbox.inc.php     20 Dec 2006 10:48:27 -0000      1.34
+++ class.portalbox.inc.php     27 Dec 2006 12:24:48 -0000      1.35
@@ -6,7 +6,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.portalbox.inc.php,v 1.34 2006/12/20 10:48:27 
skwashd Exp $
+       * @version $Id: class.portalbox.inc.php,v 1.35 2006/12/27 12:24:48 
skwashd Exp $
        */
 
        /**
@@ -19,15 +19,9 @@
        {
                //Set up the Object, reserving memory space for variables
 
-               var $outerwidth;
-               var $outerbordercolor;
-               var $outerborderwidth = 1;
-               var $titlebgcolor;
                var $width;
                var $innerwidth;
-               var $innerbgcolor;
                var $controls;
-               var $header_background_image;
                var $classname;
                var $up;
                var $down;
@@ -80,31 +74,25 @@
                        // echo 'After SetVar Title = 
'.$this->getvar('title')."<br>\n";
                        $this->setvar('titlebgcolor',$primary);
                        $this->setvar('innerbgcolor',$secondary);
-                       $this->setvar('outerbordercolor',$tertiary);
                }
 
                function start_template()
                {
                        $this->p = 
createObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('home'));
-                       $this->p->set_file('PORTAL', 'portal.tpl');
+                       $this->p->set_file('portal', 'portal.tpl');
 
-                       $this->p->set_block('PORTAL','portal_box','portal_box');
-                       $this->p->set_block('PORTAL','portal_row','portal_row');
-                       
$this->p->set_block('PORTAL','portal_listbox_header','portal_listbox_header');
-                       
$this->p->set_block('PORTAL','portal_listbox_link','portal_listbox_link');
-                       
$this->p->set_block('PORTAL','portal_listbox_footer','portal_listbox_footer');
-                       
$this->p->set_block('PORTAL','portal_control','portal_control');
-                       $this->p->set_block('PORTAL','link_field','link_field');
+                       $this->p->set_block('portal','portal_box','portal_box');
+                       $this->p->set_block('portal','portal_row','portal_row');
+                       
$this->p->set_block('portal','portal_listbox_header','portal_listbox_header');
+                       
$this->p->set_block('portal','portal_listbox_link','portal_listbox_link');
+                       
$this->p->set_block('portal','portal_listbox_footer','portal_listbox_footer');
+                       
$this->p->set_block('portal','portal_control','portal_control');
+                       $this->p->set_block('portal','link_field','link_field');
 
                        $var = Array(
-                               'outer_border'  => 
$this->getvar('outerborderwidth'),
                                'outer_width'   => $this->getvar('width'),
-                               'outer_bordercolor'     => 
$this->getvar('outerbordercolor'),
-                               'outer_bgcolor' => 
$this->getvar('titlebgcolor'),
                                'title' => $this->getvar('title'),
                                'inner_width'   => $this->getvar('width'),
-                               'inner_bgcolor' => 
$this->getvar('innerbgcolor'),
-                               'header_background_image'       => 
$this->getvar('header_background_image'),
                                'control_link'  => ''
                        );
                        $this->p->set_var($var);
@@ -123,7 +111,7 @@
                {
                        if($data=='' && !count($this->data))
                        {
-                               $data = '<td>&nbsp;</td>';
+                               $data = '&nbsp;';
                        }
                        $this->p->set_var('output',$data);
                        $this->p->parse('row','portal_row',true);