Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: div was sometimes opened sometimes not when option USE_JQUERY_LAYOUT is on. It must never be used when option is off, always when option is on.

Browse Source
This commit is contained in:
Laurent Destailleur
2010-11-02 12:14:06 +00:00
parent ad2b5f6449
commit 50b51a03c7
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/main.inc.php
View File

@@ -1142,12 +1142,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
print "\n</div>\n<!-- End top horizontal menu -->\n";
print "</div><!-- End top 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 "</div><!-- End top layout -->\n";
else print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>';
}
@@ -1316,9 +1312,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
print "\n";
if (! $conf->use_javascript_ajax || ! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</td>';
print '</div> <!-- End left layout -->'."\n";
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div> <!-- End left layout -->'."\n";
else print '</td>';
print '<!-- End of left column, begin right area -->'."\n";
// print '</div>'."\n";
@@ -1333,14 +1328,13 @@ function main_area()
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 '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>';
print '<td valign="top">'."\n";
print '<td valign="top"><!-- Begin right area --> '."\n";
print "\n";
print '<div class="fiche"> <!-- begin main area -->'."\n";
print '<div class="fiche"> <!-- begin div class="fiche" -->'."\n";
if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
}
@@ -1496,7 +1490,7 @@ if (! function_exists("llxFooter"))
// print "\n".'</div> <!-- end div class="vmenuplusfiche" -->'."\n";
print "\n".'</td></tr></table> <!-- end right area -->'."\n";
print '</div></div> <!-- end main layout -->'."\n";
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div></div> <!-- end main layout -->'."\n";
if (! empty($_SERVER['DOL_TUNING']))
{