update help

addressbook/help/EN/add.php

@@ -20,8 +20,7 @@
 	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
 	$GLOBALS['phpgw']->help->set_params(array('app_name'	=> 'addressbook',
 												'title'		=> lang('add'),
-												'controls'	=> array('app_intro'	=> 'overview.php',
+												'controls'	=> array('up' => 'list.php')));
-																			'up'	=> 'overview.php')));
 
 	$values['add'] = array
 	(
@@ -37,7 +36,7 @@
 		'lang_state'			=> 'State',
 		'lang_zip'				=> 'ZIP code',
 		'lang_access'			=> 'Access',
-		'lang_group_settings'	=> 'Group settings',
+		'lang_groupsettings'	=> 'Group settings',
 		'lang_notes'			=> 'Notes',
 		'lang_company'			=> 'Company name',
 		'lang_fax'				=> 'Fax',

addressbook/help/EN/list.php

@@ -0,0 +1,52 @@
+<?php
+	/**************************************************************************\
+	* phpGroupWare - User manual                                               *
+	* http://www.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$ */
+
+	$GLOBALS['phpgw_info']['flags'] = Array
+	(
+		'headonly'		=> True,
+		'currentapp'	=> 'addressbook'
+	);
+
+	include('../../../header.inc.php');
+
+	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
+	$GLOBALS['phpgw']->help->set_params(array('app_name'	=> 'addressbook',
+												'title'		=> lang('addressbook list'),
+												'controls'	=> array('up'	=> 'overview.php',
+																	'down'	=> 'add.php')));
+	$values['list']	= array
+	(
+		'list_img'	=> $GLOBALS['phpgw']->common->image('addressbook','help_list'),
+		'item_1'	=> 'Category select box. The category filter shows the items sorted by category.',
+		'item_2'	=> 'The double arrow moves you to the first page, the single arrow moves you to the previous page.',
+		'item_3'	=> 'Type in a word and hit the search for a specific name. For example you cant remember Bobs e-mail address, you type *Bob* into the search box and it will display all entries with the name Bob. You can search entries of your adressbook. The search function is not case sensetive, it searches for upper and lower cases at once.',
+		'item_4'	=> 'This pull down menu allows you to choose which entries you would like to view: private, only yours or all records. Hit the filter button to display your selection.',
+		'item_5'	=> 'Use the filter button to activate your selection of filters (see #4).',
+		'item_6'	=> 'The double arrow moves you to the last page, the single arrow moves you to the next page.',
+		'h_data'	=> 'Data records. The visible fields you have choosen in the preferences section. Examples:',
+		'item_7'	=> 'Persons full name. By clicking on *Full Name* it will sort the list by the entries first name.',
+		'item_8'	=> 'Persons birthday. By clicking on *Birthday* it will sort the list by the entries birthday.',
+		'item_9'	=> 'Persons work e-mail address. By clicking on "Business Email" it will sort the list by the entries Business e-mail. In the example above, if you click on the e-mail address, joe@work.com, it will open a compose window to joe an e-mail.',
+		'item_10'	=> 'Persons home e-mail address. By clicking on "Home Email" it will sort the list by the entries home e-mail. In the example above, if you click on the e-mail address, joe@home.com, it will open a compose window to joe an e-mail.',
+		'item_11'	=> 'View: Allows you to view all of the information that was entered. ie: phone #, address, work #, etc...',
+		'item_12'	=> 'VCard: Creates a VCard.',
+		'item_13'	=> 'Edit: Allows you to edit all the information contained in that persons entry. It is only possible to edit an entry if you are the owner or have the rights to do so.',
+		'item_14'	=> 'Owner: The person who owns this record.',
+		'item_15'	=> 'Add: Creates a new entry to add a new person.',
+		'item_16'	=> 'Add VCard: Imports a new VCard into your address book.',
+		'item_17'	=> 'Import Contacts: A way to import a previous address book, ie. Netscape ldif format, IE csv files...',
+		'item_18'	=> 'Export Contacts: Lets you export your address book to a text file.'
+	);
+
+	$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'),
-												'controls'	=> array('app_intro'	=> 'overview.php',
+												'controls'	=> array('down' => 'list.php')));
-																		'down'		=> 'add.php')));
 
 	$values['overview']	= array
 	(
-		'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.'
+		'intro'				=> 'A searchable address book for keeping contact information of business associates or friends and family, to keep various levels of contact information and a search function to find people you need quickly. Integration with other applications in the phpGroupWare suite.',
+		'prefs_settings'	=> 'Preferences settings:<br>When you enter the adressbock the first time it shows on the top the message *Please set your preferences for this application!*. This means you still have to adapt the application for your special needs. Each applications preferences section can be found within the preferences application. For further informations please see the section preferences.'
 	);
 
 	$GLOBALS['phpgw']->help->xdraw($values);

