From c5526be9e4ec31fd29877829eaa9bce8c5712015 Mon Sep 17 00:00:00 2001
From: ceb <ceb@alumni.egroupware.org>
Date: Sat, 4 Jan 2003 00:12:48 +0000
Subject: [PATCH] update

---
 phpgwapi/inc/class.common.inc.php   |  5 ++---
 phpgwapi/inc/class.help.inc.php     | 11 ++++++++++-
 phpgwapi/templates/default/help.xsl |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 1dd304d794..ad070443a5 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1256,7 +1256,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 					$app_css = 'left';
 				}
 
-				if ($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout' && $app != 'help')
+				if ($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout' && $app != 'help' && $app != 'manual')
 				{
 					$var['applications'][] = array
 					(
@@ -1266,7 +1266,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 						'url'			=> $data['url'],
 						'name'			=> str_replace('-','_',$app),
 						'statustext'	=> $data['title'],
-						'css'			=> $app_css 
+						'css'			=> $app_css
 					);
 
 					if($data['icon_hover'] != '')
@@ -1317,7 +1317,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			$var['current_app'] = $GLOBALS['phpgw_info']['flags']['currentapp'];
 
 			$menuaction	= get_var('menuaction',Array('GET'));
-			$xslt_app	= get_var('xslt_app',Array('GET'));
 
 			if ($menuaction && $GLOBALS['phpgw_info']['flags']['xslt_app'])
 			{
diff --git a/phpgwapi/inc/class.help.inc.php b/phpgwapi/inc/class.help.inc.php
index 0a7c1a4b88..ad83c7ae29 100644
--- a/phpgwapi/inc/class.help.inc.php
+++ b/phpgwapi/inc/class.help.inc.php
@@ -184,9 +184,18 @@
 				}
 			}
 
+			if ($this->app_name == 'manual')
+			{
+				$logo_img = $GLOBALS['phpgw']->common->image('phpgwapi','logo','',True);
+			}
+			else
+			{
+				$logo_img = $GLOBALS['phpgw']->common->image($this->app_name,'navbar','',True);
+			}
+
 			$this->output['help_values'][] = array
 			(
-				'img'			=> $GLOBALS['phpgw']->common->image($this->app_name,'navbar','',True),
+				'img'			=> $logo_img,
 				'title'			=> $this->title,
 				'lang_version'	=> lang('version'),
 				'version'		=> $this->app_version,
diff --git a/phpgwapi/templates/default/help.xsl b/phpgwapi/templates/default/help.xsl
index 0d7f8c60f6..74597a62d9 100644
--- a/phpgwapi/templates/default/help.xsl
+++ b/phpgwapi/templates/default/help.xsl
@@ -13,7 +13,7 @@
 					<xsl:value-of select="title"/>&nbsp;
 					<xsl:choose>
 						<xsl:when test="version != ''">
-							<xsl:value-of select="lang_version"/>:&nbsp;<xsl:value-of select="version"/>
+							<xsl:value-of select="lang_version"/>&nbsp;<xsl:value-of select="version"/>
 						</xsl:when>
 					</xsl:choose>
 				</td>