[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.173,1.174
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.173,1.174 |
|
Date: |
Sun, 27 Oct 2002 23:50:46 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv6317/phpgwapi/inc
Modified Files:
class.common.inc.php
Log Message:
update
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -r1.173 -r1.174
*** class.common.inc.php 26 Oct 2002 22:39:19 -0000 1.173
--- class.common.inc.php 28 Oct 2002 04:50:43 -0000 1.174
***************
*** 484,488 ****
}
! $output_text .= '<td align="left"
background="' . $ir . '/tabs-bg1.gif"> <b><a href="'
. $tab[1]['link'] . '"
class="tablink">' . $fs . $tab[1]['label']
. $fse . '</a></b> </td>';
--- 484,488 ----
}
! $output_text .= '<td align="left"
nowrap background="' . $ir . '/tabs-bg1.gif"> <b><a href="'
. $tab[1]['link'] . '"
class="tablink">' . $fs . $tab[1]['label']
. $fse . '</a></b> </td>';
***************
*** 502,506 ****
$output_text .= '<td
align="right"><img src="' . $ir . '/tabs-start0.gif"></td>';
}
! $output_text .= '<td align="left"
background="' . $ir . '/tabs-bg0.gif"> <b><a href="'
. $tab[1]['link'] . '"
class="tablink">' . $fs . $tab[1]['label'] . $fse
. '</a></b> </td>';
--- 502,506 ----
$output_text .= '<td
align="right"><img src="' . $ir . '/tabs-start0.gif"></td>';
}
! $output_text .= '<td align="left"
nowrap background="' . $ir . '/tabs-bg0.gif"> <b><a href="'
. $tab[1]['link'] . '"
class="tablink">' . $fs . $tab[1]['label'] . $fse
. '</a></b> </td>';
***************
*** 923,970 ****
}
! function image($appname,$image='',$ext='')
{
! if(is_array($image))
{
! $i = 0;
!
if(isset($this->found_files[$appname][$image[$i].$ext]))
{
! $image_found =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image[$i].$ext].'/'.$image[$i].$ext;
}
! else
{
! $image_found =
$this->find_image($appname,$image[$i].$ext);
}
! $c_image = count($image);
! $i++;
! while($image_found == '' && $i<$c_image)
! {
!
if(isset($this->found_files[$appname][$image[$i].$ext]))
! {
! $image_found =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image[$i].$ext].'/'.$image[$i].$ext;
! }
! else
! {
! $image_found =
$this->find_image($appname,$image[$i].$ext);
! $i++;
! }
! }
! return $image_found;
}
! elseif($image != '')
{
!
if(isset($this->found_files[$appname][$image.$ext]))
{
! return
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.$ext].'/'.$image.$ext;
}
else
{
! return
$this->find_image($appname,$image.$ext);
}
}
! else
! {
! return '';
! }
}
--- 923,957 ----
}
! function image($appname,$image='',$ext='',$use_lang=True)
{
! if (!is_array($image))
{
! if (empty($image))
{
! return '';
}
! $image = array($image);
! }
! if ($use_lang)
! {
! while (list(,$img) = each($image))
{
! $lang_images[] = $img . '_' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
! $lang_images[] = $img;
}
! $image = $lang_images;
}
! while (!$image_found && list(,$img) = each($image))
{
!
if(isset($this->found_files[$appname][$img.$ext]))
{
! $image_found =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$img.$ext].'/'.$img.$ext;
}
else
{
! $image_found =
$this->find_image($appname,$img.$ext);
}
}
! return $image_found;
}
***************
*** 1081,1085 ****
'phpgw_css_file' => $css[0],
'theme_css_file' => $css[1],
! 'phpgw_body' => $phpgw_body
);
--- 1068,1072 ----
'phpgw_css_file' => $css[0],
'theme_css_file' => $css[1],
! 'app_tpl' => $app_tpl
);
***************
*** 1161,1165 ****
$var['logout_img'] =
$this->image('phpgwapi','logout-grey');
$var['about_img'] =
$this->image('phpgwapi','help');
! $var['greybar'] =
$this->image('phpgwapi','greybar.jpg');
break;
default:
--- 1148,1152 ----
$var['logout_img'] =
$this->image('phpgwapi','logout-grey');
$var['about_img'] =
$this->image('phpgwapi','help');
! $var['greybar'] =
$this->image('phpgwapi','greybar');
break;
default:
***************
*** 1167,1171 ****
$var['prefs_img'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['icon'];
$var['logout_img'] =
$GLOBALS['phpgw_info']['navbar']['logout']['icon'];
! $var['about_img'] =
$GLOBALS['phpgw_info']['navbar']['about']['icon'];
break;
}
--- 1154,1158 ----
$var['prefs_img'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['icon'];
$var['logout_img'] =
$GLOBALS['phpgw_info']['navbar']['logout']['icon'];
! $var['about_img'] =
$GLOBALS['phpgw_info']['navbar']['about']['icon'];
break;
}
***************
*** 1203,1207 ****
'title' =>
$data['title'],
'img_src_over' =>
$data['icon_hover'],
! 'url'
=> $data['url'],
'name' =>
str_replace('-','_',$app)
);
--- 1190,1194 ----
'title' =>
$data['title'],
'img_src_over' =>
$data['icon_hover'],
! 'url' =>
$data['url'],
'name' =>
str_replace('-','_',$app)
);
***************
*** 1211,1215 ****
--- 1198,1232 ----
$GLOBALS['phpgw_info']['flags']['preload_images'][] = $data['icon_hover'];
}
+
+ if
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] ==
'text' &&
+
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] ==
'default')
+ {
+ $tabs[$app] = array
+ (
+ 'label' =>
$data['title'],
+ 'link' => $data['url']
+ );
+ }
}
+
+ if
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] ==
'text' &&
+
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] ==
'default')
+ {
+ if ($app == 'home' || $app ==
'preferences' || $app == 'about' || $app == 'logout')
+ {
+ $base_tabs[$app] = array
+ (
+ 'label' =>
$data['title'],
+ 'link' => $data['url']
+ );
+ }
+ }
+ }
+
+ if
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] ==
'text' &&
+
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] ==
'default')
+ {
+ $var['app_tabs'] =
$this->create_tabs($tabs,$GLOBALS['phpgw_info']['flags']['currentapp'],-1);
+ $var['base_tabs'] =
$this->create_tabs($base_tabs,$GLOBALS['phpgw_info']['flags']['currentapp'],-1);
}
***************
*** 1236,1239 ****
--- 1253,1257 ----
$var['lang_phpgw_statustext'] = lang('phpGroupWare
--> homepage');
$var['top_spacer_middle_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
+ $var['navbar_format'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'];
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
***************
*** 1272,1297 ****
unset($newarray);
! while ($permission =
each($GLOBALS['phpgw_info']['user']['apps']))
{
! if (is_long($permission[0]))
{
continue;
}
! if
($GLOBALS['phpgw_info']['apps'][$permission[0]]['status'] != 2 &&
$GLOBALS['phpgw_info']['apps'][$permission[0]]['status'] != 3)
{
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['title'] =
lang($permission[0]);
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['url'] =
$GLOBALS['phpgw']->link('/' . $permission[0] . '/index.php');
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['name'] =
$permission[0];
! if ($permission[0] !=
$GLOBALS['phpgw_info']['flags']['currentapp'])
{
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] =
$this->image($permission[0],Array('navbar','nonav'));
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover'] =
$this->image_on($permission[0],Array('navbar','nonav'),'-over');
}
else
{
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] =
$this->image_on($permission[0],Array('navbar','nonav'),'-over');
!
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon_hover'] =
$this->image($permission[0],Array('navbar','nonav'));
}
}
--- 1290,1315 ----
unset($newarray);
! while (list($app,$data) =
each($GLOBALS['phpgw_info']['user']['apps']))
{
! if (is_long($app))
{
continue;
}
! if
($GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 &&
$GLOBALS['phpgw_info']['apps'][$app]['status'] != 3)
{
!
$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'));
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.173,1.174,
Bettina Gille <address@hidden> <=