addressbook/inc/hook_help.inc.php

@@ -23,6 +23,13 @@
 		'lang_link_statustext'	=> lang('owerview')
 	);
 
+	$GLOBALS['phpgw']->help->data[] = array
+	(
+		'text'					=> lang('list'),
+		'link'					=> $GLOBALS['phpgw']->help->check_help_file('list.php'),
+		'lang_link_statustext'	=> lang('list')
+	);
+
 	$GLOBALS['phpgw']->help->data[] = array
 	(
 		'text'					=> lang('add'),

addressbook/templates/default/help_data.xsl

@@ -9,6 +9,9 @@
 			<xsl:when test="overview">
 				<xsl:apply-templates select="overview"/>
 			</xsl:when>
+			<xsl:when test="list">
+				<xsl:apply-templates select="list"/>
+			</xsl:when>
 			<xsl:otherwise>
 				<xsl:apply-templates select="add"/>
 			</xsl:otherwise>
@@ -23,6 +26,94 @@
 					<xsl:value-of disable-output-escaping="yes" select="intro"/>
 				</td>
 			</tr>
+			<tr>
+				<td>
+					<xsl:value-of disable-output-escaping="yes" select="prefs_settings"/>
+				</td>
+			</tr>
+		</table>
+	</xsl:template>
+
+	<xsl:template match="list">
+	<xsl:variable name="list_img" select="list_img"/>
+		<table>
+			<tr>
+				<td colspan="2">
+					<img src="{$list_img}"/>
+				</td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">1</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_1"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">2</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_2"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">3</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_3"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">4</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_4"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">5</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_5"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">6</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_6"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">7</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_7"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">8</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_8"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">9</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_9"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">10</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_10"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">11</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_11"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">12</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_12"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">13</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_13"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">14</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_14"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">15</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_15"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">16</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_16"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">17</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_17"/></td>
+			</tr>
+			<tr>
+				<td valign="top" align="right">18</td>
+				<td><xsl:value-of disable-output-escaping="yes" select="item_18"/></td>
+			</tr>
 		</table>
 	</xsl:template>
 

help.php

@@ -14,16 +14,30 @@
 
 	$GLOBALS['phpgw_info'] = array();
 
+	$app = $HTTP_GET_VARS['app'];
+
+	if (!$app)
+	{
+		$app = 'help';
+	}
+
 	$GLOBALS['phpgw_info']['flags'] = array
 	(
 		'headonly'		=> True,
-		'currentapp'	=> 'help'
+		'currentapp'	=> $app
 	);
 	include('header.inc.php');
 
 	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
 
-	$GLOBALS['phpgw']->hooks->process('help',array('manual'));
+	if ($app == 'help')
+	{
+		$GLOBALS['phpgw']->hooks->process('help',array('manual'));
+	}
+	else
+	{
+		$GLOBALS['phpgw']->hooks->single('help',$app);
+	}
 
 	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->help->output);
 ?>

phpgwapi/inc/class.help.inc.php

@@ -122,6 +122,7 @@
 					break;
 				default:
 					$this->setvar('intro',$GLOBALS['phpgw']->link('/help.php'));
+					$this->setvar('app_intro',$GLOBALS['phpgw']->link('/help.php','app=' . $this->app_name));
 					$this->setvar('note',$GLOBALS['phpgw']->link('/help.php','note=True'));
 					break;
 			}