update langs plus xslt

phpgwapi/setup/phpgw_en.lang

@@ -214,6 +214,7 @@ lebanon	common	en	LEBANON
 lesotho	common	en	LESOTHO
 liberia	common	en	LIBERIA
 libyan arab jamahiriya	common	en	LIBYAN ARAB JAMAHIRIYA
+license	about	en	License
 liechtenstein	common	en	LIECHTENSTEIN
 list	common	en	List
 lithuania	common	en	LITHUANIA
@@ -227,6 +228,7 @@ macedonia, the former yugoslav republic of	common	en	MACEDONIA, THE FORMER YUGOS
 madagascar	common	en	MADAGASCAR
 main category	common	en	Main category
 main screen	common	en	Main screen
+maintainer	about	en	Maintainer
 malawi	common	en	MALAWI
 malaysia	common	en	MALAYSIA
 maldives	common	en	MALDIVES
@@ -303,6 +305,8 @@ password has been updated	common	en	Password has been updated
 personal	common	en	Personal
 peru	common	en	PERU
 philippines	common	en	PHILIPPINES
+is a multi-user, web-based groupware suite written in PHP	about	en	is a multi-user, web-based groupware suite written in PHP.
+phpgwapi	common	en	phpGroupWare API
 pitcairn	common	en	PITCAIRN
 please enter a name	common	en	Please enter a name !
 please run setup to become current	common	en	Please run setup to become current
@@ -310,7 +314,7 @@ please set your global preferences	common	en	Please set your global preferences
 please set your preferences for this application	common	en	Please set your preferences for this application !
 poland	common	en	POLAND
 portugal	common	en	PORTUGAL
-powered by phpgroupware version x	common	en	Powered by <a href="http://www.phpgroupware.org">phpGroupWare</a> version %1
+powered by	common	en	Powered by
 preferences	common	en	Preferences
 print	common	en	Print
 priority	common	en	Priority
@@ -379,6 +383,7 @@ tanzania, united republic of	common	en	TANZANIA, UNITED REPUBLIC OF
 thailand	common	en	THAILAND
 the api is current	common	en	The API is current
 the api requires an upgrade	common	en	The API requires an upgrade
+The core of phpGroupWare, the API itself	about	en	The core of phpGroupWare, the API itself.
 the following applications require upgrades	common	en	The following applications require upgrades
 this application is current	common	en	This application is current
 this application requires an upgrade	common	en	This application requires an upgrade

phpgwapi/setup/setup.inc.php

@@ -18,8 +18,13 @@
 	$setup_info['phpgwapi']['enable']    = 3;
 	$setup_info['phpgwapi']['app_order'] = 1;
 
-	$setup_info['phpgwapi']['author']      = 'phpGroupWare coreteam';
+	$setup_info['phpgwapi']['author'][] = array
-	$setup_info['phpgwapi']['description'] = 'The core of phpGroupWare, the API itself...';
+	(
+		'name'	=> 'phpGroupWare coreteam',
+		'email' => 'phpgroupware-developers@gnu.org'
+	);
+
+	$setup_info['phpgwapi']['description'] = 'The core of phpGroupWare, the API itself';
 
 	$setup_info['phpgwapi']['maintainer'][]  = array
 	(

phpgwapi/templates/default/about.xsl

@@ -41,16 +41,16 @@
 	<xsl:template match="about_app">
 		<xsl:variable name="icon" select="icon"/>
 		<tr>
-			<td colspan="2" class="th_text">
+			<td colspan="2" valign="middle" class="th_text">
 				<xsl:if test="icon != ''">
-					<img src="{$icon}"/>
+					<img src="{$icon}"/><xsl:text> </xsl:text>
 				</xsl:if>
 				<xsl:value-of select="title"/>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2">
-				<xsl:value-of select="description"/>
+				<xsl:value-of disable-output-escaping="yes" select="description"/>
 			</td>
 		</tr>
 		<xsl:if test="note != ''">
@@ -60,14 +60,16 @@
 				</td>
 			</tr>
 		</xsl:if>
+		<xsl:if test="author != ''">
 		<tr>
 			<td valign="top">
 				<xsl:value-of select="lang_author"/>
 			</td>
 			<td>
-				<xsl:value-of select="author"/>
+				<xsl:apply-templates select="author"/>
 			</td>
 		</tr>
+		</xsl:if>
 		<xsl:if test="maintainer != ''">
 			<tr>
 				<td valign="top">
@@ -99,19 +101,8 @@
 		<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:apply-templates select="based_on"/>
-						<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>
@@ -125,3 +116,28 @@
 			</tr>
 		</table>
 	</xsl:template>
+
+	<xsl:template match="author">
+	<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>
+
+	<xsl:template match="based_on">
+	<xsl:variable name="email"><xsl:value-of select="email"/></xsl:variable>
+	<xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
+		<table>
+			<tr>
+				<td><xsl:value-of select="info"/></td>
+			</tr>
+			<tr>
+				<td><a href="mailto:{$email}"><xsl:value-of select="email"/></a></td>
+			</tr>
+			<tr>
+				<td><a href="{$url}" target="_blank"><xsl:value-of select="url"/></a></td>
+			</tr>
+		</table>
+	</xsl:template>