lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Better compatibility with old modules

Browse Source
This commit is contained in:
Laurent Destailleur 2010-11-05 20:11:33 +00:00
parent 2850479c09
commit 07edf7bee9
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/compta/bank/pre.inc.php
View File

@ -20,11 +20,11 @@
*/ */
/** /**
\file htdocs/compta/bank/pre.inc.php * \file htdocs/compta/bank/pre.inc.php
\ingroup compta * \ingroup compta
\brief Fichier gestionnaire du menu compta banque * \brief Fichier gestionnaire du menu compta banque
\version $Id$ * \version $Id$
*/ */
require_once("../../main.inc.php"); require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.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 $head
* @param $title * @param $title
* @param $help_url * @param $help_url

4
htdocs/ecm/index.php
View File

@ -851,9 +851,9 @@ if ($conf->use_javascript_ajax)
</div> </div>
</div> </div>
<!-- <div class="pane ecm-layout-east"></div> --> <!-- <div id="ecm-layout-east" class="pane"></div> -->
<!-- <div class="pane ecm-layout-south"></div> --> <!-- <div id="ecm-layout-south" class="pane"></div> -->
</div> <!-- end div id="containerlayout" --> </div> <!-- end div id="containerlayout" -->

21
htdocs/main.inc.php
View File

@ -1155,15 +1155,16 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
/** /**
* \brief Show left menu bar * Show left menu bar
* \param menu_array_before Table of menu entries to show before entries of menu handler * @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). * @param helppagename Name of wiki page for help ('' by default).
* Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
* For other external page: http://server/url * For other external page: http://server/url
* \param moresearchform Search Form Permanent Supplemental * @param moresearchform Search Form Permanent Supplemental
* \param menu_array_after Table of menu entries to show after entries of menu handler * @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; global $user, $conf, $langs, $db;
@ -1325,6 +1326,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
print "\n".'<!-- End of left column, begin right area -->'."\n\n"; print "\n".'<!-- End of left column, begin right area -->'."\n\n";
// print '</div>'."\n"; // print '</div>'."\n";
// print '<div class="vmenuplusfiche">'."\n"; // print '<div class="vmenuplusfiche">'."\n";
if (empty($leftmenuwithoutmainarea)) main_area();
} }
/** /**
@ -1335,7 +1338,7 @@ function main_area()
global $conf, $langs; global $conf, $langs;
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<div id="mainContent"><div class="ui-layout-center"> <!-- begin main layout -->'."\n"; if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<div id="mainContent"><div class="ui-layout-center"> <!-- begin main layout -->'."\n";
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>'; if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<table width="100%" class="notopnoleftnoright" summary="centermenutable" id="undertopmenu"><tr>';
print '<td valign="top"><!-- Begin right area --> '."\n"; print '<td valign="top"><!-- Begin right area --> '."\n";