mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 08:39:07 +01:00
update to use css files
This commit is contained in:
parent
53da587f5b
commit
08c5e74c66
@ -1195,7 +1195,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
|
||||
}
|
||||
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';
|
||||
$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';
|
||||
}
|
||||
|
||||
else
|
||||
|
@ -52,13 +52,13 @@
|
||||
@reset($param);
|
||||
while(list($key,$value) = each($param))
|
||||
{
|
||||
if($key != 'title' && $key != 'primary' && $key != 'secondary' && $key != 'tertiary')
|
||||
if($key != 'title')
|
||||
{
|
||||
//echo 'Setting '.$key.':'.$value."<br>\n";
|
||||
//echo 'Setting '.$key.':'.$value."<br>\n";
|
||||
$this->setvar($key,$value);
|
||||
}
|
||||
}
|
||||
$this->portalbox($param['title'], $param['primary'], $param['secondary'], $param['tertiary']);
|
||||
$this->portalbox($param['title']);
|
||||
$this->start_template();
|
||||
}
|
||||
|
||||
|
@ -28,12 +28,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;
|
||||
@ -83,13 +80,10 @@
|
||||
/*
|
||||
This is the constructor for the object.
|
||||
*/
|
||||
function portalbox($title='', $primary='', $secondary='', $tertiary='')
|
||||
function portalbox($title='')
|
||||
{
|
||||
$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);
|
||||
}
|
||||
|
||||
function start_template()
|
||||
@ -110,15 +104,12 @@
|
||||
$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'),
|
||||
'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' => ''
|
||||
'control_link' => ''
|
||||
);
|
||||
$this->p->set_var($var);
|
||||
$this->p->set_var('row','',False);
|
||||
|
@ -1,8 +1,7 @@
|
||||
<?php
|
||||
function var2xml($name, $data)
|
||||
{
|
||||
$doc = new xmltool();
|
||||
$doc->indentstring = '';
|
||||
$doc = new xmltool('root','','');
|
||||
return $doc->import_var($name,$data,True,True);
|
||||
}
|
||||
|
||||
@ -22,9 +21,10 @@
|
||||
var $indentstring = "\t";
|
||||
|
||||
/* start the class as either a root or a node */
|
||||
function xmltool ($node_type = 'root', $name='')
|
||||
function xmltool ($node_type = 'root', $name='',$indentstring="\t")
|
||||
{
|
||||
$this->node_type = $node_type;
|
||||
$this->indentstring = $indentstring;
|
||||
if ($this->node_type == 'node')
|
||||
{
|
||||
if($name != '')
|
||||
@ -155,7 +155,8 @@
|
||||
|
||||
function import_var($name, $value,$is_root=False,$export_xml=False)
|
||||
{
|
||||
$node = new xmltool('node',$name);
|
||||
//echo "<p>import_var: this->indentstring='$this->indentstring'</p>\n";
|
||||
$node = new xmltool('node',$name,$this->indentstring);
|
||||
switch (gettype($value))
|
||||
{
|
||||
case 'string':
|
||||
@ -208,12 +209,12 @@
|
||||
case 'integer':
|
||||
case 'double':
|
||||
case 'NULL':
|
||||
$subnode = new xmltool('node', $nextkey);
|
||||
$subnode = new xmltool('node', $nextkey,$this->indentstring);
|
||||
$subnode->set_value($val);
|
||||
$node->add_node($subnode);
|
||||
break;
|
||||
case 'boolean':
|
||||
$subnode = new xmltool('node', $nextkey);
|
||||
$subnode = new xmltool('node', $nextkey,$this->indentstring);
|
||||
if($val == True)
|
||||
{
|
||||
$subnode->set_value('1');
|
||||
@ -239,7 +240,7 @@
|
||||
}
|
||||
break;
|
||||
case 'object':
|
||||
$subnode = new xmltool('node', $nextkey);
|
||||
$subnode = new xmltool('node', $nextkey,$this->indentstring);
|
||||
$subnode->set_value('PHP_SERIALIZED_OBJECT&:'.serialize($val));
|
||||
$node->add_node($subnode);
|
||||
break;
|
||||
@ -378,7 +379,7 @@
|
||||
{
|
||||
case 'cdata':
|
||||
case 'complete':
|
||||
$node = new xmltool('node',$data[$i]['tag']);
|
||||
$node = new xmltool('node',$data[$i]['tag'],$this->indentstring);
|
||||
if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
|
||||
{
|
||||
while(list($k,$v)=each($data[$i]['attributes']))
|
||||
@ -390,7 +391,7 @@
|
||||
$parent_node->add_node($node);
|
||||
break;
|
||||
case 'open':
|
||||
$node = new xmltool('node',$data[$i]['tag']);
|
||||
$node = new xmltool('node',$data[$i]['tag'],$this->indentstring);
|
||||
if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
|
||||
{
|
||||
while(list($k,$v)=each($data[$i]['attributes']))
|
||||
@ -416,7 +417,7 @@
|
||||
xml_parse_into_struct($parser, $xmldata, $vals, $index);
|
||||
xml_parser_free($parser);
|
||||
unset($index);
|
||||
$node = new xmltool('node',$vals[0]['tag']);
|
||||
$node = new xmltool('node',$vals[0]['tag'],$this->indentstring);
|
||||
if(isset($vals[0]['attributes']))
|
||||
{
|
||||
while(list($key,$value) = each($vals[0]['attributes']))
|
||||
|
Loading…
Reference in New Issue
Block a user