extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

some more to allow relative template-names not only for tabs but in general

Browse Source
This commit is contained in:
Ralf Becker 2002-10-06 08:50:23 +00:00
parent 8099197a78
commit 2d2054b6ad
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etemplate/inc/class.boetemplate.inc.php
View File

@ -62,6 +62,13 @@
); );
$this->soetemplate(); $this->soetemplate();
$tname = &$name;
if (is_array($name))
{
$tname = &$name['name'];
}
$tname = (strstr($tname,'.') === False ? (is_array($load_via) ? $load_via['name'] : $load_via).'.':'').$tname;
if (empty($name) || !$this->read($name,'','',0,'',$load_via)) if (empty($name) || !$this->read($name,'','',0,'',$load_via))
{ {
$this->init($name); $this->init($name);

8
etemplate/inc/class.xul_io.inc.php
View File

@ -212,11 +212,11 @@
$tab->set_attribute('statustext',$helps[$n]); $tab->set_attribute('statustext',$helps[$n]);
$child->add_node($tab); $child->add_node($tab);
$grid = new xmlnode('grid'); $embeded = new etemplate($names[$n],$etempl->as_array());
$grid->set_attribute('id',$names[$n]);
$child2->add_node($grid);
$embeded = new etemplate($names[$n]);
$this->etempl2grid($embeded,&$root,$embeded_too); $this->etempl2grid($embeded,&$root,$embeded_too);
$grid = new xmlnode('grid');
$grid->set_attribute('id',$embeded->name);
$child2->add_node($grid);
unset($embeded); unset($embeded);
} }
break; break;