From 75477570fcefccc8888ee02efcd4415b4b92ccbe Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Mon, 29 Apr 2002 00:54:41 +0000
Subject: [PATCH] Fixed it to where the usernam,e/date/phpGW version is at the
 bottom of the app list.  On IE 6.0 it was dispalying those fields in the
 middle of the apps list.

---
 .../templates/linux-at-work.de/navbar.inc.php     | 15 ++++++++-------
 phpgwapi/templates/linux-at-work.de/navbar.tpl    | 12 ------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/phpgwapi/templates/linux-at-work.de/navbar.inc.php b/phpgwapi/templates/linux-at-work.de/navbar.inc.php
index 1bc11b56fc..074ea3180e 100644
--- a/phpgwapi/templates/linux-at-work.de/navbar.inc.php
+++ b/phpgwapi/templates/linux-at-work.de/navbar.inc.php
@@ -52,13 +52,20 @@
 			}
 		}
 
+		$applications .= '<tr><td class="main_menu_bottom">'.$GLOBALS['phpgw']->common->display_fullname().'<br>'
+			. lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
+			. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
+			. $GLOBALS['phpgw']->common->show_date(time(),'d, Y').'<br>'
+			. lang('version').': '.$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
+			. '</td></tr>'."\r\n";
+
 		$var['applications'] = $applications;
      
 		$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['help_link'] 	= $GLOBALS['phpgw_info']['navbar']['about']['url'];
-		$var['lang_welcome']	= lang('welcome');
+		$var['lang_welcome']	= lang('Welcome');
 		$var['lang_preferences']	= lang('preferences');
 		$var['lang_logout']	= lang('logout');
 		$var['lang_help']	= lang('help');
@@ -76,7 +83,6 @@
 			$var['powered_by'] = '';
 			$tpl->set_var($var);
 		}
-		$var['phpgw_version'] = lang("version").": ".$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
 		$tpl->set_var($var);
 
 		if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
@@ -94,11 +100,6 @@
 			$tpl->set_var($var);
 		}
 
-		$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
-		$var['user_info_date'] =
-				  lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
-				. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
-				. $GLOBALS['phpgw']->common->show_date(time(),'d, Y');
 		$var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
 		$var['user_info_size'] = '2';
 		$var['user_info_color'] = '#000000';
diff --git a/phpgwapi/templates/linux-at-work.de/navbar.tpl b/phpgwapi/templates/linux-at-work.de/navbar.tpl
index 3452ecb3de..4ab6024a1e 100755
--- a/phpgwapi/templates/linux-at-work.de/navbar.tpl
+++ b/phpgwapi/templates/linux-at-work.de/navbar.tpl
@@ -30,18 +30,6 @@
 	</table>
 </div>
 
-<div class="main_menu" style="width : 15% ; height : 50px ; left : 0px ; bottom : 0px ;">
-	<table summary="" style="width : 100%; ">
-		<tr>
-			<td class="main_menu_bottom">
-				{user_info_name}<br>
-				{user_info_date}<br>
-				{phpgw_version}
-			</td>
-		</tr>
-	</table>
-</div>
-
 <div class="main_body" style="position: absolute; padding: 0px; height:100%; left:15% ; top :0px ;
 width:85%; overflow : auto">
 <!-- END navbar -->