diff --git a/ChangeLog b/ChangeLog index 08d8ddb9946..939b4b898a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ For users: - New: Can create a third party from a member of fundation module. - New: Can set a limit for stock alert to 0. - New: Support SMTPS. +- New: Added a page /support to provide a help center service on Dolibarr. - Fix: Handle correctly the comment in status changing of supplier orders. - Fix: Author, title and topic are correctly encoded in PDF. - Fix: Now HTML output is always UTF8, this solve bad PDF encoding on old users. diff --git a/htdocs/about.php b/htdocs/about.php index 6b2a1b8d344..495ad3bd555 100644 --- a/htdocs/about.php +++ b/htdocs/about.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2005-2007 Regis Houssin * @@ -53,17 +53,12 @@ print "
\n"; print $langs->trans("Developpers").':'; print ''; print "
\n"; -print $langs->trans("Informations").':'; +print $langs->trans("OtherInformations").':'; print '
    '; print '
  • '; @@ -75,12 +70,12 @@ if (eregi('^fr_',$langs->getDefaultLang())) print '
  • '; print ''.$langs->trans("OfficialWebSiteFr").''; print '
    • '; - print '
  • '; - print ''.$langs->trans("OfficialWikiFr").''; - print '
    • '; } print '
  • '; -print 'Freshmeat'; +print ''.$langs->trans("OfficialWiki").''; +print '
    • '; +print '
  • '; +print ''.$langs->trans("OfficialDemo").''; print '
    • '; if (eregi('^fr_',$langs->getDefaultLang())) @@ -88,11 +83,11 @@ if (eregi('^fr_',$langs->getDefaultLang())) print '
  • '; print 'Les taches en cours de realisation sur Dolibarr sont consultables dans le gestionnaire de projet sur Savannah.'; print '
    • '; - + print '
  • '; print 'Si vous trouvez un bogue dans Dolibarr, vous pouvez en informer les developpeurs sur le systeme de gestion des bogues de Savannah.'; print '
    • '; - + print '
  • '; print 'Le code source de Dolibarr est consultable par l\'interface web du cvs.'; print '
    • '; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 16375af2a91..02caa185f8e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -168,9 +168,15 @@ DolibarrLicense=License DolibarrProjectLeader=Project leader Developpers=Developers/contributors OtherDeveloppers=Other developers/contributors -OfficialWebSite=International official web site +OfficialWebSite=Dolibarr international official web site OfficialWebSiteFr=French official web site OfficialWikiFr=French wiki +OfficialWiki=Dolibarr Wiki +OfficialDemo=Dolibarr online demo +ForDocumentationSeeWiki=For a user or developer documentation, for FAQs (Frequently Asked Questions), take a lookt at the Dolibarr Wiki: %s +ForAnswersSeeForum=For other questions, help, you can read/ask questions on Dolibarr forum: %s +HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. +HelpCenterDesc2=Some part of this service are available in english only. CurrentTopMenuHandler=Current top menu handler CurrentLeftMenuHandler=Current left menu handler MeasuringUnit=Measuring unit @@ -224,6 +230,7 @@ DoTestSendHTML=Test sending HTML ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't user option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask. UMask=UMask parameter for new files on Unix/Linux/BSD file system. UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).
    It must be the octal value (for example, 0666 means read and write for everyone).
    Ce paramètre ne sert pas sous un serveur Windows. +SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation # Modules Module0Name=Users & groups diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index e2dd115fe9e..f047a50a826 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -170,6 +170,12 @@ OtherDeveloppers=Autres développeurs/contributeurs OfficialWebSite=Site web officiel internationnal OfficialWebSiteFr=Site web officiel francophone OfficialWikiFr=Wiki francophone +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. +HelpCenterDesc2=Certain de ces services ne sont disponibles qu'en anglais. CurrentTopMenuHandler=Gestionnaire menu haut courant CurrentLeftMenuHandler=Gestionnaire menu gauche courant MeasuringUnit=Unité de mesure @@ -223,6 +229,7 @@ DoTestSendHTML=Tester envoi HTML ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erreur, ne peut utiliser l'option @ si la séquence {yy}{mm} ou {yyyy}{mm} n'est pas dans le masque. UMask=Paramètre UMask des nouveaux fichiers sous Unix/Linux/BSD. UMaskExplanation=Ce paramètre permet de définir les droits des fichiers créés sur le serveur par Dolibarr (lors d'upload par exemple).
    Ce doit être la valeur octal (par exemple 0666 signifie lecture/ecriture pour tous).
    Ce paramètre n'a aucun effet sur un serveur Windows. +SeeWikiForAllTeam=Voir le wiki pour le détail de tous les acteurs et leur organisation # Modules Module0Name=Utilisateurs & groupes diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index cf72bfb9b3e..198e2d46e13 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Sebastien DiCintio * Copyright (C) 2007-2008 Laurent Destailleur @@ -65,10 +65,10 @@ $charset="UTF-8"; // If not output format found in any conf file if (! defined('DONOTLOADCONF') && file_exists($conffile)) { $result=include_once($conffile); // Load conf file - if ($result) + if ($result) { - if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility - + if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility + // Remove last / or \ on directories or url value if (! empty($dolibarr_main_document_root) && ! ereg('^[\\\/]+$',$dolibarr_main_document_root)) $dolibarr_main_document_root=ereg_replace('[\\\/]+$','',$dolibarr_main_document_root); if (! empty($dolibarr_main_url_root) && ! ereg('^[\\\/]+$',$dolibarr_main_url_root)) $dolibarr_main_url_root=ereg_replace('[\\\/]+$','',$dolibarr_main_url_root); @@ -97,16 +97,16 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) } else { - $includeconferror='ErrorBadValueForDolibarrMainDocumentRoot'; + $includeconferror='ErrorBadValueForDolibarrMainDocumentRoot'; } } else { - $includeconferror='ErrorBadFormatForConfFile'; + $includeconferror='ErrorBadFormatForConfFile'; } } -if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; +if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:'')); define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:'')); if (empty($conf->character_set_client)) $conf->character_set_client=$charset; @@ -172,12 +172,8 @@ function conf($dolibarr_main_document_root) $conf->db->user = trim($dolibarr_main_db_user); $conf->db->pass = trim($dolibarr_main_db_pass); - if (empty($character_set_client)) $character_set_client=$charset; - $conf->character_set_client=strtoupper($character_set_client); - if (empty($dolibarr_main_db_charset)) $dolibarr_main_db_charset='latin1'; - $conf->db->character_set=$dolibarr_main_db_charset; - if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation='latin1_swedish_ci'; - $conf->db->dolibarr_main_db_collation=$dolibarr_main_db_collation; + if (empty($conf->character_set_client)) $conf->character_set_client="UTF-8"; + if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci'; return 1; } @@ -219,10 +215,10 @@ function pFooter($nonext=0,$setuplang='') global $langs; $langs->load("main"); $langs->load("admin"); - + print ''."\n"; print ''."\n"; - + print ''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/support/onlinesupport.php b/htdocs/support/index.php similarity index 52% rename from htdocs/support/onlinesupport.php rename to htdocs/support/index.php index 9c1d3fe9560..de01e8c8aa4 100644 --- a/htdocs/support/onlinesupport.php +++ b/htdocs/support/index.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2008-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 @@ -30,10 +30,10 @@ $langs->load("other"); pHeader("Dolibarr Help Service Center",$_SERVER["PHP_SELF"]); -print "This area can be used to get a Help service support.
    \n"; -print "This service is available in english only.

    "; +print $langs->trans("HelpCenterDesc1")."
    \n"; +print $langs->trans("HelpCenterDesc2")."
    \n"; -print '

    '; +print '


    '; print ''; @@ -52,22 +52,40 @@ print ''; print ''; -// Logo of possible services +// Area of support cells print ''; -print ''; -print ''; -print ''; print ''; - print '
    '; -print $langs->trans("FeatureNotYetAvailable").'.'; +print ''; + +print '
    '; +print img_picto('','/theme/common/who.png','',1); +print '
    '; +print '
    '.$langs->trans("ForDocumentationSeeWiki",'http://wiki.dolibarr.org','http://wiki.dolibarr.org').'
    '; +print '
    '.$langs->trans("ForAnswersSeeForum",'http://www.dolibarr.org','http://www.dolibarr.org').'
    '; +print '
    '; + print '    		'; -print $langs->trans("FeatureNotYetAvailable").'.'; +print ''; + +print '
    '; +print img_picto('','/theme/common/pagemaster.png','',1); +print '
    '; +print '
    '.$langs->trans("FeatureNotYetAvailable").'.'; +print '
    '; + print '    		'; -print $langs->trans("FeatureNotYetAvailable").'.'; +print ''; + +print '
    '; +print img_picto('','/theme/common/internet.png','',1); +print '
    '; +print '
    '.$langs->trans("FeatureNotYetAvailable").'.'; +print '
    '; + print '
    '; pFooter(); diff --git a/htdocs/theme/common/internet.png b/htdocs/theme/common/internet.png new file mode 100644 index 00000000000..a918a93a891 Binary files /dev/null and b/htdocs/theme/common/internet.png differ diff --git a/htdocs/theme/common/pagemaster.png b/htdocs/theme/common/pagemaster.png new file mode 100644 index 00000000000..d967fccdca3 Binary files /dev/null and b/htdocs/theme/common/pagemaster.png differ diff --git a/htdocs/theme/common/who.png b/htdocs/theme/common/who.png new file mode 100644 index 00000000000..53e59d206d3 Binary files /dev/null and b/htdocs/theme/common/who.png differ