update help system

addressbook/help/EN/add.php

@@ -17,16 +17,17 @@
 	);
 
 	include('../../../header.inc.php');
-
+	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
 	$GLOBALS['phpgw']->help->set_params(array('app_name'	=> 'addressbook',
 												'title'		=> lang('add'),
-												'params'	=> array('app_intro' => 'overview.php')));
+												'controls'	=> array('app_intro'	=> 'overview.php',
+																			'up'	=> 'overview.php')));
 
 	$values['add'] = array
 	(
 		'intro'	=> 'Click on the add button, a form page will be presented with the following fields:',
 		'lang_lastname'			=> 'Last name',
-		'lang_firstname'		=> 'First name'
+		'lang_firstname'		=> 'First name',
 		'lang_email'			=> 'E-mail',
 		'lang_homephone'		=> 'Home phone',
 		'lang_workphone'		=> 'Work phone',
@@ -39,10 +40,10 @@
 		'lang_group_settings'	=> 'Group settings',
 		'lang_notes'			=> 'Notes',
 		'lang_company'			=> 'Company name',
-		'lang_fax'				=> 'Fax'
+		'lang_fax'				=> 'Fax',
-		'lang_pager'			=> 'Pager'
+		'lang_pager'			=> 'Pager',
-		'lang_othernumber'		=> 'Other number'
+		'lang_othernumber'		=> 'Other number',
-		'lang_birthday'			=> 'Birthday'
+		'lang_birthday'			=> 'Birthday',
 		'end'					=> 'Simply fill in the fields, and click OK.',
 		'access_descr'			=> 'Access can be restricted to private, overriding acl preferences settings.
 									From preferences, you can grant access to users to the be able to view, 
@@ -50,4 +51,5 @@
 	);
 
 	$GLOBALS['phpgw']->help->xdraw($values);
+	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->help->output);
 ?>

addressbook/help/EN/overview.php

@@ -21,12 +21,12 @@
 	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
 	$GLOBALS['phpgw']->help->set_params(array('app_name'	=> 'addressbook',
 												'title'		=> lang('addressbook overview'),
-												'params'	=> array('app_intro' => 'overview.php')));
+												'controls'	=> array('app_intro'	=> 'overview.php',
-
+																		'down'		=> 'add.php')));
 
 	$values['overview']	= array
 	(
-		'intro'	=> 'A searchable address book for keeping contact information of business associates or friends and family.'
+		'intro'	=> 'A searchable address book for keeping contact information of business associates or friends and family. A quick and detailed address book, to keep various levels of contact information and a search function to find people you need quickly.'
 	);
 
 	$GLOBALS['phpgw']->help->xdraw($values);

addressbook/inc/hook_manual.inc.php

@@ -1,19 +0,0 @@
-<?php
-  /**************************************************************************\
-  * phpGroupWare - Calendar Holidays                                         *
-  * http://www.phpgroupware.org                                              *
-  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-// Only Modify the $file variable.....
-	$file = Array();
-//Do not modify below this line
-	display_manual_section($appname,$file);
-?>

addressbook/setup/setup.inc.php

@@ -49,7 +49,6 @@
 		'add_def_pref',
 		'config_validate',
 		'home',
-		'manual',
 		'deleteaccount',
 		'notifywindow',
 		'preferences',

phpgwapi/templates/default/help.xsl

@@ -11,7 +11,11 @@
   				<td class="th_text" valign="middle">
 					<img src="{$img}" border="0"/>&nbsp;
 					<xsl:value-of select="title"/>&nbsp;
-					<xsl:value-of select="lang_version"/>:&nbsp;<xsl:value-of select="version"/>
+					<xsl:choose>
+						<xsl:when test="version != ''">
+							<xsl:value-of select="lang_version"/>:&nbsp;<xsl:value-of select="version"/>
+						</xsl:when>
+					</xsl:choose>
 				</td>
 				<td valign="middle" align="right">
 					<xsl:choose>
@@ -61,9 +65,9 @@
 		<xsl:variable name="param_url"><xsl:value-of select="param_url"/></xsl:variable>
 		<xsl:variable name="link_img"><xsl:value-of select="link_img"/></xsl:variable>
 		<xsl:variable name="img_width"><xsl:value-of select="img_width"/></xsl:variable>
-		<xsl:variable name="lang_param_statustext"><xsl:value-of select="lang_param_statustext"/></xsl:variable>
+		<xsl:variable name="lang_param_title"><xsl:value-of select="lang_param_title"/></xsl:variable>
-		<a href="{$param_url}" onMouseover="window.status='{$lang_param_statustext}';return true;" onMouseout="window.status='';return true;">
+		<a href="{$param_url}" onMouseover="window.status='{$lang_param_title}';return true;" onMouseout="window.status='';return true;">
-			<img src="{$link_img}" border="0" width="{img_width}" height="15" onMouseover="window.status='{$lang_param_statustext}';return true;" onMouseout="window.status='';return true;" alt="{$lang_param_statustext}"/>
+			<img src="{$link_img}" border="0" width="{img_width}" height="15" alt="{$lang_param_title}" title="{$lang_param_title}"/>
 		</a>
 	</xsl:template>