[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.help.inc.php,NONE,1.1 class.h
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.help.inc.php,NONE,1.1 class.help_helper.inc.php,NONE,1.1 class.common.inc.php,1.188,1.189 class.listbox.inc.php,1.14,1.15 functions.inc.php,1.162,1.163 |
|
Date: |
Fri, 29 Nov 2002 21:02:34 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv16071
Modified Files:
class.common.inc.php class.listbox.inc.php functions.inc.php
Added Files:
class.help.inc.php class.help_helper.inc.php
Log Message:
started updating help system
***** Error reading new file: [Errno 2] No such file or directory:
'class.help.inc.php'
***** Error reading new file: [Errno 2] No such file or directory:
'class.help_helper.inc.php'
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.188
retrieving revision 1.189
diff -C2 -r1.188 -r1.189
*** class.common.inc.php 28 Nov 2002 01:38:13 -0000 1.188
--- class.common.inc.php 30 Nov 2002 02:02:32 -0000 1.189
***************
*** 662,666 ****
$appname =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
! if ($appname == 'home' || $appname == 'logout' ||
$appname == 'login' || $appname == 'about')
{
$appname = 'phpgwapi';
--- 662,666 ----
$appname =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
! if ($appname == 'home' || $appname == 'logout' ||
$appname == 'login' || $appname == 'about' || $appname == 'help')
{
$appname = 'phpgwapi';
***************
*** 1070,1074 ****
);
!
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP .
'phpgw');
$cur_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
--- 1070,1081 ----
);
! if ($GLOBALS['phpgw_info']['flags']['headonly'] == True)
! {
!
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi','default') .
SEP . 'phpgw_header');
! }
! else
! {
!
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP .
'phpgw');
! }
$cur_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
***************
*** 1138,1150 ****
}
! 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');
}
--- 1145,1157 ----
}
! if
($GLOBALS['phpgw_info']['flags']['currentapp'] != 'help')
{
! $var['help_img']
= $this->image('phpgwapi','help');
! $var['help_img_hover']
= $this->image_on('phpgwapi','help','_over');
}
else
{
! $var['help_img']
= $this->image_on('phpgwapi','help','_over');
! $var['help_img_hover']
= $this->image('phpgwapi','help');
}
***************
*** 1160,1164 ****
$var['logout_img'] =
$this->image('phpgwapi','logout');
$var['about_img'] =
$this->image('phpgwapi','about-'.($app=='about' ? 'red' : 'grey'));
! $var['manual_img'] =
$this->image('manual','help');
$var['greybar'] =
$this->image('phpgwapi','greybar');
break;
--- 1167,1171 ----
$var['logout_img'] =
$this->image('phpgwapi','logout');
$var['about_img'] =
$this->image('phpgwapi','about-'.($app=='about' ? 'red' : 'grey'));
! $var['help_img'] =
$this->image('phpgwapi','help');
$var['greybar'] =
$this->image('phpgwapi','greybar');
break;
***************
*** 1169,1177 ****
$var['logout_img'] =
$this->image('phpgwapi','tab_logout');
$var['about_img'] =
$this->image('phpgwapi','tab_help');
! $var['manual_img'] =
$this->image('manual','tab_manual');
break;
case 'funkwerk':
$var['about_img'] = '!';
! $var['manual_img'] = '?';
switch ($cur_app)
--- 1176,1184 ----
$var['logout_img'] =
$this->image('phpgwapi','tab_logout');
$var['about_img'] =
$this->image('phpgwapi','tab_help');
! $var['help_img'] =
$this->image('phpgwapi','tab_help');
break;
case 'funkwerk':
$var['about_img'] = '!';
! $var['help_img'] = '?';
switch ($cur_app)
***************
*** 1179,1198 ****
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;
}
--- 1186,1205 ----
case 'home':
$var['top_css_home'] =
'top_menu_selected';
! $var['top_css'] =
$var['top_css_prefs'] = $var['top_css_about'] = $var['top_css_help'] =
'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_help'] =
'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_help'] =
'top_menu';
break;
! case 'help':
! $var['top_css_help'] =
'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_help'] = 'top_menu';
break;
}
***************
*** 1203,1207 ****
$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;
}
--- 1210,1214 ----
$var['logout_img'] =
$GLOBALS['phpgw_info']['navbar']['logout']['icon'];
$var['about_img'] =
$GLOBALS['phpgw_info']['navbar']['about']['icon'];
! $var['help_img'] =
$GLOBALS['phpgw_info']['navbar']['help']['icon'];
break;
}
***************
*** 1211,1215 ****
$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'];
--- 1218,1222 ----
$var['logout_link'] =
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
$var['about_link'] =
$GLOBALS['phpgw_info']['navbar']['about']['url'];
! $var['help_link'] =
$GLOBALS['phpgw_info']['navbar']['help']['url'];
$var['home_title'] =
$GLOBALS['phpgw_info']['navbar']['home']['title'];
***************
*** 1217,1221 ****
$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'];
--- 1224,1228 ----
$var['logout_title'] =
$GLOBALS['phpgw_info']['navbar']['logout']['title'];
$var['about_title'] =
$GLOBALS['phpgw_info']['navbar']['about']['title'];
! $var['help_title'] =
$GLOBALS['phpgw_info']['navbar']['help']['title'];
$var['home_statustext'] =
$GLOBALS['phpgw_info']['navbar']['home']['title'];
***************
*** 1223,1227 ****
$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']))
--- 1230,1234 ----
$var['logout_statustext'] =
$GLOBALS['phpgw_info']['navbar']['logout']['title'];
$var['about_statustext'] =
$GLOBALS['phpgw_info']['navbar']['about']['title'];
! $var['help_statustext'] =
$GLOBALS['phpgw_info']['navbar']['help']['title'];
if (isset($GLOBALS['phpgw_ifo']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
***************
*** 1250,1254 ****
}
! if ($app != 'home' && $app != 'preferences' &&
$app != 'about' && $app != 'logout' && $app != 'manual')
{
$var['applications'][] = array
--- 1257,1261 ----
}
! if ($app != 'home' && $app != 'preferences' &&
$app != 'about' && $app != 'logout' && $app != 'help')
{
$var['applications'][] = array
***************
*** 1307,1330 ****
}
! $var['app_tpl'] = '';
! switch($GLOBALS['phpgw_info']['flags']['currentapp'])
! {
! case 'home':
! $var['home'] = True;
! break;
! case 'about':
! $var['about'] = True;
! break;
! default:
! $menuaction =
get_var('menuaction',Array('GET'));
! $xslt_app =
get_var('xslt_app',Array('GET'));
! if ($menuaction &&
$GLOBALS['phpgw_info']['flags']['xslt_app'])
! {
! $app_function =
strrchr($menuaction,'.');
! $var['app_tpl'] =
substr($app_function,1,strlen($app_function));
! }
! break;
}
--- 1314,1327 ----
}
! $var['app_tpl'] = '';
! $var['current_app'] =
$GLOBALS['phpgw_info']['flags']['currentapp'];
! $menuaction = get_var('menuaction',Array('GET'));
! $xslt_app = get_var('xslt_app',Array('GET'));
! if ($menuaction &&
$GLOBALS['phpgw_info']['flags']['xslt_app'])
! {
! $app_function = strrchr($menuaction,'.');
! $var['app_tpl'] =
substr($app_function,1,strlen($app_function));
}
***************
*** 1412,1419 ****
$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')
--- 1409,1416 ----
$GLOBALS['phpgw_info']['navbar']['preferences']['icon_hover'] =
$this->image_on('preferences',Array('navbar','nonav'),'-over');
! $GLOBALS['phpgw_info']['navbar']['help']['title']
= lang('manual');
! $GLOBALS['phpgw_info']['navbar']['help']['url']
= $GLOBALS['phpgw']->link('/help.php');
! $GLOBALS['phpgw_info']['navbar']['help']['icon']
= $this->image('phpgwapi',Array('help','nonav'));
! $GLOBALS['phpgw_info']['navbar']['help']['icon_hover']
= $this->image_on('phpgwapi',Array('help','nonav'),'-over');
if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'home') //|| $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences')
Index: class.listbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.listbox.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.listbox.inc.php 26 Oct 2002 00:27:46 -0000 1.14
--- class.listbox.inc.php 30 Nov 2002 02:02:32 -0000 1.15
***************
*** 87,91 ****
function draw($extra_data='')
{
- $this->start_template();
if(is_array($this->data) && !empty($this->data))
{
--- 87,90 ----
***************
*** 111,118 ****
$this->start_template(True);
}
! else
! {
! $this->start_template();
! }
if(is_array($this->data) && !empty($this->data))
{
--- 110,114 ----
$this->start_template(True);
}
!
if(is_array($this->data) && !empty($this->data))
{
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -r1.162 -r1.163
*** functions.inc.php 2 Nov 2002 22:25:13 -0000 1.162
--- functions.inc.php 30 Nov 2002 02:02:32 -0000 1.163
***************
*** 371,375 ****
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] !=
'preferences' &&
! $GLOBALS['phpgw_info']['flags']['currentapp'] !=
'about')
{
// This will need to use ACL in the future
--- 371,376 ----
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
$GLOBALS['phpgw_info']['flags']['currentapp'] !=
'preferences' &&
! $GLOBALS['phpgw_info']['flags']['currentapp'] !=
'about' &&
! $GLOBALS['phpgw_info']['flags']['currentapp'] != 'help')
{
// This will need to use ACL in the future
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.help.inc.php,NONE,1.1 class.help_helper.inc.php,NONE,1.1 class.common.inc.php,1.188,1.189 class.listbox.inc.php,1.14,1.15 functions.inc.php,1.162,1.163,
Bettina Gille <address@hidden> <=