This commit is contained in:
ceb 2003-01-04 00:12:48 +00:00
parent df3a3a347b
commit c5526be9e4
3 changed files with 13 additions and 5 deletions

View File

@ -1256,7 +1256,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$app_css = 'left'; $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 $var['applications'][] = array
( (
@ -1317,7 +1317,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$var['current_app'] = $GLOBALS['phpgw_info']['flags']['currentapp']; $var['current_app'] = $GLOBALS['phpgw_info']['flags']['currentapp'];
$menuaction = get_var('menuaction',Array('GET')); $menuaction = get_var('menuaction',Array('GET'));
$xslt_app = get_var('xslt_app',Array('GET'));
if ($menuaction && $GLOBALS['phpgw_info']['flags']['xslt_app']) if ($menuaction && $GLOBALS['phpgw_info']['flags']['xslt_app'])
{ {

View File

@ -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 $this->output['help_values'][] = array
( (
'img' => $GLOBALS['phpgw']->common->image($this->app_name,'navbar','',True), 'img' => $logo_img,
'title' => $this->title, 'title' => $this->title,
'lang_version' => lang('version'), 'lang_version' => lang('version'),
'version' => $this->app_version, 'version' => $this->app_version,

View File

@ -13,7 +13,7 @@
<xsl:value-of select="title"/>&nbsp; <xsl:value-of select="title"/>&nbsp;
<xsl:choose> <xsl:choose>
<xsl:when test="version != ''"> <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:when>
</xsl:choose> </xsl:choose>
</td> </td>