From c4237ef8978d2ede0135097d80927ca8f0b5e0ee Mon Sep 17 00:00:00 2001
From: ceb <ceb@alumni.egroupware.org>
Date: Sun, 27 Oct 2002 21:30:27 +0000
Subject: [PATCH] update xslt

---
 phpgwapi/templates/default/about.xsl | 115 ++++++++++++++++-----------
 phpgwapi/templates/default/phpgw.xsl |  10 +--
 2 files changed, 72 insertions(+), 53 deletions(-)

diff --git a/phpgwapi/templates/default/about.xsl b/phpgwapi/templates/default/about.xsl
index c0e94b535c..028e3c9e30 100644
--- a/phpgwapi/templates/default/about.xsl
+++ b/phpgwapi/templates/default/about.xsl
@@ -6,8 +6,8 @@
 
 	<xsl:template match="about_data">
 		<table cellpadding="2" cellspacing="2" align="center" class="about">
-			<xsl:variable name="phpgw_logo"><xsl:value-of select="phpgw_logo"/></xsl:variable>
-			<xsl:variable name="lang_url_statustext"><xsl:value-of select="lang_url_statustext"/></xsl:variable>
+			<xsl:variable name="phpgw_logo" select="phpgw_logo"/>
+			<xsl:variable name="lang_url_statustext" select="lang_url_statustext"/>
 			<tr>
 				<td colspan="2">
 					<a href="http://www.phpgroupware.org" target="_blank" onMouseover="window.status='{$lang_url_statustext}'; return true;" onMouseout="window.status=''; return true;">
@@ -24,7 +24,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>
+				<td width="20%">
 					<xsl:value-of select="lang_version"/>
 				</td>
 				<td>
@@ -39,70 +39,89 @@
 	</xsl:template>
 
 	<xsl:template match="about_app">
+		<xsl:variable name="icon" select="icon"/>
 		<tr>
 			<td colspan="2" class="th_text">
-				<xsl:value-of select="app_title"/>
+				<xsl:if test="icon != ''">
+					<img src="{$icon}"/>
+				</xsl:if>
+				<xsl:value-of select="title"/>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2">
-				<xsl:value-of disable-output-escaping="yes" select="app_descr"/>
+				<xsl:value-of select="description"/>
 			</td>
 		</tr>
+		<xsl:if test="note != ''">
+			<tr>
+				<td colspan="2">
+					<i><xsl:value-of select="note"/></i>
+				</td>
+			</tr>
+		</xsl:if>
 		<tr>
 			<td valign="top">
-				<xsl:value-of select="lang_written_by"/>
+				<xsl:value-of select="lang_author"/>
 			</td>
 			<td>
-				<xsl:value-of select="developers"/>
-			</td>
-		</tr>
-		<tr valign="top">
-			<td>
-				<xsl:value-of select="lang_maintainer"/>
-			</td>
-			<td>
-				<xsl:value-of select="app_maintainer"/><br/>
-				<xsl:value-of disable-output-escaping="yes" select="app_maintainer_email"/>
+				<xsl:value-of select="author"/>
 			</td>
 		</tr>
+		<xsl:if test="maintainer != ''">
+			<tr>
+				<td valign="top">
+					<xsl:value-of select="lang_maintainer"/>
+				</td>
+				<td>
+					<xsl:apply-templates select="maintainer"/>
+				</td>
+			</tr>
+		</xsl:if>
 		<tr>
 			<td>
 				<xsl:value-of select="lang_version"/>
 			</td>
 			<td>
-				<xsl:value-of select="app_version"/>
+				<xsl:value-of select="version"/>
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<xsl:value-of select="lang_license"/>
-			</td>
-			<td>
-				<xsl:value-of select="app_license"/>
-			</td>
-		</tr>
-		<xsl:choose>
-			<xsl:when test="app_source">
-				<tr>
-					<td valign="top"><xsl:value-of select="lang_based_on"/></td>
-					<td><xsl:value-of select="app_source"/></td>
-				</tr>
-			</xsl:when>
-		</xsl:choose>
-		<xsl:choose>
-			<xsl:when test="app_source_url">
-				<tr>
-					<td height="5"></td>
-					<td>
-						<a target="_blank">
-							<xsl:attribute name="href">
-								<xsl:value-of select="app_source_url"/>
-							</xsl:attribute>
-							<xsl:value-of select="app_source_url_name"/>
-						</a>
-					</td>
-				</tr>
-			</xsl:when>
-		</xsl:choose>
+		<xsl:if test="license != ''">
+			<tr>
+				<td>
+					<xsl:value-of select="lang_license"/>
+				</td>
+				<td>
+					<xsl:value-of select="license"/>
+				</td>
+			</tr>
+		</xsl:if>
+		<xsl:if test="based_on != ''">
+			<tr>
+				<td valign="top"><xsl:value-of select="lang_based_on"/></td>
+				<td><xsl:value-of select="based_on"/></td>
+			</tr>
+		</xsl:if>
+		<xsl:if test="based_on_url != ''">
+			<tr>
+				<td height="5"></td>
+				<td>
+					<a target="_blank">
+						<xsl:attribute name="href">
+							<xsl:value-of select="based_on_url"/>
+						</xsl:attribute>
+						<xsl:value-of select="based_on_url"/>
+					</a>
+				</td>
+			</tr>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="maintainer">
+	<xsl:variable name="email"><xsl:value-of select="email"/></xsl:variable>
+		<table>
+			<tr>
+				<td><xsl:value-of select="name"/><xsl:text> [</xsl:text><a href="mailto:{$email}"><xsl:value-of select="email"/></a><xsl:text>]</xsl:text></td>
+			</tr>
+		</table>
 	</xsl:template>
diff --git a/phpgwapi/templates/default/phpgw.xsl b/phpgwapi/templates/default/phpgw.xsl
index 211b7fa13b..a29018b6c7 100644
--- a/phpgwapi/templates/default/phpgw.xsl
+++ b/phpgwapi/templates/default/phpgw.xsl
@@ -49,18 +49,18 @@
 									</td>
 								</tr>
 								<tr width="100%">
-									<td width="33%" class="info"><xsl:value-of select="user_info_name"/></td>
+									<td width="25%" class="info"><xsl:value-of select="user_info_name"/></td>
 										<xsl:choose>
 											<xsl:when test="current_users">
 												<xsl:variable name="url_current_users"><xsl:value-of select="url_current_users"/></xsl:variable>
-												<td width="33%" class="info"><a href="{$url_current_users}"><xsl:value-of select="current_users"/></a></td>
+												<td width="25%" class="info"><a href="{$url_current_users}"><xsl:value-of select="current_users"/></a></td>
 											</xsl:when>
 											<xsl:otherwise>
-												<td width="33%"></td>
+												<td width="25%"></td>
 											</xsl:otherwise>
 										</xsl:choose>
-									<td width="33%" class="info" align="right"><xsl:value-of select="user_info_date"/></td>
-									<td>
+									<td class="info" width="25%" align="right"><xsl:value-of select="user_info_date"/></td>
+									<td width="25%">
 										<table cellspacing="0" cellpadding="0" align="right">
 											<tr>
 												<td><a href="{$home_link}" onMouseOver="" onMouseOut=""><img src="{$home_img}" border="0" name="nine" alt="{$home_title}" title="{$home_title}"/></a></td>