[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.177,1.178
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.177,1.178 |
|
Date: |
Sat, 02 Nov 2002 20:03:08 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv16251/phpgwapi/inc
Modified Files:
class.common.inc.php
Log Message:
removed var from hook_admin
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -r1.177 -r1.178
*** class.common.inc.php 2 Nov 2002 22:25:13 -0000 1.177
--- class.common.inc.php 3 Nov 2002 01:03:06 -0000 1.178
***************
*** 820,824 ****
}
! function find_image($appname,$image)
{
static $imgpref;
--- 820,824 ----
}
! function find_image($appname,$image,$navbar=False)
{
static $imgpref;
***************
*** 840,871 ****
if (address@hidden($this->found_files[$appname]))
{
- $imagedir_olddefault = '/'.$appname.'/images';
- $imagedir_default =
'/'.$appname.'/templates/default/images';
$imagedir =
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
! if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault))
{
! $d =
dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault);
! while (false != ($entry = $d->read()))
{
! if ($entry != '.' && $entry !=
'..')
{
!
$this->found_files[$appname][$entry] = $imagedir_olddefault;
}
}
- $d->close();
- }
! if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_default))
! {
! $d =
dir(PHPGW_INCLUDE_ROOT.$imagedir_default);
! while (false != ($entry = $d->read()))
{
! if ($entry != '.' && $entry !=
'..')
{
!
$this->found_files[$appname][$entry] = $imagedir_default;
}
}
- $d->close();
}
--- 840,875 ----
if (address@hidden($this->found_files[$appname]))
{
$imagedir =
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
! if (!$navbar)
{
! $imagedir_olddefault =
'/'.$appname.'/images';
! $imagedir_default =
'/'.$appname.'/templates/default/images';
!
! if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault))
{
! $d =
dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault);
! while (false != ($entry =
$d->read()))
{
! if ($entry != '.' &&
$entry != '..')
! {
!
$this->found_files[$appname][$entry] = $imagedir_olddefault;
! }
}
+ $d->close();
}
! if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_default))
{
! $d =
dir(PHPGW_INCLUDE_ROOT.$imagedir_default);
! while (false != ($entry =
$d->read()))
{
! if ($entry != '.' &&
$entry != '..')
! {
!
$this->found_files[$appname][$entry] = $imagedir_default;
! }
}
+ $d->close();
}
}
***************
*** 923,927 ****
}
! function image($appname,$image='',$ext='',$use_lang=True)
{
if (!is_array($image))
--- 927,931 ----
}
! function
image($appname,$image='',$ext='',$navbar=False,$use_lang=True)
{
if (!is_array($image))
***************
*** 950,954 ****
else
{
! $image_found =
$this->find_image($appname,$img.$ext);
}
}
--- 954,958 ----
else
{
! $image_found =
$this->find_image($appname,$img.$ext,$navbar);
}
}
***************
*** 956,963 ****
}
! function image_on($appname,$image,$extension='_on')
{
! $with_extension =
$this->image($appname,$image,$extension);
! $without_extension = $this->image($appname,$image);
if($with_extension != '')
{
--- 960,967 ----
}
! function
image_on($appname,$image,$extension='_on',$navbar=False)
{
! $with_extension =
$this->image($appname,$image,$extension,$navbar);
! $without_extension =
$this->image($appname,$image,'',$navbar);
if($with_extension != '')
{
***************
*** 1302,1305 ****
--- 1306,1318 ----
unset($newarray);
+ if ($GLOBALS['phpgw_info']['server']['template_set'] ==
'idsociety')
+ {
+ $navbar = True;
+ }
+ else
+ {
+ $navbar = False;
+ }
+
while (list($app,$data) =
each($GLOBALS['phpgw_info']['user']['apps']))
{
***************
*** 1312,1327 ****
{
$GLOBALS['phpgw_info']['navbar'][$app]['title'] = lang($data['title']);
!
$GLOBALS['phpgw_info']['navbar'][$app]['url'] =
$GLOBALS['phpgw']->link('/' . $app . '/index.php');
$GLOBALS['phpgw_info']['navbar'][$app]['name'] = $app;
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'));
}
}
--- 1325,1340 ----
{
$GLOBALS['phpgw_info']['navbar'][$app]['title'] = lang($data['title']);
!
$GLOBALS['phpgw_info']['navbar'][$app]['url'] = $GLOBALS['phpgw']->link('/' .
$app . '/index.php');
$GLOBALS['phpgw_info']['navbar'][$app]['name'] = $app;
if ($app !=
$GLOBALS['phpgw_info']['flags']['currentapp'])
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image($app,Array('navbar','nonav'),'',$navbar);
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover'] =
$this->image_on($app,Array('navbar','nonav'),'-over',$navbar);
}
else
{
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon'] =
$this->image_on($app,Array('navbar','nonav'),'-over',$navbar);
!
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover'] =
$this->image($app,Array('navbar','nonav'),'',$navbar);
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.177,1.178,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wcm/inc hook_about.inc.php,1.2,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: notes/inc class.ui.inc.php,1.42,1.43 hook_admin.inc.php,1.4,1.5
- Previous by thread:
[Phpgroupware-cvs] CVS: wcm/inc hook_about.inc.php,1.2,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: notes/inc class.ui.inc.php,1.42,1.43 hook_admin.inc.php,1.4,1.5
- Index(es):