moved justweb to use xslt

This commit is contained in:
ceb 2002-11-08 22:42:14 +00:00
parent 3cbe4c45a9
commit 48d4f167cc
3 changed files with 27 additions and 12 deletions

View File

@ -404,16 +404,16 @@
$lastname = $GLOBALS['phpgw_info']['user']['lastname'];
}
if ($lastname)
{
$a[] = $lastname;
}
if ($firstname)
{
$a[] = $firstname;
}
if ($lastname)
{
$a[] = $lastname;
}
if(isset($a))
{
switch(count($a))
@ -422,10 +422,10 @@
return $lid;
break;
case 1:
return '<' . $lid . '> ' . $a[0];
return $a[0] . ' <' . $lid . '>';
break;
case 2:
return '<' . $lid . '> ' . implode(', ',$a);
return $a[0] . ' ' . $a[1] .' <' . $lid . '>'; //implode(', ',$a);
break;
}
}
@ -1069,6 +1069,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
(
'charset' => lang('charset'),
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'],
'webserver_url' => $GLOBALS['phpgw_info']['server']['webserver_url'],
'phpgw_css_file' => $css[0],
'theme_css_file' => $css[1],
'app_tpl' => $app_tpl
@ -1153,6 +1154,13 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$var['about_img'] = $this->image('phpgwapi','help');
$var['greybar'] = $this->image('phpgwapi','greybar');
break;
case 'justweb':
$var['logo_img'] = $this->image('phpgwapi','logo');
$var['home_img'] = $this->image('phpgwapi','tab_home');
$var['prefs_img'] = $this->image('phpgwapi','tab_prefs');
$var['logout_img'] = $this->image('phpgwapi','tab_logout');
$var['about_img'] = $this->image('phpgwapi','tab_help');
break;
default:
$var['home_img'] = $GLOBALS['phpgw_info']['navbar']['home']['icon'];
$var['prefs_img'] = $GLOBALS['phpgw_info']['navbar']['preferences']['icon'];

View File

@ -65,6 +65,15 @@ a.th,a.th_text
background: url(../images/side_bar_bg.png);
}
.left_top
{
background: url(../images/side_bar_top.png);
}
.left_bottom
{
background: url(../images/side_bar_bottom.png);
}
table.portal
{

View File

@ -26,8 +26,6 @@
<xsl:variable name="about_title"><xsl:value-of select="about_title"/></xsl:variable>
<xsl:variable name="side_bar_top_img"><xsl:value-of select="side_bar_top_img"/></xsl:variable>
<xsl:variable name="side_bar_bottom_img"><xsl:value-of select="side_bar_bottom_img"/></xsl:variable>
<xsl:variable name="menu_bar_left_img"><xsl:value-of select="menu_bar_left_img"/></xsl:variable>
<xsl:variable name="menu_bar_right_img"><xsl:value-of select="menu_bar_right_img"/></xsl:variable>
<xsl:variable name="app_tpl"><xsl:value-of select="app_tpl"/></xsl:variable>
<html>
<head>
@ -92,13 +90,13 @@
<tr valign="top">
<td>
<!-- BEGIN left_part -->
<table width="100%" cellspacing="0" cellpadding="0" height="100%" valing="top">
<table width="59" cellspacing="0" cellpadding="0" height="100%" valign="top">
<tr>
<td height="7" width="59" valign="top"><img src="{$side_bar_top_img}" width="59" height="7" border="0"/></td>
<td height="7" width="59" valign="top" class="left_top"> </td>
</tr>
<xsl:apply-templates select="applications"/>
<tr>
<td height="7" width="59" valign="top"><img src="{$side_bar_bottom_img}" width="59" height="7" border="0"/></td>
<td height="7" width="59" valign="top" class="left_bottom"> </td>
</tr>
</table>
<!-- END left_part -->