[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.194,1.195

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv2015

Modified Files:
        class.common.inc.php 
Log Message:
added appname to website title (as dave in .16)

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.194
retrieving revision 1.195
diff -C2 -r1.194 -r1.195
*** class.common.inc.php        28 Mar 2003 16:19:46 -0000      1.194
--- class.common.inc.php        30 Mar 2003 11:04:57 -0000      1.195
***************
*** 1059,1067 ****
                        $this->navbar();
                        
                        $css = $this->get_css_url();
                        $var = array
                        (
                                'charset'                       => 
lang('charset'),
!                               'website_title'         => 
$GLOBALS['phpgw_info']['server']['site_title'],
                                'webserver_url'         => 
$GLOBALS['phpgw_info']['server']['webserver_url'],
                                'phpgw_css_file'        => $css[0],
--- 1059,1068 ----
                        $this->navbar();
                        
+                       $app_title = 
isset($GLOBALS['phpgw_info']['flags']['currentapp']) ? ' 
['.$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title'].']'
 : '';
                        $css = $this->get_css_url();
                        $var = array
                        (
                                'charset'                       => 
lang('charset'),
!                               'website_title'         => 
$GLOBALS['phpgw_info']['server']['site_title'].$app_title,
                                'webserver_url'         => 
$GLOBALS['phpgw_info']['server']['webserver_url'],
                                'phpgw_css_file'        => $css[0],
***************
*** 1244,1248 ****
                        $var['user_info'] = $var['user_info_name'] .' - ' 
.$var['user_info_date'];
  
!                       while (list($app,$data) = 
each($GLOBALS['phpgw_info']['navbar']))
                        {
                                if ($app == $cur_app)
--- 1245,1249 ----
                        $var['user_info'] = $var['user_info_name'] .' - ' 
.$var['user_info_date'];
  
!                       foreach($GLOBALS['phpgw_info']['navbar'] as $app => 
$data)
                        {
                                if ($app == $cur_app)
***************
*** 1260,1267 ****
                                        (
                                                'icon'                  => 
$data['icon'],
!                                               'title'                 => 
$GLOBALS['phpgw_info']['apps'][$app]['title'],
                                                'img_src_over'  => 
$data['icon_hover'],
                                                'url'                   => 
$data['url'],
!                                               'name'                  => 
str_replace('-','_',$app),
                                                'statustext'    => 
$data['title'],
                                                'css'                   => 
$app_css
--- 1261,1268 ----
                                        (
                                                'icon'                  => 
$data['icon'],
!                                               'title'                 => 
$data['title'],
                                                'img_src_over'  => 
$data['icon_hover'],
                                                'url'                   => 
$data['url'],
!                                               'name'                  => 
$data['title'],
                                                'statustext'    => 
$data['title'],
                                                'css'                   => 
$app_css
***************
*** 1383,1387 ****
                                if ($app == 'preferences' || 
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 && 
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 3)
                                {
!                                       
$GLOBALS['phpgw_info']['navbar'][$app]['title'] = $data['title'];
                                        
$GLOBALS['phpgw_info']['navbar'][$app]['url']   = $GLOBALS['phpgw']->link('/' . 
$app . '/index.php');
                                        
$GLOBALS['phpgw_info']['navbar'][$app]['name']  = $app;
--- 1384,1388 ----
                                if ($app == 'preferences' || 
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 && 
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 3)
                                {
!                                       
$GLOBALS['phpgw_info']['navbar'][$app]['title'] = 
$GLOBALS['phpgw_info']['apps'][$app]['title'];
                                        
$GLOBALS['phpgw_info']['navbar'][$app]['url']   = $GLOBALS['phpgw']->link('/' . 
$app . '/index.php');
                                        
$GLOBALS['phpgw_info']['navbar'][$app]['name']  = $app;
***************
*** 1424,1428 ****
  
                        /* We handle this here becuase its special */
!                       $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'));
--- 1425,1429 ----
  
                        /* We handle this here becuase its special */
!                       $GLOBALS['phpgw_info']['navbar']['about']['title']      
        = lang('about %1',$GLOBALS['phpgw_info']['apps'][$app]['title']);
                        $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'));