From 58fffb9a2d0a8ffe1988a30592dca305e93d4911 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 2 Nov 2010 12:03:29 +0000
Subject: [PATCH] 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.

---
 htdocs/main.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index afb6c2ad557..761cdb946d3 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -752,7 +752,7 @@ if (! function_exists("llxHeader"))
 	{
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
 		top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-		left_menu('', $help_url);
+		left_menu('', $help_url, '', '', 1);
 		main_area();
 	}
 }
@@ -1047,7 +1047,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
     print "\n".'<!-- Start top horizontal menu '.$top_menu.' -->'."\n";
     
-    print '<div class="ui-layout-north"> <!-- Begin top layout -->'."\n";
+    if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<div class="ui-layout-north"> <!-- Begin top layout -->'."\n";
 
     print '<div id="tmenu_tooltip" class="tmenu">'."\n";
 
@@ -1169,7 +1169,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 
 	//    print '<div class="vmenuplusfiche">'."\n";
 	
-	print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
+	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
 	
 	if (! $conf->use_javascript_ajax || ! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '<td class="vmenu" valign="top">';
 
@@ -1332,7 +1332,7 @@ function main_area()
 {
 	global $conf, $langs;
 	
-	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>';