[Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de navbar.inc.php,1.7,1.8 navbar.tpl,1.3,1.4

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de
In directory subversions:/tmp/cvs-serv2975/phpgwapi/templates/linux-at-work.de

Modified Files:
        navbar.inc.php navbar.tpl 
Log Message:
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.

Index: navbar.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/navbar.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** navbar.inc.php      27 Mar 2002 22:09:17 -0000      1.7
--- navbar.inc.php      29 Apr 2002 00:54:41 -0000      1.8
***************
*** 53,56 ****
--- 53,63 ----
                }
  
+               $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;
       
***************
*** 59,63 ****
                $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_preferences']        = lang('preferences');
                $var['lang_logout']     = lang('logout');
--- 66,70 ----
                $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_preferences']        = lang('preferences');
                $var['lang_logout']     = lang('logout');
***************
*** 77,81 ****
                        $tpl->set_var($var);
                }
-               $var['phpgw_version'] = lang("version").": 
".$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
                $tpl->set_var($var);
  
--- 84,87 ----
***************
*** 95,103 ****
                }
  
-               $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';
--- 101,104 ----

Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/navbar.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** navbar.tpl  31 Dec 2001 01:17:10 -0000      1.3
--- navbar.tpl  29 Apr 2002 00:54:41 -0000      1.4
***************
*** 31,46 ****
  </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">
--- 31,34 ----