From 7a84f2ef14b80821b686a9a9e460ab3d8e9c5d4c Mon Sep 17 00:00:00 2001
From: ceb <ceb@alumni.egroupware.org>
Date: Sun, 29 Sep 2002 21:17:35 +0000
Subject: [PATCH] added xsl tpls

---
 phpgwapi/templates/default/about.xsl        |  7 +++---
 phpgwapi/templates/default/phpgw.xsl        | 18 +++++++--------
 phpgwapi/templates/default/phpgw_bottom.xsl | 15 +++++++++++++
 phpgwapi/templates/default/phpgw_left.xsl   |  6 +++++
 phpgwapi/templates/default/phpgw_right.xsl  |  6 +++++
 phpgwapi/templates/default/phpgw_top.xsl    | 25 +++++++++++++++++++++
 6 files changed, 64 insertions(+), 13 deletions(-)
 create mode 100644 phpgwapi/templates/default/phpgw_bottom.xsl
 create mode 100644 phpgwapi/templates/default/phpgw_left.xsl
 create mode 100644 phpgwapi/templates/default/phpgw_right.xsl
 create mode 100644 phpgwapi/templates/default/phpgw_top.xsl
diff --git a/phpgwapi/templates/default/about.xsl b/phpgwapi/templates/default/about.xsl
index 45905ab5a4..99cf01fe1d 100644
--- a/phpgwapi/templates/default/about.xsl
+++ b/phpgwapi/templates/default/about.xsl
@@ -1,9 +1,8 @@
 <!-- $Id$ -->
 
-	<xsl:template name="about">
+	<xsl:template match="about">
 		<table cellpadding="2" cellspacing="2" width="80%" align="center">
 			<xsl:variable name="phpgw_logo"><xsl:value-of select="phpgw_logo"/></xsl:variable>
-			<xsl:variable name="phpgw_version"><xsl:value-of select="phpgw_version"/></xsl:variable>
 			<tr>
 				<td>
 					<a href="http://www.phpgroupware.org" target="_blank"><img src="{$phpgw_logo}" border="0"></a>
@@ -11,7 +10,7 @@
 			</tr>
 			<tr>
 				<td align="center">
-					<xsl:value-of select="phpgw_version"/>
+					<xsl:value-of select="lang_version"/><xsl:text>: </xsl:text><xsl:value-of select="phpgw_version"/>
 				</td>
 			</tr>
 			<tr>
@@ -32,7 +31,7 @@
 		</tr>
 		<tr>
 			<td colspan="2" align="center">
-				<xsl:value-of select="lang_app_version"/><xsl:text>: </xsl:text><xsl:value-of select="app_version"/>
+				<xsl:value-of select="lang_version"/><xsl:text>: </xsl:text><xsl:value-of select="app_version"/>
 			</td>
 		</tr>
 		<tr>
diff --git a/phpgwapi/templates/default/phpgw.xsl b/phpgwapi/templates/default/phpgw.xsl
index e52b707469..0cb10ae874 100644
--- a/phpgwapi/templates/default/phpgw.xsl
+++ b/phpgwapi/templates/default/phpgw.xsl
@@ -2,6 +2,7 @@
 
 	<xsl:template name="phpgw">
 	<xsl:variable name="css_path"><xsl:value-of select="css_path"/></xsl:variable>
+	<xsl:variable name="phpgw_charset"><xsl:value-of select="phpgw_charset"/></xsl:variable>
 	<xsl:variable name="phpgw_bg"><xsl:value-of select="phpgw_bg"/></xsl:variable>
 	<xsl:variable name="phpgw_onload"><xsl:value-of select="phpgw_onload"/></xsl:variable>
 	<xsl:variable name="phpgw_top_table_height"><xsl:value-of select="phpgw_top_table_height"/></xsl:variable>
@@ -12,32 +13,31 @@
 	<xsl:variable name="phpgw_bottom_table_height"><xsl:value-of select="phpgw_bottom_table_height"/></xsl:variable>
 		<html>
 			<head>
-				<meta http-equiv="Content-Type" content="text/html; charset={phpgw_head_charset}"/>
-				<meta name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org"/>
+				<meta http-equiv="Content-Type" content="text/html; charset={$phpgw_charset}"/>
+				<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
 				<meta name="description" content="phpGroupWare"/>
 				<meta name="keywords" content="phpGroupWare"/>
 				<meta name="robots" content="noindex"/>
-				<base target="{phpgw_head_target}"/>
 				<link rel="icon" href="favicon.ico" type="image/x-ico"/>
 				<link rel="shortcut icon" href="favicon.ico"/>
 				<title><xsl:value-of select="phpgw_website_title"/></title>
 				<xsl:apply-templates select="head_js"/>
 				<link rel="stylesheet" type="text/css" href="{$css_path}">
 			</head>
