| '."\n"; |
diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index ce41573d46b..4e8fddf392a 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -20,11 +20,11 @@ */ /** - \file htdocs/compta/bank/pre.inc.php - \ingroup compta - \brief Fichier gestionnaire du menu compta banque - \version $Id$ -*/ + * \file htdocs/compta/bank/pre.inc.php + * \ingroup compta + * \brief Fichier gestionnaire du menu compta banque + * \version $Id$ + */ require_once("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); @@ -34,7 +34,7 @@ $langs->load("categories"); /** - * + * Replace the default llxHeader function * @param $head * @param $title * @param $help_url diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index f7f3eca710c..6be444e387c 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -851,9 +851,9 @@ if ($conf->use_javascript_ajax) - + - + diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 92f7e79db7b..8fd393850e2 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1155,15 +1155,16 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a /** - * \brief Show left menu bar - * \param menu_array_before Table of menu entries to show before entries of menu handler - * \param helppagename Name of wiki page for help ('' by default). - * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage - * For other external page: http://server/url - * \param moresearchform Search Form Permanent Supplemental - * \param menu_array_after Table of menu entries to show after entries of menu handler + * Show left menu bar + * @param menu_array_before Table of menu entries to show before entries of menu handler + * @param helppagename Name of wiki page for help ('' by default). + * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage + * For other external page: http://server/url + * @param moresearchform Search Form Permanent Supplemental + * @param menu_array_after Table of menu entries to show after entries of menu handler + * @param leftmenuwithoutmainarea Must be set to 1. 0 by default for backward compatibility with old modules. */ -function left_menu($menu_array_before, $helppagename='', $moresearchform='', $menu_array_after='') +function left_menu($menu_array_before, $helppagename='', $moresearchform='', $menu_array_after='', $leftmenuwithoutmainarea=0) { global $user, $conf, $langs, $db; @@ -1325,6 +1326,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me print "\n".''."\n\n"; // print ''."\n"; // print '