[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.205,1.206
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.205,1.206 |
Date: |
Sun, 27 Apr 2003 15:27:31 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv6668
Modified Files:
class.common.inc.php
Log Message:
update img
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.205
retrieving revision 1.206
diff -C2 -r1.205 -r1.206
*** class.common.inc.php 27 Apr 2003 14:10:15 -0000 1.205
--- class.common.inc.php 27 Apr 2003 19:27:28 -0000 1.206
***************
*** 824,828 ****
static $imgpref;
! if ($GLOBALS['phpgw_info']['server']['template_set'] ==
'idsociety' || $GLOBALS['phpgw_info']['server']['template_set'] == 'funkwerk')
{
$force_layout = True;
--- 824,828 ----
static $imgpref;
! if($GLOBALS['phpgw_info']['server']['template_set'] ==
'funkwerk')
{
$force_layout = True;
***************
*** 850,856 ****
if (!$force_layout)
{
! $imagedir_olddefault =
'/'.$appname.'/images';
$imagedir_default =
'/'.$appname.'/templates/default/images';
if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault))
{
--- 850,858 ----
if (!$force_layout)
{
! //$imagedir_olddefault =
'/'.$appname.'/images';
$imagedir_default =
'/'.$appname.'/templates/default/images';
+ /* apps should be updated now to use
the tpl img_dirs
+
if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault))
{
***************
*** 864,868 ****
}
$d->close();
! }
if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_default))
--- 866,870 ----
}
$d->close();
! } */
if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_default))
***************
*** 1420,1423 ****
--- 1422,1431 ----
unset($newarray);
+ $force_layout = False;
+ if ($GLOBALS['phpgw_info']['server']['template_set'] ==
'idsociety')
+ {
+ $force_layout = True;
+ }
+
foreach($GLOBALS['phpgw_info']['user']['apps'] as $app
=> $data)
{
***************
*** 1435,1445 ****
if ($app !=
$GLOBALS['phpgw_info']['flags']['currentapp'])
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image($app,Array('navbar','nonav'));
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover'] =
$this->image_on($app,Array('navbar','nonav'),'-over');
}
else
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image_on($app,Array('navbar','nonav'),'-over');
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover'] =
$this->image($app,Array('navbar','nonav'));
}
}
--- 1443,1453 ----
if ($app !=
$GLOBALS['phpgw_info']['flags']['currentapp'])
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image($app,Array('navbar','nonav','',$force_layout));
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover'] =
$this->image_on($app,Array('navbar','nonav'),'-over',$force_layout);
}
else
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image_on($app,Array('navbar','nonav'),'-over',$force_layout);
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover'] =
$this->image($app,Array('navbar','nonav','',$force_layout));
}
}
***************
*** 1470,1475 ****
/* We handle this here becuase its special */
! $app_title =
isset($GLOBALS['phpgw_info']['apps'][$app]) ?
! $GLOBALS['phpgw_info']['apps'][$app]['title'] :
'phpGroupWare';
$GLOBALS['phpgw_info']['navbar']['about']['title']
= lang('about %1',$app_title);
$GLOBALS['phpgw_info']['navbar']['about']['url']
= $GLOBALS['phpgw']->link('/about.php','app='.$app);
--- 1478,1483 ----
/* We handle this here becuase its special */
! $app_title =
isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : 'phpGroupWare';
!
$GLOBALS['phpgw_info']['navbar']['about']['title']
= lang('about %1',$app_title);
$GLOBALS['phpgw_info']['navbar']['about']['url']
= $GLOBALS['phpgw']->link('/about.php','app='.$app);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.205,1.206,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.204,1.205 class.nextmatchs.inc.php,1.57,1.58
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default app_delete.xsl,1.8,1.9 msgbox.xsl,1.4,1.5 phpgw_header.xsl,1.6,1.7
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.204,1.205 class.nextmatchs.inc.php,1.57,1.58
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default app_delete.xsl,1.8,1.9 msgbox.xsl,1.4,1.5 phpgw_header.xsl,1.6,1.7
- Index(es):