diff --git a/ChangeLog b/ChangeLog
index 0016160379b..cf29e39982c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr changelog
***** Changelog for 2.7 compared to 2.6 *****
For users:
+- New: Add an help and support center.
- New: Can export commercial proposals.
- New: Can use a cache for xcal exports.
- New: Option for faster confirmation process with one ajax popup.
@@ -19,7 +20,7 @@ For developers:
- Can use an alternate document_root directory to develop with
sources on two repositories.
- Removed useless code of old commercial module.
-
+- Updated wiki documentation.
***** Changelog for 2.6 compared to 2.5 *****
diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index 0ab82d4c9e7..99fa52b9407 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -125,6 +125,7 @@ class MenuLeft {
if ($user->admin)
{
$langs->load("admin");
+ $langs->load("help");
$newmenu->add(DOL_URL_ROOT."/admin/index.php?leftmenu=setup", $langs->trans("Setup"));
if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"));
@@ -161,6 +162,7 @@ class MenuLeft {
if ($leftmenu=="admintools" && function_exists('eaccelerator_info')) $newmenu->add_submenu(DOL_URL_ROOT."/admin/tools/eaccelerator.php", $langs->trans("EAccelerator"),1);
if ($leftmenu=="admintools") $newmenu->add_submenu(DOL_URL_ROOT."/admin/tools/listevents.php", $langs->trans("Audit"),1);
if ($leftmenu=="admintools") $newmenu->add_submenu(DOL_URL_ROOT."/admin/tools/purge.php", $langs->trans("Purge"),1);
+ if ($leftmenu=="admintools") $newmenu->add_submenu(DOL_URL_ROOT."/support/index.php", $langs->trans("HelpCenter"),1);
}
$newmenu->add(DOL_URL_ROOT."/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"));
diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
index 9c9b9dee917..b5146434cea 100644
--- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
@@ -126,6 +126,7 @@ class MenuLeft {
if ($user->admin)
{
$langs->load("admin");
+ $langs->load("help");
$newmenu->add(DOL_URL_ROOT."/admin/index.php?leftmenu=setup", $langs->trans("Setup"));
if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"));
@@ -162,6 +163,7 @@ class MenuLeft {
if ($leftmenu=="admintools" && function_exists('eaccelerator_info')) $newmenu->add_submenu(DOL_URL_ROOT."/admin/tools/eaccelerator.php", $langs->trans("EAccelerator"),1);
if ($leftmenu=="admintools") $newmenu->add_submenu(DOL_URL_ROOT."/admin/tools/listevents.php", $langs->trans("Audit"),1);
if ($leftmenu=="admintools") $newmenu->add_submenu(DOL_URL_ROOT."/admin/tools/purge.php", $langs->trans("Purge"),1);
+ if ($leftmenu=="admintools") $newmenu->add_submenu(DOL_URL_ROOT."/support/index.php", $langs->trans("HelpCenter"),1);
}
/*
diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang
index a354c24f25d..375d9fc7713 100644
--- a/htdocs/langs/en_US/help.lang
+++ b/htdocs/langs/en_US/help.lang
@@ -5,4 +5,6 @@ EMailSupport=Emails support
RemoteControlSupport=Real time and remote support
ToSeeListOfAvailableRessources=To contact/see available ressources:
ClickHere=Click here
-HelpCenter=Help center
\ No newline at end of file
+HelpCenter=Help center
+DolibarrHelpCenter=Dolibarr help and support center
+ToGoBackToDolibarr=To go back on Dolibarr, click here.
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/help.lang b/htdocs/langs/fr_FR/help.lang
index cc607b20a90..bfb876bfb14 100644
--- a/htdocs/langs/fr_FR/help.lang
+++ b/htdocs/langs/fr_FR/help.lang
@@ -5,4 +5,6 @@ EMailSupport=Support emails
RemoteControlSupport=Support temps réel à distance
ToSeeListOfAvailableRessources=Pour contacter/voir les ressources disponibles:
ClickHere=Cliquez ici
-HelpCenter=Centre d'aide
\ No newline at end of file
+HelpCenter=Centre d'aide
+DolibarrHelpCenter=Centre de support et d'aide Dolibarr
+ToGoBackToDolibarr=Pour aller sur Dolibarr, cliquer ici.
\ No newline at end of file
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index f82cefc98fe..9717008c011 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville
* Copyright (C) 2004 Benoit Mortier
* Copyright (C) 2004 Sebastien DiCintio
- * Copyright (C) 2007-2008 Laurent Destailleur
+ * Copyright (C) 2007-2009 Laurent Destailleur
*
* 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
@@ -19,10 +19,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/** \file htdocs/support/inc.php
- \brief File that define environment for support pages
- \version $Id$
-*/
+/**
+ * \file htdocs/support/inc.php
+ * \brief File that define environment for support pages
+ * \version $Id$
+ */
define('DOL_VERSION','2.5-dev'); // Also defined in htdocs/master.inc.php
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index 95ca4ee2e12..541a76b1643 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -29,12 +29,16 @@ $langs->load("other");
$langs->load("help");
-pHeader("Dolibarr Help Service Center",$_SERVER["PHP_SELF"]);
+pHeader($langs->trans("DolibarrHelpCenter"),$_SERVER["PHP_SELF"]);
print $langs->trans("HelpCenterDesc1")."
\n";
print $langs->trans("HelpCenterDesc2")."
\n";
-print '
';
+print '
';
+
+print $langs->trans("ToGoBackToDolibarr","/");
+
+print '
';
print '