[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.47,1.4
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.47,1.48 class.common.inc.php,1.180,1.181 class.xslttemplates.inc.php,1.13,1.14 |
|
Date: |
Fri, 15 Nov 2002 17:31:53 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv23590/phpgwapi/inc
Modified Files:
class.applications.inc.php class.common.inc.php
class.xslttemplates.inc.php
Log Message:
update
Index: class.applications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.applications.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** class.applications.inc.php 26 Oct 2002 22:39:19 -0000 1.47
--- class.applications.inc.php 15 Nov 2002 22:31:51 -0000 1.48
***************
*** 293,298 ****
while ($this->db->next_record())
{
!
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array(
! 'title' =>
str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))),
'name' =>
$this->db->f('app_name'),
'enabled' => True,
--- 293,300 ----
while ($this->db->next_record())
{
!
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array
! (
! //'title' =>
str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))),
! 'title' =>
lang($this->db->f('app_name')),
'name' =>
$this->db->f('app_name'),
'enabled' => True,
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -r1.180 -r1.181
*** class.common.inc.php 15 Nov 2002 05:15:39 -0000 1.180
--- class.common.inc.php 15 Nov 2002 22:31:51 -0000 1.181
***************
*** 1078,1081 ****
--- 1078,1083 ----
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP .
'phpgw');
+ $cur_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+
switch
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
{
***************
*** 1118,1129 ****
{
$var['prefs_img'] =
$this->image('phpgwapi','preferences2');
!
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$this->image_on('phpgwapi','preferences2','_over');
}
else
{
! $var['prefs_img'] =
$this->image_on('phpgwapi','preferences2','_over');
!
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$this->image('phpgwapi','preferences2');
}
! $var['prefs_img_hover'] =
$this->image_on('phpgwapi','preferences2','_over');
$var['logout_img'] =
$this->image('phpgwapi','log_out2');
--- 1120,1131 ----
{
$var['prefs_img'] =
$this->image('phpgwapi','preferences2');
!
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$this->image_on('preferences','preferences2','_over');
}
else
{
! $var['prefs_img'] =
$this->image_on('preferences','preferences2','_over');
!
$GLOBALS['phpgw_info']['flags']['preload_images'][] =
$this->image('preferences','preferences2');
}
! $var['prefs_img_hover'] =
$this->image_on('preferences','preferences2','_over');
$var['logout_img'] =
$this->image('phpgwapi','log_out2');
***************
*** 1142,1145 ****
--- 1144,1158 ----
}
+ if
($GLOBALS['phpgw_info']['flags']['currentapp'] != 'manual')
+ {
+ $var['manual_img']
= $this->image('manual','manual');
+ $var['manual_img_hover']
= $this->image_on('manual','manual','_over');
+ }
+ else
+ {
+ $var['manual_img']
= $this->image_on('manual','manual','_over');
+ $var['manual_img_hover']
= $this->image('manual','manual');
+ }
+
$var['logo_img'] =
$this->image('phpgwapi','logo2');
$var['nav_bar_left_top_bg_img'] =
$this->image('phpgwapi','nav_bar_left_top_bg');
***************
*** 1162,1170 ****
$var['about_img'] =
$this->image('phpgwapi','tab_help');
break;
default:
$var['home_img'] =
$GLOBALS['phpgw_info']['navbar']['home']['icon'];
$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;
}
--- 1175,1211 ----
$var['about_img'] =
$this->image('phpgwapi','tab_help');
break;
+ case 'funkwerk':
+ $var['about_img'] = '!';
+ $var['manual_img'] = '?';
+
+ switch ($cur_app)
+ {
+ case 'home':
+ $var['top_css_home'] =
'top_menu_selected';
+ $var['top_css'] =
$var['top_css_prefs'] = $var['top_css_about'] = $var['top_css_manual'] =
'top_menu';
+ break;
+ case 'preferences':
+ $var['top_css_prefs'] =
'top_menu_selected';
+ $var['top_css'] =
$var['top_css_home'] = $var['top_css_about'] = $var['top_css_manual'] =
'top_menu';
+ break;
+ case 'about':
+ $var['top_css_about'] =
'top_menu_selected';
+ $var['top_css'] =
$var['top_css_home'] = $var['top_css_prefs'] = $var['top_css_manual'] =
'top_menu';
+ break;
+ case 'manual':
+ $var['top_css_manual']
= 'top_menu_selected';
+ $var['top_css'] =
$var['top_css_home'] = $var['top_css_prefs'] = $var['top_css_about'] =
'top_menu';
+ break;
+ default:
+ $var['top_css'] =
$var['top_css_home'] = $var['top_css_prefs'] = $var['top_css_about'] =
$var['top_css_manual'] = 'top_menu';
+ break;
+ }
+ break;
default:
$var['home_img'] =
$GLOBALS['phpgw_info']['navbar']['home']['icon'];
$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'];
! $var['manual_img'] =
$GLOBALS['phpgw_info']['navbar']['manual']['icon'];
break;
}
***************
*** 1174,1177 ****
--- 1215,1219 ----
$var['logout_link'] =
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
$var['about_link'] =
$GLOBALS['phpgw_info']['navbar']['about']['url'];
+ $var['manual_link'] =
$GLOBALS['phpgw_info']['navbar']['manual']['url'];
$var['home_title'] =
$GLOBALS['phpgw_info']['navbar']['home']['title'];
***************
*** 1179,1182 ****
--- 1221,1225 ----
$var['logout_title'] =
$GLOBALS['phpgw_info']['navbar']['logout']['title'];
$var['about_title'] =
$GLOBALS['phpgw_info']['navbar']['about']['title'];
+ $var['manual_title'] =
$GLOBALS['phpgw_info']['navbar']['manual']['title'];
$var['home_statustext'] =
$GLOBALS['phpgw_info']['navbar']['home']['title'];
***************
*** 1184,1187 ****
--- 1227,1231 ----
$var['logout_statustext'] =
$GLOBALS['phpgw_info']['navbar']['logout']['title'];
$var['about_statustext'] =
$GLOBALS['phpgw_info']['navbar']['about']['title'];
+ $var['manual_statustext'] =
$GLOBALS['phpgw_info']['navbar']['manual']['title'];
if (isset($GLOBALS['phpgw_ifo']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
***************
*** 1201,1205 ****
while (list($app,$data) =
each($GLOBALS['phpgw_info']['navbar']))
{
! if ($app != 'home' && $app != 'preferences' &&
$app != 'about' && $app != 'logout')
{
$var['applications'][] = array
--- 1245,1258 ----
while (list($app,$data) =
each($GLOBALS['phpgw_info']['navbar']))
{
! if ($app == $cur_app)
! {
! $app_css = 'left_selected';
! }
! else
! {
! $app_css = 'left';
! }
!
! if ($app != 'home' && $app != 'preferences' &&
$app != 'about' && $app != 'logout' && $app != 'manual')
{
$var['applications'][] = array
***************
*** 1210,1214 ****
'url' =>
$data['url'],
'name' =>
str_replace('-','_',$app),
! 'statustext' =>
$data['title']
);
--- 1263,1268 ----
'url' =>
$data['url'],
'name' =>
str_replace('-','_',$app),
! 'statustext' =>
$data['title'],
! 'css' =>
$app_css
);
***************
*** 1232,1236 ****
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] ==
'default')
{
! if ($app == 'home' || $app ==
'preferences' || $app == 'about' || $app == 'logout')
{
$base_tabs[$app] = array
--- 1286,1290 ----
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] ==
'default')
{
! if ($app == 'home' || $app ==
'preferences' || $app == 'about' || $app == 'logout' || $app == 'manual')
{
$base_tabs[$app] = array
***************
*** 1321,1325 ****
unset($newarray);
! if ($GLOBALS['phpgw_info']['server']['template_set'] ==
'idsociety')
{
$navbar = True;
--- 1375,1379 ----
unset($newarray);
! if ($GLOBALS['phpgw_info']['server']['template_set'] ==
'idsociety' || $GLOBALS['phpgw_info']['server']['template_set'] == 'funkwerk')
{
$navbar = True;
***************
*** 1339,1343 ****
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;
--- 1393,1397 ----
if
($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;
***************
*** 1356,1359 ****
--- 1410,1414 ----
}
+ /* apps for the top menu */
$GLOBALS['phpgw_info']['navbar']['preferences']['title'] =
lang('preferences');
$GLOBALS['phpgw_info']['navbar']['preferences']['url']
= $GLOBALS['phpgw']->link('/preferences/index.php');
***************
*** 1361,1365 ****
$GLOBALS['phpgw_info']['navbar']['preferences']['icon_hover'] =
$this->image_on('preferences',Array('navbar','nonav'),'-over');
! if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences')
{
$app = 'phpGroupWare';
--- 1416,1425 ----
$GLOBALS['phpgw_info']['navbar']['preferences']['icon_hover'] =
$this->image_on('preferences',Array('navbar','nonav'),'-over');
! $GLOBALS['phpgw_info']['navbar']['manual']['title']
= lang('manual');
! $GLOBALS['phpgw_info']['navbar']['manual']['url']
= $GLOBALS['phpgw']->link('/manual/index.php');
! $GLOBALS['phpgw_info']['navbar']['manual']['icon']
= $this->image('manual',Array('navbar','nonav'));
!
$GLOBALS['phpgw_info']['navbar']['manual']['icon_hover'] =
$this->image_on('manual',Array('navbar','nonav'),'-over');
!
! if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'home') //|| $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences')
{
$app = 'phpGroupWare';
***************
*** 1371,1376 ****
/* We handle this here becuase its special */
!
! $GLOBALS['phpgw_info']['navbar']['about']['title']
= lang('about');
$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'));
--- 1431,1435 ----
/* We handle this here becuase its special */
! $GLOBALS['phpgw_info']['navbar']['about']['title']
= lang('about x',$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'));
Index: class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.xslttemplates.inc.php 6 Nov 2002 23:20:02 -0000 1.13
--- class.xslttemplates.inc.php 15 Nov 2002 22:31:51 -0000 1.14
***************
*** 96,100 ****
}
! if (substr($filename, 0, 1) != SEP)
{
$new_filename = $rootdir . SEP .
$filename;
--- 96,100 ----
}
! if (substr($filename, 0, 1) != SEP &&
substr($filename, 1, 1) != ':')
{
$new_filename = $rootdir . SEP .
$filename;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.applications.inc.php,1.47,1.48 class.common.inc.php,1.180,1.181 class.xslttemplates.inc.php,1.13,1.14,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: transy/setup phpgw_de.lang,1.2,1.3 phpgw_en.lang,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.15,1.16 tables_update.inc.php,1.15,1.16 setup.inc.php,1.13,1.14
- Previous by thread:
[Phpgroupware-cvs] CVS: transy/setup phpgw_de.lang,1.2,1.3 phpgw_en.lang,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.15,1.16 tables_update.inc.php,1.15,1.16 setup.inc.php,1.13,1.14
- Index(es):