This commit is contained in:
ceb 2002-10-29 23:35:02 +00:00
parent aa1dc9eb33
commit 754a43388c
2 changed files with 5 additions and 24 deletions

View File

@ -67,6 +67,7 @@
{ {
$this->output = array(); $this->output = array();
} }
$GLOBALS['phpgw']->xslttpl->add_file('portal');
} }
/* /*
@ -102,11 +103,7 @@
{ {
if ($extra && $this->app_name) if ($extra && $this->app_name)
{ {
$GLOBALS['phpgw']->xslttpl->add_file(array('portal',$GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default') . SEP . 'extrabox')); $GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default') . SEP . 'extrabox');
}
else
{
$GLOBALS['phpgw']->xslttpl->add_file('portal');
} }
} }
@ -177,22 +174,6 @@
'extrabox' => $this->extrabox, 'extrabox' => $this->extrabox,
'xextrabox' => $this->xextrabox 'xextrabox' => $this->xextrabox
); );
for ($i=0;$i<count($this->output['portal_data']);$i++)
{
if ($this->output['portal_data'][$i]['listbox'] == '')
{
unset($this->output['portal_data'][$i]['listbox']);
}
if ($this->output['portal_data'][$i]['extrabox'] == '')
{
unset($this->output['portal_data'][$i]['extrabox']);
}
if ($this->output['portal_data'][$i]['xextrabox'] == '')
{
unset($this->output['portal_data'][$i]['xextrabox']);
}
}
} }
} }
} }

View File

@ -19,7 +19,7 @@
<td colspan="2"> <td colspan="2">
<table cellpadding="3" cellspacing="0" class="portal"> <table cellpadding="3" cellspacing="0" class="portal">
<xsl:choose> <xsl:choose>
<xsl:when test="listbox"> <xsl:when test="listbox != ''">
<tr> <tr>
<td> <td>
<ul> <ul>
@ -30,14 +30,14 @@
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
<xsl:choose> <xsl:choose>
<xsl:when test="extrabox"> <xsl:when test="extrabox != ''">
<tr> <tr>
<td> <td>
<xsl:value-of disable-output-escaping="yes" select="extrabox"/> <xsl:value-of disable-output-escaping="yes" select="extrabox"/>
</td> </td>
</tr> </tr>
</xsl:when> </xsl:when>
<xsl:when test="xextrabox"> <xsl:when test="xextrabox != ''">
<tr> <tr>
<td> <td>
<xsl:call-template name="extrabox"/> <xsl:call-template name="extrabox"/>