diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang index 375d9fc7713..74252fdbc0a 100644 --- a/htdocs/langs/en_US/help.lang +++ b/htdocs/langs/en_US/help.lang @@ -1,10 +1,14 @@ # Dolibarr language file - en_US - help CHARSET=UTF-8 -CommunitySupport=Community suuport +CommunitySupport=Forum/Wiki support EMailSupport=Emails support -RemoteControlSupport=Real time and remote support +RemoteControlSupport=Online real time / remote support +OtherSupport=Other support ToSeeListOfAvailableRessources=To contact/see available ressources: ClickHere=Click here HelpCenter=Help center DolibarrHelpCenter=Dolibarr help and support center -ToGoBackToDolibarr=To go back on Dolibarr, click here. \ No newline at end of file +ToGoBackToDolibarr=To go back on Dolibarr, click here. +TypeOfSupport=Nature of support +TypeSupportCommunauty=Community (free) +TypeSupportCommercial=Commercial diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 631e913de57..2c0d882b408 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -177,7 +177,7 @@ OfficialWiki = Wiki Dolibarr OfficialDemo = Démo en ligne Dolibarr ForDocumentationSeeWiki = Pour la documentation utilisateur, développeur ou les FAQs (questions-réponses fréquentes), consultez le wiki Dolibarr:
%s ForAnswersSeeForum = Pour d'autres questions ou poser vos propres questions, vous pouvez utiliser le forum Dolibarr:
%s -HelpCenterDesc1 = Cet espace permet de vous aider à obtenir un service de support sur Dolibarr. +HelpCenterDesc1 = Cette application, indépendante de Dolibarr, vous permet de vous aider à obtenir un service de support sur Dolibarr. HelpCenterDesc2 = Certain de ces services ne sont disponibles qu'en anglais. CurrentTopMenuHandler = Gestionnaire menu haut courant CurrentLeftMenuHandler = Gestionnaire menu gauche courant diff --git a/htdocs/langs/fr_FR/help.lang b/htdocs/langs/fr_FR/help.lang index bfb876bfb14..ddcbc395e63 100644 --- a/htdocs/langs/fr_FR/help.lang +++ b/htdocs/langs/fr_FR/help.lang @@ -1,10 +1,14 @@ # Dolibarr language file - fr_FR - help CHARSET=UTF-8 -CommunitySupport=Support communautaire -EMailSupport=Support emails -RemoteControlSupport=Support temps réel à distance +CommunitySupport=Assistance Forums et Wiki +EMailSupport=Assistance Emails +RemoteControlSupport=Assistance en ligne temps réel +OtherSupport=Autres type d'assistance ToSeeListOfAvailableRessources=Pour contacter/voir les ressources disponibles: ClickHere=Cliquez ici 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 +ToGoBackToDolibarr=Pour aller sur Dolibarr, cliquer ici. +TypeOfSupport=Nature du support +TypeSupportCommunauty=Communautaire (gratuit) +TypeSupportCommercial=Commercial diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 75c91e7d51f..70f87659754 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -19,7 +19,7 @@ */ body { -font-size:13px; +font-size:14px; font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; background-color: #F4F4F4; margin-left: 20px; @@ -182,3 +182,8 @@ font-size: 12px; border: 1px solid #8CACBB; padding: 4px 4px 4px 4px; } + +tr.title +{ +background: #DDDFDD; +} diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 9717008c011..2b0fc197b45 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -44,7 +44,7 @@ if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"]) // Definition des constantes syslog if (function_exists("define_syslog_variables")) { - define_syslog_variables(); + define_syslog_variables(); } else { @@ -122,7 +122,7 @@ if (empty($conf->db->user)) $conf->db->user=''; // En mode off (recommande il faut juste faire addslashes au moment d'un insert/update. function stripslashes_deep($value) { - return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value)); + return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value)); } //if (! eregi('PHP/6', $_SERVER['SERVER_SOFTWARE'])) if (function_exists('get_magic_quotes_gpc')) // magic_quotes_* plus pris en compte dans PHP6 @@ -146,11 +146,11 @@ $bc[false]=' class="bg1"'; $bc[true]=' class="bg2"'; -/* -* \brief Load conf file (file must exists) -* \param dolibarr_main_document_root Root directory of Dolibarr bin files -* \return int <0 if KO, >0 if OK -*/ +/** + * \brief Load conf file (file must exists) + * \param dolibarr_main_document_root Root directory of Dolibarr bin files + * \return int <0 if KO, >0 if OK + */ function conf($dolibarr_main_document_root) { global $conf; @@ -162,8 +162,8 @@ function conf($dolibarr_main_document_root) global $dolibarr_main_db_pass; global $character_set_client; - $return=include_once($dolibarr_main_document_root."/core/conf.class.php"); - if (! $return) return -1; + $return=include_once($dolibarr_main_document_root."/core/conf.class.php"); + if (! $return) return -1; $conf=new Conf(); $conf->db->type = trim($dolibarr_main_db_type); @@ -180,52 +180,63 @@ function conf($dolibarr_main_document_root) } -/* -* \brief Affiche entete HTML -*/ +/** + * \brief Affiche entete HTML + */ function pHeader($soutitre,$next,$action='none') { global $conf; - global $langs; - $langs->load("main"); - $langs->load("admin"); + global $langs; + $langs->load("main"); + $langs->load("admin"); // On force contenu dans format sortie header("Content-type: text/html; charset=".$conf->file->character_set_client); - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''.$langs->trans("Help").''."\n"; - print ''."\n"; - print ''."\n"; - print ''.$soutitre.''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''.$langs->trans("Help").''."\n"; + print ''."\n"; + print ''."\n"; + print ''.$soutitre.''."\n"; - print '
'."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; print '
'."\n"; print '
'."\n"; } +/** + * Enter description here... + * + * @param unknown_type $nonext + * @param unknown_type $setuplang + */ function pFooter($nonext=0,$setuplang='') { - global $langs; - $langs->load("main"); - $langs->load("admin"); + global $langs; + $langs->load("main"); + $langs->load("admin"); - print '
'."\n"; - print '
'."\n"; + print ''."\n"; + print ''."\n"; - print '
'."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; } - +/** + * Enter description here... + * + * @param unknown_type $message + * @param unknown_type $level + */ function dolibarr_support_syslog($message, $level=LOG_DEBUG) { if (! defined('LOG_DEBUG')) define('LOG_DEBUG',6); diff --git a/htdocs/support/index.php b/htdocs/support/index.php index 7fdd7e3b5ce..3c772181ff2 100644 --- a/htdocs/support/index.php +++ b/htdocs/support/index.php @@ -23,8 +23,14 @@ * \version $Id$ */ +// Use its own include to not share the include of Dolibarr +// This is a standalone feature with no information from Dolibarr to show +// and no database access to do. include_once("./inc.php"); -include_once("../master.inc.php"); +$uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root); +$pos = strstr ($uri, '/'); // $pos contient alors url sans nom domaine +if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a '' +define('DOL_URL_ROOT', $pos); // URL racine relative $langs->load("other"); $langs->load("help"); @@ -41,27 +47,33 @@ print $langs->trans("ToGoBackToDolibarr",DOL_URL_ROOT.'/'); print '

'; -print ''; +$style1='color: #333344; font-size: 18px; font-weight: bold'; +$style2='color: #5D4455; font-weight: bold;'; +print '
'; + // Line of possible services -print ''; -print ''; +// Forum/wiki support +print ''; +// EMail support print ''; -print ''; print ''; - // Area of support cells print ''; -print ''; -print ''; -print ''; + +// Line of possible services +print ''; +// Forum/wiki support +print ''; +// EMail support +print ''; print ''; +// Area of support cells +print ''; + +// Online support +print ''; + +// Other support +$urlwiki='http://wiki.dolibarr.org/index.php/List_of_OpenSource_Software_companies_and_freelancers'; +print ''; + +print ''; print '
'; -print ''.$langs->trans("CommunitySupport").''; +print '
'; +//print img_picto('','/theme/common/who.png','',1).'
'; +print ''.$langs->trans("CommunitySupport").''; +print '
'.$langs->trans("TypeOfSupport").': '.$langs->trans("TypeSupportCommunauty").''; print '		'; -print ''.$langs->trans("EMailSupport").''; -print ''; -print ''.$langs->trans("RemoteControlSupport").''; +//print img_picto('','/theme/common/mail.png','',1).'
'; +print ''.$langs->trans("EMailSupport").''; +print '
'.$langs->trans("TypeOfSupport").': '.$langs->trans("TypeSupportCommercial").''; print '
'; +// Forum/wiki support +print ''; print '
'; print img_picto('','/theme/common/who.png','',1); print '
'; @@ -70,30 +82,65 @@ if ($langs->defaultlang == 'fr_FR') $urlwiki='http://wiki.dolibarr.org/index.php if ($langs->defaultlang == 'es_ES') $urlwiki='http://wiki.dolibarr.org/index.php/Portada'; print '
'.$langs->trans("ForDocumentationSeeWiki",$urlwiki,$urlwiki).'
'; print '
'.$langs->trans("ForAnswersSeeForum",'http://www.dolibarr.org/forum/','http://www.dolibarr.org/forum/').'
'; +print '
'; print '
'; - print '		'; +// EMail support +print ''; print '
'; print img_picto('','/theme/common/mail.png','',1); print '
'; print '
'.$langs->trans("FeatureNotYetAvailable").'.'; print '
'; - print '		'; -print '
'; -print img_picto('','/theme/common/internet.png','',1); -print '
'; -print '
'.$langs->trans("ToSeeListOfAvailableRessources").' '; -print ''.$langs->trans("ClickHere").''; -print '
'; +print '
'; +print ''.$langs->trans("RemoteControlSupport").''; +print '
'.$langs->trans("TypeOfSupport").': '.$langs->trans("TypeSupportCommercial").''; +print '		'; +print ''.$langs->trans("OtherSupport").''; +print '
'.$langs->trans("TypeOfSupport").': '.$langs->trans("TypeSupportCommercial").''; print '
'; +print '
'; +print img_picto('','/theme/common/internet.png','',1); +print '
'; +print '
'; +print '
'.$langs->trans("ToSeeListOfAvailableRessources").'
'; +print ''.$langs->trans("ClickHere").''; +print '

'; +print '

'; +print '
'; +print '		'; +print '
'; +print img_picto('','/theme/common/pagemaster.png','',1); +print '
'; +print '
'; +print '
'.$langs->trans("ToSeeListOfAvailableRessources").'
'; +print ''.$langs->trans("ClickHere").''; +print '
'; +print '
'; diff --git a/htdocs/support/online.php b/htdocs/support/online.php index cb6905cd9c9..aa9132d3124 100644 --- a/htdocs/support/online.php +++ b/htdocs/support/online.php @@ -24,12 +24,16 @@ */ include_once("./inc.php"); +$uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root); +$pos = strstr ($uri, '/'); // $pos contient alors url sans nom domaine +if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a '' +define('DOL_URL_ROOT', $pos); // URL racine relative $langs->load("other"); $langs->load("help"); -pHeader("Dolibarr Help Service Center",$_SERVER["PHP_SELF"]); +pHeader($langs->trans("DolibarrHelpCenter"),$_SERVER["PHP_SELF"]); print '


';