From 587fa97db23ca6b81d521c49b61853d84272d8e6 Mon Sep 17 00:00:00 2001
From: ceb <ceb@alumni.egroupware.org>
Date: Wed, 23 Oct 2002 20:47:33 +0000
Subject: [PATCH] removed app_title plus update layout

---
 addressbook/setup/setup.inc.php            |   1 -
 admin/setup/setup.inc.php                  |   1 -
 calendar/setup/setup.inc.php               |   1 -
 etemplate/setup/setup.inc.php              |   1 -
 filemanager/setup/setup.inc.php            |   1 -
 infolog/setup/setup.inc.php                |   1 -
 phpgwapi/inc/class.common.inc.php          | 226 ++++++++++++---------
 phpgwapi/setup/setup.inc.php               |   1 -
 phpgwapi/templates/idsociety/parts.inc.php |  10 +-
 phpgwapi/templates/idsociety/phpgw.xsl     | 158 ++++++++------
 preferences/setup/setup.inc.php            |   1 -
 11 files changed, 230 insertions(+), 172 deletions(-)

diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index 5fe9acc880..e9983d5c23 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -13,7 +13,6 @@
 
 	/* Basic information about this app */
 	$setup_info['addressbook']['name']      = 'addressbook';
-	$setup_info['addressbook']['title']     = 'Addressbook';
 	$setup_info['addressbook']['version']   = '0.9.13.003';
 	$setup_info['addressbook']['app_order'] = 4;
 	$setup_info['addressbook']['enable']    = 1;
diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php
index e5ee2ebd54..dd60a95305 100755
--- a/admin/setup/setup.inc.php
+++ b/admin/setup/setup.inc.php
@@ -12,7 +12,6 @@
 	/* $Id$ */
 
 	$setup_info['admin']['name']      = 'admin';
-	$setup_info['admin']['title']     = 'Administration';
 	$setup_info['admin']['version']   = '0.9.13.002';
 	$setup_info['admin']['app_order'] = 1;
 	$setup_info['admin']['tables']    = '';
diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 9de55c665b..85bdfe56e2 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -12,7 +12,6 @@
 	/* $Id$ */
 
 	$setup_info['calendar']['name']    = 'calendar';
-	$setup_info['calendar']['title']   = 'Calendar';
 	$setup_info['calendar']['version'] = '0.9.13.007';
 	$setup_info['calendar']['app_order'] = 3;
 	$setup_info['calendar']['enable']  = 1;
diff --git a/etemplate/setup/setup.inc.php b/etemplate/setup/setup.inc.php
index 84d701754f..e36073b4c8 100644
--- a/etemplate/setup/setup.inc.php
+++ b/etemplate/setup/setup.inc.php
@@ -13,7 +13,6 @@
 	/* $Id$ */
 
 	$setup_info['etemplate']['name']      = 'etemplate';
-	$setup_info['etemplate']['title']     = 'eTemplates';
 	$setup_info['etemplate']['version']   = '0.9.15.001';
 	$setup_info['etemplate']['app_order'] = 8;	// just behind the developers-tools
 	$setup_info['etemplate']['tables']    = array('phpgw_etemplate');
diff --git a/filemanager/setup/setup.inc.php b/filemanager/setup/setup.inc.php
index b79df8675d..1a8b7c769a 100755
--- a/filemanager/setup/setup.inc.php
+++ b/filemanager/setup/setup.inc.php
@@ -12,7 +12,6 @@
 	/* $Id$ */
 
 	$setup_info['filemanager']['name']    = 'filemanager';
-	$setup_info['filemanager']['title']   = 'Filemanager';
 	$setup_info['filemanager']['version'] = '0.9.13.005';
 	$setup_info['filemanager']['app_order'] = 10;
 	$setup_info['filemanager']['enable']  = 1;
diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php
index e91933952b..d1f3704085 100755
--- a/infolog/setup/setup.inc.php
+++ b/infolog/setup/setup.inc.php
@@ -12,7 +12,6 @@
 	/* $Id$ */
 
 	$setup_info['infolog']['name']      = 'infolog';
-	$setup_info['infolog']['title']     = 'Info Log';
 	$setup_info['infolog']['version']   = '0.9.15.004';
 	$setup_info['infolog']['app_order'] = 20;
 	$setup_info['infolog']['tables']    = array('phpgw_infolog','phpgw_links');
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index fed245d827..a5ad517fba 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1073,91 +1073,132 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			}
 		}
 
-		/*function msgbox($text='',$type=True,$output='return')
+		function framework()
 		{
-			if($output != 'return')
+			if (!$GLOBALS['phpgw_info']['flags']['nonavbar'])
 			{
-				$return_result = False;
-			}
-			else
-			{
-				$return_result = True;
-				$output = 'phpgw_msgbox';
-			}
-			if ($text=='' && @isset($GLOBALS['phpgw_info']['flags']['msgbox_data']))
-			{
-				$text = $GLOBALS['phpgw_info']['flags']['msgbox_data'];
-				unset($GLOBALS['phpgw_info']['flags']['msgbox_data']);
-			}
-			elseif($text=='')
-			{
-				return;
+				$GLOBALS['phpgw']->xslttpl->add_file('phpgw');
 			}
 
-			$GLOBALS['phpgw']->template->set_block('msgbox','msgbox_start');
-			$GLOBALS['phpgw']->template->set_block('msgbox','msgbox_row');
-			$GLOBALS['phpgw']->template->set_block('msgbox','msgbox_end');
-			$GLOBALS['phpgw']->template->fp($output,'msgbox_start');
+			$var = array
+			(
+				'img_root' => PHPGW_IMAGES_DIR
+			);
 
-			if (is_array($text))
+			$find_single = strrpos($GLOBALS['phpgw_info']['server']['webserver_url'],'/');
+			$find_double = strpos(strrev($GLOBALS['phpgw_info']['server']['webserver_url'].' '),'//');
+			if($find_double)
 			{
-				reset($text);
-				$row = 1;
-				while (list($key,$value) = each($text))
+				$find_double = strlen($GLOBALS['phpgw_info']['server']['webserver_url']) - $find_double - 1;
+			}
+			if($find_double)
+			{
+				if($find_single == $find_double + 1)
 				{
-					if ($row == 1)
-					{
-						$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_on']);
-						$row = 2;
-					}
-					else
-					{
-						$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_off']);
-						$row = 1;
-					}
-
-					$prev_helper = $GLOBALS['phpgw']->translation->translator_helper;
-					$GLOBALS['phpgw']->translation->translator_helper = '';
-					$GLOBALS['phpgw']->template->set_var('msgbox_text',lang($key));
-					$GLOBALS['phpgw']->translation->translator_helper = $prev_helper;
-					if ($value == True)
-					{
-						$GLOBALS['phpgw']->template->set_var('msgbox_img',$this->image('phpgwapi','msgbox_good'));
-						$GLOBALS['phpgw']->template->set_var('msgbox_img_alt','OK');
-					}
-					else
-					{
-						$GLOBALS['phpgw']->template->set_var('msgbox_img',$this->image('phpgwapi','msgbox_bad'));
-						$GLOBALS['phpgw']->template->set_var('msgbox_img_alt','ERROR');
-					}
-					$GLOBALS['phpgw']->template->fp($output,'msgbox_row',True);
-				}
-			}
-			else
-			{
-				$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_on']);
-				$GLOBALS['phpgw']->translation->translator_helper = '';
-				$GLOBALS['phpgw']->template->set_var('msgbox_text',lang($key));
-				$GLOBALS['phpgw']->translation->translator_helper = $prev_helper;
-				if ($type == True)
-				{
-					$GLOBALS['phpgw']->template->set_var('msgbox_img',$this->image('phpgwapi','msgbox_good'));
-					$GLOBALS['phpgw']->template->set_var('msgbox_img_alt','OK');
+					$GLOBALS['strip_portion'] = $GLOBALS['phpgw_info']['server']['webserver_url'];
 				}
 				else
 				{
-					$GLOBALS['phpgw']->template->set_var('msgbox_img',$this->image('phpgwapi','msgbox_bad'));
-					$GLOBALS['phpgw']->template->set_var('msgbox_img_alt','ERROR');
+					$GLOBALS['strip_portion'] = substr($GLOBALS['phpgw_info']['server']['webserver_url'],0,$find_double + 1);
 				}
-				$GLOBALS['phpgw']->template->fp($output,'msgbox_row',True);
 			}
-			$GLOBALS['phpgw']->template->fp($output,'msgbox_end',True);
-
-			if($return_result)
+			else
 			{
-				return $GLOBALS['phpgw']->template->varvals[$output];
+				$GLOBALS['strip_portion'] = $GLOBALS['phpgw_info']['server']['webserver_url'].'/';
 			}
-		}*/
+
+			$var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
+			$var['preferences_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
+			$var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url'];
+			$var['about_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url'];
+
+			if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home')
+			{
+				$var['welcome_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
+				$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
+			}
+			else
+			{
+				$var['welcome_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
+				$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
+			}
+			$var['welcome_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
+
+			if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'preferences')
+			{
+				$var['preferences_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2');
+				$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
+			}
+			else
+			{
+				$var['preferences_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
+				$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2');
+			}
+			$var['preferences_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
+
+			$var['logout_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','log_out2');
+			$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
+			$var['logout_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
+
+			if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'about')
+			{
+				$var['about_img']		= $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2');
+				$var['about_img_hover']	= $GLOBALS['phpgw']->common->image_on('phpgwapi','question_mark2','_over');
+			}
+			else
+			{
+				$var['about_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','question_mark2','_over');
+				$var['about_img_hover'] = $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2');
+			}
+
+			$var['logo_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','logo2');
+
+			if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
+			{
+				$db  = $GLOBALS['phpgw']->db;
+				$db->query('select count(session_id) from phpgw_sessions');
+				$db->next_record();
+				$var['current_users'] = lang('Current users') . ': ' . $db->f(0);
+				$var['url_current_users'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions');
+			}
+
+			$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
+			$now = time();
+			$var['user_info_date'] =
+				  lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
+				. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+			$var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
+
+			while ($app = each($GLOBALS['phpgw_info']['navbar']))
+			{
+				if ($app[0] != 'home' && $app[0] != 'preferences' && $app[0] != 'about' && $app[0] != 'logout')
+				{
+					$var['applications'][] = array
+					(
+						'icon'			=> $app[1]['icon'],
+						'title'			=> $app[1]['title'],
+						'img_src_over'	=> $app[1]['icon_hover'],
+						'url'			=> $app[1]['url'],
+						'name'			=> str_replace('-','_',$app[0])
+					);
+
+					if($app[1]['icon_hover'] != '')
+					{
+						$GLOBALS['phpgw_info']['flags']['preload_images'][] = $app[1]['icon_hover'];
+					}
+				}
+			}
+
+			$var['nav_bar_left_top_bg_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','nav_bar_left_top_bg');
+
+			$var['lang_powered_by']			= lang('powered by');
+			$var['lang_version']			= lang('version');
+			$var['phpgw_version']			= $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
+			$var['lang_phpgw_statustext']	= lang('phpGroupWare --> homepage');
+			$var['top_spacer_middle_img']	= $GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
+
+			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
+		}
 
 		/*!
 		@function navbar
@@ -1166,10 +1207,10 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 		*/
 		function navbar()
 		{
-			$GLOBALS['phpgw_info']['navbar']['home']['title'] = 'Home';
-			$GLOBALS['phpgw_info']['navbar']['home']['url']   = $GLOBALS['phpgw']->link('/home.php');
-			$GLOBALS['phpgw_info']['navbar']['home']['icon']  = $this->image('phpgwapi',Array('home','nonav'));
-			$GLOBALS['phpgw_info']['navbar']['home']['icon_hover']  = $this->image_on('phpgwapi',Array('home','nonav'),'-over');
+			$GLOBALS['phpgw_info']['navbar']['home']['title']		= lang('home');
+			$GLOBALS['phpgw_info']['navbar']['home']['url']			= $GLOBALS['phpgw']->link('/home.php');
+			$GLOBALS['phpgw_info']['navbar']['home']['icon']		= $this->image('phpgwapi',Array('home','nonav'));
+			$GLOBALS['phpgw_info']['navbar']['home']['icon_hover']	= $this->image_on('phpgwapi',Array('home','nonav'),'-over');
 
 			reset($GLOBALS['phpgw_info']['user']['apps']);
 			/* ksort($GLOBALS['phpgw_info']['user']['apps']); */
@@ -1200,31 +1241,26 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 
 				if ($GLOBALS['phpgw_info']['apps'][$permission[0]]['status'] != 2 && $GLOBALS['phpgw_info']['apps'][$permission[0]]['status'] != 3)
 				{
-					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['title'] = $GLOBALS['phpgw_info']['apps'][$permission[0]]['title'];
-					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['url']   = $GLOBALS['phpgw']->link('/' . $permission[0] . '/index.php');
-					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['name']  = $permission[0];
+					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['title']	= lang($permission[0]);
+					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['url']		= $GLOBALS['phpgw']->link('/' . $permission[0] . '/index.php');
+					$GLOBALS['phpgw_info']['navbar'][$permission[0]]['name']	= $permission[0];
 
 					if ($permission[0] != $GLOBALS['phpgw_info']['flags']['currentapp'])
 					{
-						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']  = $this->image($permission[0],Array('navbar','nonav'));
-						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover']  = $this->image_on($permission[0],Array('navbar','nonav'),'-over');
+						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']		= $this->image($permission[0],Array('navbar','nonav'));
+						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover']	= $this->image_on($permission[0],Array('navbar','nonav'),'-over');
 					}
 					else
 					{
-						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']  = $this->image_on($permission[0],Array('navbar','nonav'),'-over');
-						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover']  = $this->image($permission[0],Array('navbar','nonav'));
+						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']		= $this->image_on($permission[0],Array('navbar','nonav'),'-over');
+						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover']	= $this->image($permission[0],Array('navbar','nonav'));
 					}
-
-//					if($GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] == '')
-//					{
-//						$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']  = $this->image('phpgwapi','nonav');
-//					}
 				}
 			}
-			$GLOBALS['phpgw_info']['navbar']['preferences']['title'] = 'preferences';
-			$GLOBALS['phpgw_info']['navbar']['preferences']['url']   = $GLOBALS['phpgw']->link('/preferences/index.php');
-			$GLOBALS['phpgw_info']['navbar']['preferences']['icon']  = $this->image('preferences',Array('navbar','nonav'));
-			$GLOBALS['phpgw_info']['navbar']['preferences']['icon_hover']  = $this->image_on('preferences',Array('navbar','nonav'),'-over');
+
+			$GLOBALS['phpgw_info']['navbar']['preferences']['url']			= $GLOBALS['phpgw']->link('/preferences/index.php');
+			$GLOBALS['phpgw_info']['navbar']['preferences']['icon']			= $this->image('preferences',Array('navbar','nonav'));
+			$GLOBALS['phpgw_info']['navbar']['preferences']['icon_hover']	= $this->image_on('preferences',Array('navbar','nonav'),'-over');
 
 			if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences')
 			{
@@ -1236,11 +1272,11 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
 			}
 
 			/* We handle this here becuase its special */
-			$GLOBALS['phpgw_info']['navbar']['about']['title'] = lang('About x',$app);
 
-			$GLOBALS['phpgw_info']['navbar']['about']['url']   = $GLOBALS['phpgw']->link('/about.php','app='.$app);
-			$GLOBALS['phpgw_info']['navbar']['about']['icon']  = $this->image('phpgwapi',Array('about','nonav'));
-			$GLOBALS['phpgw_info']['navbar']['about']['icon_hover']  = $this->image_on('phpgwapi',Array('about','nonav'),'-over');
+			$GLOBALS['phpgw_info']['navbar']['about']['title']		= lang('about x',lang($app));
+			$GLOBALS['phpgw_info']['navbar']['about']['url']		= $GLOBALS['phpgw']->link('/about.php','app='.$app);
+			$GLOBALS['phpgw_info']['navbar']['about']['icon']		= $this->image('phpgwapi',Array('about','nonav'));
+			$GLOBALS['phpgw_info']['navbar']['about']['icon_hover']	= $this->image_on('phpgwapi',Array('about','nonav'),'-over');
 
 			$GLOBALS['phpgw_info']['navbar']['logout']['title'] = 'Logout';
 			$GLOBALS['phpgw_info']['navbar']['logout']['url']   = $GLOBALS['phpgw']->link('/logout.php');
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index fed3e5a9a9..42541015ea 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -13,7 +13,6 @@
 
 	/* Basic information about this app */
 	$setup_info['phpgwapi']['name']      = 'phpgwapi';
-	$setup_info['phpgwapi']['title']     = 'phpgwapi';
 	$setup_info['phpgwapi']['version']   = '0.9.15.006';
 	$setup_info['phpgwapi']['versions']['current_header'] = '1.22';
 	$setup_info['phpgwapi']['enable']    = 3;
diff --git a/phpgwapi/templates/idsociety/parts.inc.php b/phpgwapi/templates/idsociety/parts.inc.php
index 627a3a2d65..8f04e9fe70 100644
--- a/phpgwapi/templates/idsociety/parts.inc.php
+++ b/phpgwapi/templates/idsociety/parts.inc.php
@@ -50,7 +50,7 @@
 
 		if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home')
 		{
-			$var['welcome_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
+			$var['welcome_img']	= $GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
 			$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
 		}
 		else
@@ -58,6 +58,7 @@
 			$var['welcome_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
 			$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
 		}
+		$var['welcome_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
 
 		if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'preferences')
 		{
@@ -69,11 +70,12 @@
 			$var['preferences_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
 			$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2');
 		}
+		$var['preferences_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
 
 		$var['logout_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','log_out2');
 		$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
+		$var['logout_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
 
-		
 		if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'about')
 		{
 			$var['about_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2');
@@ -122,10 +124,10 @@
 		$applications = '';
 		while ($app = each($GLOBALS['phpgw_info']['navbar']))
 		{
-			if ($app[1]['title'] != 'Home' && $app[1]['title'] != 'preferences' && !ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout')
+			if ($app[0] != 'home' && $app[0] != 'preferences' && $app[0] != 'about' && $app[0] != 'logout')
 			{
 				$title = '<img src="' . $app[1]['icon'] . '" alt="' . $app[1]['title'] . '" title="'
-					. lang($app[1]['title']) . '" border="0" name="' . str_replace('-','_',$app[0]) . '">';
+					. $app[1]['title'] . '" border="0" name="' . str_replace('-','_',$app[0]) . '">';
 				$img_src_over = $app[1]['icon_hover'];
 				$img_src_out = $app[1]['icon'];
 
diff --git a/phpgwapi/templates/idsociety/phpgw.xsl b/phpgwapi/templates/idsociety/phpgw.xsl
index 7781a98c60..daa8df1d4d 100644
--- a/phpgwapi/templates/idsociety/phpgw.xsl
+++ b/phpgwapi/templates/idsociety/phpgw.xsl
@@ -3,11 +3,24 @@
 	<xsl:template match="phpgw">
 	<xsl:variable name="phpgw_css_path"><xsl:value-of select="phpgw_css_path"/></xsl:variable>
 	<xsl:variable name="theme_css_path"><xsl:value-of select="theme_css_path"/></xsl:variable>
-	<xsl:variable name="phpgw_charset"><xsl:value-of select="phpgw_charset"/></xsl:variable>
-	<xsl:variable name="phpgw_onload"><xsl:value-of select="phpgw_onload"/></xsl:variable>
+	<xsl:variable name="charset"><xsl:value-of select="charset"/></xsl:variable>
+	<xsl:variable name="onload"><xsl:value-of select="onload"/></xsl:variable>
+	<xsl:variable name="logo_img"><xsl:value-of select="logo_img"/></xsl:variable>
+	<xsl:variable name="home_link"><xsl:value-of select="home_link"/></xsl:variable>
+	<xsl:variable name="preferences_link"><xsl:value-of select="preferences_link"/></xsl:variable>
+	<xsl:variable name="logout_link"><xsl:value-of select="logout_link"/></xsl:variable>
+	<xsl:variable name="help_link"><xsl:value-of select="help_link"/></xsl:variable>
+	<xsl:variable name="welcome_img_hover"><xsl:value-of select="welcome_img_hover"/></xsl:variable>
+	<xsl:variable name="preferences_img_hover"><xsl:value-of select="preferences_img_hover"/></xsl:variable>
+	<xsl:variable name="logout_img_hover"><xsl:value-of select="logout_img_hover"/></xsl:variable>
+	<xsl:variable name="about_img_hover"><xsl:value-of select="about_img_hover"/></xsl:variable>
+	<xsl:variable name="welcome_img"><xsl:value-of select="welcome_img"/></xsl:variable>
+	<xsl:variable name="preferences_img"><xsl:value-of select="preferences_img"/></xsl:variable>
+	<xsl:variable name="logout_img"><xsl:value-of select="logout_img"/></xsl:variable>
+	<xsl:variable name="about_img"><xsl:value-of select="about_img"/></xsl:variable>
 		<html>
 			<head>
-				<meta http-equiv="Content-Type" content="text/html; charset={$phpgw_charset}"/>
+				<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
 				<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
 				<meta name="description" content="phpGroupWare"/>
 				<meta name="keywords" content="phpGroupWare"/>
@@ -15,11 +28,57 @@
 				<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"/>
+
+				<script language="JavaScript" type="text/javascript">
+				<xsl:text>
+					function MM_swapImgRestore()
+					{ //v3.0
+						var i,x,a=document.MM_sr;
+						for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++)
+						x.src=x.oSrc;
+					}
+					function MM_preloadImages()
+					{ //v3.0
+						var d=document; if(d.images)
+						{
+							if(!d.MM_p)
+							d.MM_p=new Array();
+							var i,j=d.MM_p.length,a=MM_preloadImages.arguments;
+							for(i=0; i<a.length; i++)
+							if (a[i].indexOf("#")!=0)
+							{
+								d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];
+							}
+						}
+					}
+					function MM_findObj(n, d)
+					{ //v4.0
+						var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+						d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+						if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+						for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+						if(!x && document.getElementById) x=document.getElementById(n); return x;
+					}
+					function MM_swapImage()
+					{ //v3.0
+						var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+						if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+					}
+
+					function multiLoad(top_doc,left_doc,body_doc,right_doc,bottom_doc)
+					{
+						if(top_doc != null){ parent.top.location.href=top_doc; }
+						if(left_doc != null){ parent.left.location.href=left_doc; }
+						if(body_doc != null){ parent.body.location.href=body_doc; }
+						if(right_doc != null){ parent.right.location.href=right_doc; }
+						if(bottom_doc != null){ parent.bottom.location.href=bottom_doc; }
+					}
+				</xsl:text>
+				</script>
 				<link rel="stylesheet" type="text/css" href="{$phpgw_css_path}">
 				<link rel="stylesheet" type="text/css" href="{$theme_css_path}">
 			</head>
-			<body onLoad="{$phpgw_onload}">
+			<body onLoad="{$onload}">
 				<table width="100%" height="100%" cellspacing="0" cellpadding="0">
 					<tr>
 						<td colspan="2">
@@ -29,14 +88,21 @@
 								<!-- top row back images are 58px high, but the row may be smaller than that -->
 								<!-- row 2 images are 15 px high, so this table with these 2 rows is 58 plus 15 equals 73px high  -->
 									<td width="154" valign="top">
-										<img src="{logo_img}" border="0">
+										<img src="{$logo_img}" border="0">
 									</td>
 									<td valign="bottom">
 										<table width="100%" cellpadding="0" cellspacing="0">
 											<tr>
-												<td width="33%" class="info">{user_info_name}</td>
-												<td width="33%" class="info">{current_users}</td>
-												<td width="33%" class="info" align="right">{user_info_date}</td>
+												<td width="33%" class="info"><xsl:value-of select="user_info_name"/></td>
+												<xsl:choose>
+													<xsl:when test="current_users">
+														<td width="33%" class="info"><a href="{$url_current_users}"><xsl:value-of select="current_users"/></a></td>
+													</xsl:when>
+													<xsl:otherwise>
+														<td></td>
+													</xsl:othwerwise>
+												</xsl:choose>
+												<td width="33%" class="info" align="right"><xsl:value-of select="user_info_date"/></td>
 											</tr>
 										</table>
 									</td>
@@ -46,10 +112,10 @@
 									<!-- row 2 right nav buttons -->
 										<table cellpadding="0" cellspacing="0">
 											<tr>
-												<td><a href="{home_link}" onMouseOver="nine.src='{welcome_img_hover}'" onMouseOut="nine.src='{welcome_img}'"><img src="{welcome_img}" border="0" name="nine"></a></td>
-												<td><a href="{preferences_link}" onMouseOver="ten.src='{preferences_img_hover}'" onMouseOut="ten.src='{preferences_img}'"><img src="{preferences_img}" border="0" name="ten"></a></td>
-												<td><a href="{logout_link}" onMouseOver="eleven.src='{logout_img_hover}'" onMouseOut="eleven.src='{logout_img}'"><img src="{logout_img}" border="0" name="eleven"></a></td>
-												<td><a href="{help_link}" onMouseOver="help.src='{about_img_hover}'" onMouseOut="help.src='{about_img}'"><img src="{about_img}" border="0" name="help"></a></td>
+												<td><a href="{$home_link}" onMouseOver="nine.src='{$welcome_img_hover}'" onMouseOut="nine.src='{$welcome_img}'"><img src="{$welcome_img}" border="0" name="nine" alt="{$welcome_title}" title="{$welcome_title}"></a></td>
+												<td><a href="{$preferences_link}" onMouseOver="ten.src='{$preferences_img_hover}'" onMouseOut="ten.src='{$preferences_img}'"><img src="{$preferences_img}" border="0" name="ten" alt="{$prefs_title}" title="{$prefs_title}"></a></td>
+												<td><a href="{$logout_link}" onMouseOver="eleven.src='{$logout_img_hover}'" onMouseOut="eleven.src='{$logout_img}'"><img src="{$logout_img}" border="0" name="eleven" alt="{$logout_title}" title="{$logout_title}"></a></td>
+												<td><a href="{$help_link}" onMouseOver="help.src='{$about_img_hover}'" onMouseOut="help.src='{$about_img}'"><img src="{$about_img}" border="0" name="help" alt="{$about_title}" title="{$about_title}"></a></td>
 											</tr>
 										</table>
 									</td>
@@ -64,12 +130,12 @@
 							<table cellspacing="0" cellpadding="0" valign="top" class="left">
 								<xsl:apply-templates select="applications"/>
 								<tr>
-									<td><img src="{nav_bar_left_top_bg_img}"></td>
+									<td><img src="{$nav_bar_left_top_bg_img}"></td>
 								</tr>
 							</table>
 						<!-- END left_part -->
 						</td>
-						<td width="85%" height="85%" valign="top">
+						<td width="85%" height="85%" valign="top" align="center">
 							<xsl:call-template name="msgbox"/>
 							<xsl:call-template name="phpgw_body"/>
 						</td>
@@ -77,7 +143,16 @@
 					<tr>
 						<td colspan="2" align="center" valign="middle" class="info">
 						<!-- BEGIN bottom_part -->
-									{powered}
+							<xsl:value-of select="lang_powered_by"/>
+							<a href="http://www.phpgroupware.org" target="blank" onMouseout="window.status='';return true;">
+								<xsl:attribute name="onMouseover">
+									<xsl:text>window.status='</xsl:text>
+									<xsl:value-of select="lang_phpgw_statustext"/>
+									<xsl:text>'; return true;</xsl:text>
+								</xsl:attribute>
+								<xsl:text> phpGroupWare </xsl:text>
+							</a>
+							<xsl:text> </xsl:text><xsl:value-of select="lang_version"/><xsl:text> </xsl:text><xsl:value-of select="phpgw_version"/>
 						<!-- END bottom_part -->
 						</td>
 					</tr>
@@ -88,55 +163,8 @@
 
 	<xsl:template match="applications">
 		<tr>
-			<td class="info">
-
+			<td class="left">
+				<a href="{$url}" onMouseOver="{$name}.src='{$img_src_over}'" onMouseOut="{$name}.src='{$icon}'"><img src="{$icon}" border="0" alt="{$title}" title="{$title}" name="{$name}"></a>
 			</td>
 		</tr>
 	</xsl:template>
-
-	<xsl:template match="head_js">
-		<script language="JavaScript" type="text/javascript">
-		<xsl:text>
-			function MM_swapImgRestore()
-			{ //v3.0
-				var i,x,a=document.MM_sr;
-				for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++)
-					x.src=x.oSrc;
-			}
-			function MM_preloadImages()
-			{ //v3.0
-				var d=document; if(d.images)
-				{
-					if(!d.MM_p)
-						d.MM_p=new Array();
-					var i,j=d.MM_p.length,a=MM_preloadImages.arguments;
-					for(i=0; i<a.length; i++)
-						if (a[i].indexOf("#")!=0)
-						{
-							d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];
-						}
-				}
-			}
-			function MM_findObj(n, d)
-			{ //v4.0
-				var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
-			d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
-			if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
-			for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
-			if(!x && document.getElementById) x=document.getElementById(n); return x;
-			}
-			function MM_swapImage() { //v3.0
-			var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
-			if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
-			}
-
-			function multiLoad(top_doc,left_doc,body_doc,right_doc,bottom_doc) {
-			if(top_doc != null){ parent.top.location.href=top_doc; }
-			if(left_doc != null){ parent.left.location.href=left_doc; }
-			if(body_doc != null){ parent.body.location.href=body_doc; }
-			if(right_doc != null){ parent.right.location.href=right_doc; }
-			if(bottom_doc != null){ parent.bottom.location.href=bottom_doc; }
-			}
-		</xsl:text>
-		</script>
-	</xsl:template>
diff --git a/preferences/setup/setup.inc.php b/preferences/setup/setup.inc.php
index 60020c6740..5094bfacfd 100755
--- a/preferences/setup/setup.inc.php
+++ b/preferences/setup/setup.inc.php
@@ -12,7 +12,6 @@
 	/* $Id$ */
 
 	$setup_info['preferences']['name']      = 'preferences';
-	$setup_info['preferences']['title']     = 'Preferences';
 	$setup_info['preferences']['version']   = '0.9.13.002';
 	$setup_info['preferences']['app_order'] = 1;
 	$setup_info['preferences']['tables']    = '';