diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 3218db1f1e..ecb190cee4 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -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'];
diff --git a/phpgwapi/templates/justweb/css/phpgw.css b/phpgwapi/templates/justweb/css/phpgw.css
index ff4277eaea..4779759018 100644
--- a/phpgwapi/templates/justweb/css/phpgw.css
+++ b/phpgwapi/templates/justweb/css/phpgw.css
@@ -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
{
diff --git a/phpgwapi/templates/justweb/phpgw.xsl b/phpgwapi/templates/justweb/phpgw.xsl
index d9cb75001a..c3d4806b77 100644
--- a/phpgwapi/templates/justweb/phpgw.xsl
+++ b/phpgwapi/templates/justweb/phpgw.xsl
@@ -26,8 +26,6 @@
-
-
@@ -92,13 +90,13 @@
-
+
-  |
+ |
-  |
+ |
|