From bfc4ee7556e51507167b4b85ba372ffdb345bd5d Mon Sep 17 00:00:00 2001
From: ceb <ceb@alumni.egroupware.org>
Date: Thu, 3 Oct 2002 22:02:19 +0000
Subject: [PATCH] update to use xslt

---
 phpgwapi/inc/class.listbox.inc.php    |  7 ++-----
 phpgwapi/inc/class.portalbox.inc.php  |  2 +-
 phpgwapi/templates/default/portal.xsl | 11 ++++++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/phpgwapi/inc/class.listbox.inc.php b/phpgwapi/inc/class.listbox.inc.php
index 59a843c01f..e01039dbfd 100755
--- a/phpgwapi/inc/class.listbox.inc.php
+++ b/phpgwapi/inc/class.listbox.inc.php
@@ -71,17 +71,14 @@
 			{
 				for ($x = 0; $x < count($this->data); $x++)
 				{
-					$var = array
+					$var[] = array
 					(
 						'text'					=> $this->data[$x]['text'],
 						'link'					=> $this->data[$x]['link'],
 						'lang_link_statustext'	=> $this->data[$x]['lang_link_statustext']
 					);
-					$this->output['portal_row'] = array
-					(
-						'listbox'	=> $var
-					);
 				}
+				$this->output['listbox'] = $var;
 			}
 			$this->set_internal($extra_data);
 			return $this->draw_box();
diff --git a/phpgwapi/inc/class.portalbox.inc.php b/phpgwapi/inc/class.portalbox.inc.php
index 5e763701d4..5996fc2af2 100755
--- a/phpgwapi/inc/class.portalbox.inc.php
+++ b/phpgwapi/inc/class.portalbox.inc.php
@@ -117,7 +117,7 @@
 				$data = ' ';
 			}
 
-			$this->output['portal_row']['extrabox'] = array
+			$this->output['extrabox'] = array
 			(
 				'data' => $data
 			);
diff --git a/phpgwapi/templates/default/portal.xsl b/phpgwapi/templates/default/portal.xsl
index 691f43dfc5..7f15e5fdd2 100644
--- a/phpgwapi/templates/default/portal.xsl
+++ b/phpgwapi/templates/default/portal.xsl
@@ -16,7 +16,12 @@
  				<tr>
   					<td colspan="2">
    						<table cellpadding="0" cellspacing="0" width="{$inner_width}" class="portal">
-							<xsl:apply-templates select="portal_row"/>
+							<tr>
+								<td>
+									<xsl:apply-templates select="listbox"/>
+									<xsl:apply-templates select="extrabox"/>
+								</td>
+							</tr>
    						</table>
   					</td>
  				</tr>
@@ -33,14 +38,14 @@
 		</a>
 	</xsl:template>
 
-	<xsl:template match="portal_row">
+<!-- 	<xsl:template name="portal_row">
 		<tr>
 			<td>
 				<xsl:apply-templates select="listbox"/>
 				<xsl:apply-templates select="extrabox"/>
 			</td>
 		</tr>
-	</xsl:template>
+	</xsl:template> -->
 
 	<xsl:template match="listbox">
 		<xsl:variable name="link"><xsl:value-of select="link"/></xsl:variable>