From f74cd4393f5c83b1a25a346aaa6109fb205b6c66 Mon Sep 17 00:00:00 2001 From: ceb Date: Mon, 16 Dec 2002 01:20:12 +0000 Subject: [PATCH] update help system --- phpgwapi/inc/class.help.inc.php | 24 ++--- phpgwapi/inc/class.help_helper.inc.php | 2 +- phpgwapi/templates/default/config.tpl | 125 ------------------------- 3 files changed, 14 insertions(+), 137 deletions(-) delete mode 100644 phpgwapi/templates/default/config.tpl diff --git a/phpgwapi/inc/class.help.inc.php b/phpgwapi/inc/class.help.inc.php index 6af6ff3490..15fcc5a685 100644 --- a/phpgwapi/inc/class.help.inc.php +++ b/phpgwapi/inc/class.help.inc.php @@ -117,7 +117,7 @@ case 'app': if($control != '' && $control_url != '') { - $this->setvar($control,$GLOBALS['phpgw']->link($this->check_help_file($control_url))); + $this->setvar($control,$this->check_help_file($control_url)); } break; default: @@ -147,10 +147,13 @@ { $control_array = array ( - 'intro' => True, - 'note' => True + 'intro' => True ); + if($this->app_intro) + { + $control_array['app_intro'] = True; + } if($this->up) { $control_array['up'] = True; @@ -159,10 +162,9 @@ { $control_array['down'] = True; } - if($this->app_intro) - { - $control_array['app_intro'] = True; - } + $control_array['note'] = True; + + //_debug_array($control_array); @reset($control_array); while(list($param,$value) = each($control_array)) @@ -173,10 +175,10 @@ $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) + 'param_url' => $this->$param, + 'link_img' => $GLOBALS['phpgw']->common->image('phpgwapi',$param.'_help'), + 'img_width' => $image_width, + 'lang_param_title' => lang($param) ); } } diff --git a/phpgwapi/inc/class.help_helper.inc.php b/phpgwapi/inc/class.help_helper.inc.php index eb0d93f251..ef98c2fd49 100644 --- a/phpgwapi/inc/class.help_helper.inc.php +++ b/phpgwapi/inc/class.help_helper.inc.php @@ -53,7 +53,7 @@ { $this->set_controls('app',$key,$value); } - $this->set_controls(); + $this->set_controls('base'); } } diff --git a/phpgwapi/templates/default/config.tpl b/phpgwapi/templates/default/config.tpl deleted file mode 100644 index ec48eff469..0000000000 --- a/phpgwapi/templates/default/config.tpl +++ /dev/null @@ -1,125 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {title}
 {lang_Path_information}
{lang_Enter_the_full_path_for_temporary_files.
Examples:_/tmp,_C:\TEMP}:
{lang_Enter_the_full_path_for_users_and_group_files.
Examples:_/files,_E:\FILES}:
{lang_Enter_the_location_of_phpGroupWare's_URL.
Example:_http://www.domain.com/phpgroupware_ _or_ _/phpgroupware
No_trailing_slash}:
{lang_Image_type_selection_order}: - -
{lang_read_translations_from}: - -
 
 {lang_Host_information}
{lang_Enter_the_hostname_of_the_machine_on_which_this_server_is_running}:
{lang_Enter_your_default_FTP_server}:
{lang_Attempt_to_use_correct_mimetype_for_FTP_instead_of_default_'application/octet-stream'}: - -
{lang_Datetime_port.
If_using_port_13,_please_set_firewall_rules_appropriately_before_submitting_this_page.
(Port:_13_/_Host:_129.6.15.28)}		 - -
{lang_Enter_your_HTTP_proxy_server}:
{lang_Enter_your_HTTP_proxy_server_port}:
{lang_Enter_the_site_username_for_peer_servers}.
{lang_Enter_the_site_password_for_peer_servers}.
-  -
- - -
-
-