diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index dbd8383c8f5..65c05d4051a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -439,7 +439,7 @@ if (! isset($_SESSION["dol_login"])) if ($conf->multicompany->enabled && isset($_POST["entity"])) { include_once(DOL_DOCUMENT_ROOT . "/core/cookie.class.php"); - + $entity = $_POST["entity"]; $entityCookieName = "DOLENTITYID_dolibarr"; @@ -448,7 +448,7 @@ if (! isset($_SESSION["dol_login"])) // Todo: utiliser $user->datelastlogin pour un cryptage aléatoire $entityCookie = new DolCookie($conf->file->main_cookie_cryptkey); $entityCookie->_setCookie($entityCookieName, $entity); - + //setcookie($entityCookieName, $entity, 0, "/", "", 0); } } @@ -782,7 +782,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs } /** - * \brief Affiche en-tete HTML + BODY + Barre de menu superieure + * \brief Show an HTML header + a BODY + The top menu bar * \param head lignes d'en-tete head * \param title titre page web * \param target target du menu Accueil @@ -888,7 +888,7 @@ function top_menu($head, $title='', $target='') /** - * \brief Affiche barre de menu gauche + * \brief Show left menu bar * \param menu_array Tableau des entrees de menu * \param helppagename Name of wiki page for help ('' by default). * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage @@ -1021,13 +1021,14 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') } } + // Link to help pages if ($helpbaseurl && $helppage) { print '
'; print ''; - print img_help(0,'').' '; + print img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1).' '; print $langs->trans("Help").''; print '
'; } @@ -1035,7 +1036,7 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') if (! empty($conf->global->MAIN_SHOW_BUGTRACK_LINK)) { - // Lien vers le bugtrack + // Link to bugtrack $bugbaseurl='http://savannah.nongnu.org/bugs/?'; $bugbaseurl.='func=additem&group=dolibarr&privacy=1&'; $bugbaseurl.="&details="; diff --git a/htdocs/support/index.php b/htdocs/support/index.php index 3c772181ff2..11bd601a90c 100644 --- a/htdocs/support/index.php +++ b/htdocs/support/index.php @@ -38,8 +38,14 @@ $langs->load("help"); pHeader($langs->trans("DolibarrHelpCenter"),$_SERVER["PHP_SELF"]); +print ''; +//print ''; +print '
'; +//print ''; +//print ''; print $langs->trans("HelpCenterDesc1")."
\n"; print $langs->trans("HelpCenterDesc2")."
\n"; +print '
'; print '
'; @@ -47,7 +53,7 @@ print $langs->trans("ToGoBackToDolibarr",DOL_URL_ROOT.'/'); print '

'; -$style1='color: #333344; font-size: 18px; font-weight: bold'; +$style1='color: #333344; font-size: 16px; font-weight: bold'; $style2='color: #5D4455; font-weight: bold;'; diff --git a/htdocs/theme/common/helpdoc.png b/htdocs/theme/common/helpdoc.png new file mode 100644 index 00000000000..a3d0948b050 Binary files /dev/null and b/htdocs/theme/common/helpdoc.png differ