-			<body background="{$phpgw_bg}" onLoad="{phpgw_onload}">
+			<body background="{$phpgw_bg}" onLoad="{$phpgw_onload}">
 				<table border="0" width="100%" height="100%" cellspacing="0" cellpadding="0">
 					<tr>
 						<td width="100%" height="{$phpgw_top_table_height}" valign="top" colspan="3">
-							<xsl:apply-templates select="phpgw_top"/>
+							<xsl:call-template name="phpgw_top"/>
 						</td>
 					</tr>
 					<tr>
 						<td width="{$phpgw_left_table_width}" height="{$phpgw_body_table_height}" valign="top">
-							<xsl:apply-templates select="phpgw_left"/>
+							<xsl:call-template name="phpgw_left"/>
 						</td>
 						<td width="{$phpgw_body_table_width}" height="{$phpgw_body_table_height}" valign="top">
-							<xsl:apply-templates select="phpgw_msg_box"/>
-							<xsl:apply-templates select="phpgw_body"/>
+							<xsl:call-template name="phpgw_msg_box"/>
+							<xsl:call-template name="phpgw_body"/>
 						</td>
 						<td width="{$phpgw_right_table_width}" height="{$phpgw_body_table_height}" align="right" valign="top">
 							<xsl:apply-templates select="phpgw_right"/>
@@ -45,7 +45,7 @@
 					</tr>
 					<tr>
 						<td width="100%" height="{$phpgw_bottom_table_height}" valign="top" colspan="3">
-							<xsl:apply-templates select="phpgw_bottom"/>
+							<xsl:call-template name="phpgw_bottom"/>
 						</td>
 					</tr>
 				</table>
diff --git a/phpgwapi/templates/default/phpgw_bottom.xsl b/phpgwapi/templates/default/phpgw_bottom.xsl
new file mode 100644
index 0000000000..0bdeff2489
--- /dev/null
+++ b/phpgwapi/templates/default/phpgw_bottom.xsl
@@ -0,0 +1,15 @@
+<!-- $Id$ -->
+
+	<xsl:template name="phpgw_bottom">
+	<xsl:variable name="phpgw_url"><xsl:value-of select="phpgw_url"/></xsl:variable>
+		<table border="0" cellspacing="0" cellpadding="0" width="100%" class="navbar">
+			<tr>
+				<td valign="middle" align="center">
+					<xsl:text>Powered by </xsl:text>
+					<a href="{phpgw_url}" target="_blank"><xsl:text>phpGroupWare</xsl:text></a>
+					<xsl:text> version </xsl:text>
+					<xsl:value-of select="phpgw_version"/>
+				</td>
+			</tr>
+		</table>
+	</xsl:template>
diff --git a/phpgwapi/templates/default/phpgw_left.xsl b/phpgwapi/templates/default/phpgw_left.xsl
new file mode 100644
index 0000000000..9432c1474a
--- /dev/null
+++ b/phpgwapi/templates/default/phpgw_left.xsl
@@ -0,0 +1,6 @@
+<!-- $Id$ -->
+
+	<xsl:template name="phpgw_left">
+		<table width="100%" cellspacing="0" cellpadding="0">
+		</table>
+	</xsl:template>
diff --git a/phpgwapi/templates/default/phpgw_right.xsl b/phpgwapi/templates/default/phpgw_right.xsl
new file mode 100644
index 0000000000..a7fa0f1fd1
--- /dev/null
+++ b/phpgwapi/templates/default/phpgw_right.xsl
@@ -0,0 +1,6 @@
+<!-- $Id$ -->
+
+	<xsl:template name="phpgw_right">
+		<table width="100%" cellspacing="0" cellpadding="0">
+		</table>
+	</xsl:template>
diff --git a/phpgwapi/templates/default/phpgw_top.xsl b/phpgwapi/templates/default/phpgw_top.xsl
new file mode 100644
index 0000000000..7e3aa77964
--- /dev/null
+++ b/phpgwapi/templates/default/phpgw_top.xsl
@@ -0,0 +1,25 @@
+<!-- $Id$ -->
+
+	<xsl:template name="phpgw_top">
+		<table width="100%" cellspacing="0" cellpadding="0">
+			<tr class="navbar">
+				<xsl:apply-templates select="app_list"/>
+			</tr>
+			<tr>
+				<td>
+					<xsl:value-of select="user_info"/>
+				</td>
+			</tr>
+			<tr>
+				<td><xsl:value-of select="current_users"/></td>
+			</tr>
+		</table>
+	</xsl:template>
+
+	<xsl:template match="app_list">
+		<xsl:variable name="app_link"><xsl:value-of select="app_link"/></xsl:variable>
+		<xsl:variable name="app_icon"><xsl:value-of select="app_icon"/></xsl:variable>
+		<td>
+			<a href="{$app_link}" target="_top"><img src="{$app_icon}" border="0"></a>
+		</td>
+	</xsl:template>
