[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.160,1.161 cl
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.160,1.161 class.listbox.inc.php,1.2,1.3 class.portalbox.inc.php,1.9,1.10 class.xmltool.inc.php,1.4,1.5 |
|
Date: |
Wed, 02 Oct 2002 20:11:51 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv5729
Modified Files:
class.common.inc.php class.listbox.inc.php
class.portalbox.inc.php class.xmltool.inc.php
Log Message:
update to use css files
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -r1.160 -r1.161
*** class.common.inc.php 29 Sep 2002 18:22:17 -0000 1.160
--- class.common.inc.php 3 Oct 2002 00:11:48 -0000 1.161
***************
*** 1196,1200 ****
elseif(@file_exists(PHPGW_SERVER_ROOT . SEP .
'phpgwapi' . SEP . 'templates' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP .
'css' . SEP . 'submarine.css'))
{
! $css_file =
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP .
'templates' . SEP . 'idsociety' . SEP . 'css' . SEP . 'submarine.css';
}
--- 1196,1200 ----
elseif(@file_exists(PHPGW_SERVER_ROOT . SEP .
'phpgwapi' . SEP . 'templates' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP .
'css' . SEP . 'submarine.css'))
{
! $css_file =
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP .
'templates' . SEP .
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP .
'css' . SEP . 'submarine.css';
}
Index: class.listbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.listbox.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.listbox.inc.php 19 Oct 2001 02:11:46 -0000 1.2
--- class.listbox.inc.php 3 Oct 2002 00:11:48 -0000 1.3
***************
*** 53,63 ****
while(list($key,$value) = each($param))
{
! if($key != 'title' && $key != 'primary' && $key
!= 'secondary' && $key != 'tertiary')
{
! //echo 'Setting '.$key.':'.$value."<br>\n";
$this->setvar($key,$value);
}
}
! $this->portalbox($param['title'], $param['primary'],
$param['secondary'], $param['tertiary']);
$this->start_template();
}
--- 53,63 ----
while(list($key,$value) = each($param))
{
! if($key != 'title')
{
! //echo 'Setting
'.$key.':'.$value."<br>\n";
$this->setvar($key,$value);
}
}
! $this->portalbox($param['title']);
$this->start_template();
}
Index: class.portalbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.portalbox.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.portalbox.inc.php 28 Sep 2002 20:01:44 -0000 1.9
--- class.portalbox.inc.php 3 Oct 2002 00:11:48 -0000 1.10
***************
*** 29,38 ****
var $outerwidth;
- var $outerbordercolor;
var $outerborderwidth = 1;
- var $titlebgcolor;
var $width;
var $innerwidth;
- var $innerbgcolor;
var $controls;
var $header_background_image;
--- 29,35 ----
***************
*** 84,94 ****
This is the constructor for the object.
*/
! function portalbox($title='', $primary='', $secondary='',
$tertiary='')
{
$this->setvar('title',$title);
// echo 'After SetVar Title =
'.$this->getvar('title')."<br>\n";
- $this->setvar('titlebgcolor',$primary);
- $this->setvar('innerbgcolor',$secondary);
- $this->setvar('outerbordercolor',$tertiary);
}
--- 81,88 ----
This is the constructor for the object.
*/
! function portalbox($title='')
{
$this->setvar('title',$title);
// echo 'After SetVar Title =
'.$this->getvar('title')."<br>\n";
}
***************
*** 111,123 ****
$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);
--- 105,114 ----
$var = Array(
! 'outer_border' =>
$this->getvar('outerborderwidth'),
! 'outer_width' =>
$this->getvar('width'),
! 'title'
=> $this->getvar('title'),
! 'inner_width' =>
$this->getvar('width'),
'header_background_image' =>
$this->getvar('header_background_image'),
! 'control_link' => ''
);
$this->p->set_var($var);
Index: class.xmltool.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xmltool.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.xmltool.inc.php 1 Oct 2002 23:13:31 -0000 1.4
--- class.xmltool.inc.php 3 Oct 2002 00:11:48 -0000 1.5
***************
*** 2,7 ****
function var2xml($name, $data)
{
! $doc = new xmltool();
! $doc->indentstring = '';
return $doc->import_var($name,$data,True,True);
}
--- 2,6 ----
function var2xml($name, $data)
{
! $doc = new xmltool('root','','');
return $doc->import_var($name,$data,True,True);
}
***************
*** 23,29 ****
/* start the class as either a root or a node */
! function xmltool ($node_type = 'root', $name='')
{
$this->node_type = $node_type;
if ($this->node_type == 'node')
{
--- 22,29 ----
/* start the class as either a root or a node */
! function xmltool ($node_type = 'root',
$name='',$indentstring="\t")
{
$this->node_type = $node_type;
+ $this->indentstring = $indentstring;
if ($this->node_type == 'node')
{
***************
*** 156,160 ****
function import_var($name,
$value,$is_root=False,$export_xml=False)
{
! $node = new xmltool('node',$name);
switch (gettype($value))
{
--- 156,161 ----
function import_var($name,
$value,$is_root=False,$export_xml=False)
{
! //echo "<p>import_var:
this->indentstring='$this->indentstring'</p>\n";
! $node = new xmltool('node',$name,$this->indentstring);
switch (gettype($value))
{
***************
*** 209,218 ****
case 'double':
case 'NULL':
! $subnode = new
xmltool('node', $nextkey);
$subnode->set_value($val);
$node->add_node($subnode);
break;
case 'boolean':
! $subnode = new
xmltool('node', $nextkey);
if($val == True)
{
--- 210,219 ----
case 'double':
case 'NULL':
! $subnode = new
xmltool('node', $nextkey,$this->indentstring);
$subnode->set_value($val);
$node->add_node($subnode);
break;
case 'boolean':
! $subnode = new
xmltool('node', $nextkey,$this->indentstring);
if($val == True)
{
***************
*** 240,244 ****
break;
case 'object':
! $subnode = new
xmltool('node', $nextkey);
$subnode->set_value('PHP_SERIALIZED_OBJECT&:'.serialize($val));
$node->add_node($subnode);
--- 241,245 ----
break;
case 'object':
! $subnode = new
xmltool('node', $nextkey,$this->indentstring);
$subnode->set_value('PHP_SERIALIZED_OBJECT&:'.serialize($val));
$node->add_node($subnode);
***************
*** 379,383 ****
case 'cdata':
case 'complete':
! $node = new
xmltool('node',$data[$i]['tag']);
if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
{
--- 380,384 ----
case 'cdata':
case 'complete':
! $node = new
xmltool('node',$data[$i]['tag'],$this->indentstring);
if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
{
***************
*** 391,395 ****
break;
case 'open':
! $node = new
xmltool('node',$data[$i]['tag']);
if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
{
--- 392,396 ----
break;
case 'open':
! $node = new
xmltool('node',$data[$i]['tag'],$this->indentstring);
if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
{
***************
*** 417,421 ****
xml_parser_free($parser);
unset($index);
! $node = new xmltool('node',$vals[0]['tag']);
if(isset($vals[0]['attributes']))
{
--- 418,422 ----
xml_parser_free($parser);
unset($index);
! $node = new
xmltool('node',$vals[0]['tag'],$this->indentstring);
if(isset($vals[0]['attributes']))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.160,1.161 class.listbox.inc.php,1.2,1.3 class.portalbox.inc.php,1.9,1.10 class.xmltool.inc.php,1.4,1.5,
Bettina Gille <address@hidden> <=