[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.help.inc.php,1.1,1.2 class.he
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.help.inc.php,1.1,1.2 class.help_helper.inc.php,1.1,1.2 class.listbox.inc.php,1.15,1.16 class.portalbox.inc.php,1.24,1.25 |
|
Date: |
Sat, 30 Nov 2002 22:35:04 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv23029
Modified Files:
class.help.inc.php class.help_helper.inc.php
class.listbox.inc.php class.portalbox.inc.php
Log Message:
update help
Index: class.help.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.help.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.help.inc.php 30 Nov 2002 02:02:32 -0000 1.1
--- class.help.inc.php 1 Dec 2002 03:35:02 -0000 1.2
***************
*** 29,41 ****
var $lang;
var $app_name;
var $app_id;
var $up;
var $down;
! var $close;
! var $question;
! var $edit;
var $extrabox;
! var $xextrabox;
var $listbox;
--- 29,42 ----
var $lang;
var $app_name;
+ var $app_version;
var $app_id;
var $up;
var $down;
! var $intro;
! var $app_intro;
! var $note;
var $extrabox;
! var $xhelp;
var $listbox;
***************
*** 52,65 ****
$this->title = '';
$this->app_name = '';
$this->app_id = 0;
$this->up = '';
$this->down = '';
! $this->close = '';
! $this->question = '';
! $this->edit = '';
$this->extrabox = '';
! $this->xextrabox = '';
$this->listbox = '';
$this->data = array();
--- 53,67 ----
$this->title = '';
$this->app_name = '';
+ $this->app_version = '';
$this->app_id = 0;
$this->up = '';
$this->down = '';
! $this->intro = '';
! $this->app_intro = '';
! $this->note = '';
$this->extrabox = '';
! $this->xhelp = '';
$this->listbox = '';
$this->data = array();
***************
*** 69,73 ****
$this->output = array();
}
! $GLOBALS['phpgw']->xslttpl->add_file('help');
}
--- 71,75 ----
$this->output = array();
}
!
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'help');
}
***************
*** 101,119 ****
}
! function start_template($extra = '')
{
! if ($extra && $this->app_name)
{
!
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default')
. SEP . 'extrahelp');
}
}
! function set_controls($control='',$control_param='')
{
! //echo '<br>Control: ' . $control . ', control_param="'
. $control_param . '"';
!
! if($control != '' && is_array($control_param))
{
!
$this->setvar($control,$GLOBALS['phpgw']->link($control_param['url'],'app='.$control_param['app'].'&control='.$control));
}
}
--- 103,128 ----
}
! function start_template()
{
! if ($this->app_name)
{
!
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default')
. SEP . 'help_data');
}
}
! function set_controls($type = 'app', $control='',
$control_url='')
{
! switch($type)
{
! case 'app':
! if($control != '' && $control_url != '')
! {
!
$this->setvar($control,$GLOBALS['phpgw']->link($this->check_help_file($control_url)));
! }
! break;
! default:
!
$this->setvar('intro',$GLOBALS['phpgw']->link('/help.php'));
!
$this->setvar('note',$GLOBALS['phpgw']->link('/help.php','note=True'));
! break;
}
}
***************
*** 131,135 ****
if($extra_data !='')
{
! $this->xextrabox = $extra_data;
}
}
--- 140,144 ----
if($extra_data !='')
{
! $this->xhelp = $extra_data;
}
}
***************
*** 137,180 ****
function draw_box()
{
! if($this->up || $this->down || $this->close ||
$this->question || $this->edit)
{
! $control_array = array
! (
! 'up',
! 'down',
! 'question',
! 'close',
! 'edit'
! );
! @reset($control_array);
! while(list($key,$param) = each($control_array))
{
! if(isset($this->$param) &&
$this->$param)
! {
! $image_width = 15;
! if($param == 'edit')
! {
! $image_width = 30;
! }
!
! $control_link[] = array
! (
! 'param_url'
=> $this->$param,
! 'link_img'
=>
$GLOBALS['phpgw']->common->image('phpgwapi',$param.'.button'),
! 'img_width'
=> $image_width,
! 'lang_param_statustext'
=> lang($param)
! );
! }
! }
! $this->output['help_data'][] = array
! (
! 'title' => $this->title,
! 'control_link' => $control_link,
! 'listbox' =>
$this->listbox,
! 'extrabox' =>
$this->extrabox,
! 'xextrabox' =>
$this->xextrabox
! );
}
}
--- 146,196 ----
function draw_box()
{
! $control_array = array
! (
! 'intro' => True,
! 'note' => True
! );
!
! if($this->up)
! {
! $control_array['up'] = True;
! }
! if($this->down)
! {
! $control_array['down'] = True;
! }
! if($this->app_intro)
{
! $control_array['app_intro'] = True;
! }
!
! @reset($control_array);
! while(list($param,$value) = each($control_array))
! {
! if(isset($this->$param) && $this->$param)
{
! $image_width = 15;
! $control_link[] = array
! (
! 'param_url'
=> $this->$param,
! 'link_img'
=> $GLOBALS['phpgw']->common->image('phpgwapi',$param.'_help'),
! 'img_width'
=> $image_width,
! 'lang_param_statustext' =>
lang($param)
! );
! }
}
+
+ $this->output['help_values'][] = array
+ (
+ 'img' =>
$GLOBALS['phpgw']->common->image($this->app_name,'navbar','',True),
+ 'title' => $this->title,
+ 'lang_version' => lang('version'),
+ 'version' => $this->app_version,
+ 'control_link' => $control_link,
+ 'listbox' => $this->listbox,
+ 'extrabox' => $this->extrabox,
+ 'xhelp' => $this->xhelp
+ );
}
Index: class.help_helper.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.help_helper.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.help_helper.inc.php 30 Nov 2002 02:02:32 -0000 1.1
--- class.help_helper.inc.php 1 Dec 2002 03:35:02 -0000 1.2
***************
*** 48,68 ****
$this->title = $param['title'];
! if($param['app_id'])
{
! $app_id = $this->getvar('app_id');
!
! $var = Array
! (
! 'up' => Array('url' =>
'/set_box.php', 'app' => $app_id),
! 'down' => Array('url' =>
'/set_box.php', 'app' => $app_id),
! 'close' => Array('url' =>
'/set_box.php', 'app' => $app_id),
! 'question' => Array('url' =>
'/set_box.php', 'app' => $app_id),
! 'edit' => Array('url' =>
'/set_box.php', 'app' => $app_id)
! );
!
! while(list($key,$value) = each($var))
{
! $this->set_controls($key,$value);
}
}
}
--- 48,58 ----
$this->title = $param['title'];
! if(is_array($param['controls']))
{
! while(list($key,$value) =
each($param['controls']))
{
! $this->set_controls('app',$key,$value);
}
+ $this->set_controls();
}
}
***************
*** 91,95 ****
if ($extra_data)
{
! $this->start_template(True);
}
--- 81,85 ----
if ($extra_data)
{
! $this->start_template();
}
Index: class.listbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.listbox.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.listbox.inc.php 30 Nov 2002 02:02:32 -0000 1.15
--- class.listbox.inc.php 1 Dec 2002 03:35:02 -0000 1.16
***************
*** 108,112 ****
if ($extra_data)
{
! $this->start_template(True);
}
--- 108,112 ----
if ($extra_data)
{
! $this->start_template();
}
Index: class.portalbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.portalbox.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.portalbox.inc.php 29 Oct 2002 23:35:01 -0000 1.24
--- class.portalbox.inc.php 1 Dec 2002 03:35:02 -0000 1.25
***************
*** 100,106 ****
}
! function start_template($extra = '')
{
! if ($extra && $this->app_name)
{
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default')
. SEP . 'extrabox');
--- 100,106 ----
}
! function start_template()
{
! if ($this->app_name)
{
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default')
. SEP . 'extrabox');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.help.inc.php,1.1,1.2 class.help_helper.inc.php,1.1,1.2 class.listbox.inc.php,1.15,1.16 class.portalbox.inc.php,1.24,1.25,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: addressbook/inc hook_help.inc.php,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: sitemgr/setup phpgw_de.lang,1.1.2.4,1.1.2.5 phpgw_en.lang,1.1.1.1.2.7,1.1.1.1.2.8 phpgw_fr.lang,1.1.2.1,1.1.2.2
- Previous by thread:
[Phpgroupware-cvs] CVS: addressbook/inc hook_help.inc.php,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: sitemgr/setup phpgw_de.lang,1.1.2.4,1.1.2.5 phpgw_en.lang,1.1.1.1.2.7,1.1.1.1.2.8 phpgw_fr.lang,1.1.2.1,1.1.2.2
- Index(es):