From e1cecca39a2d0d133fe04cb59348fb9512bf4b68 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 30 Oct 2010 07:54:26 +0000 Subject: [PATCH] Test: use jquery layout for the left menu --- htdocs/main.inc.php | 82 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 4f9c5fd05da..28d0d5b1c8a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -863,7 +863,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; print ''."\n"; - //print ''."\n"; + + if ($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) + { + print ''."\n"; + } // This one is required for some Ajax features if (! defined('DISABLE_PROTOTYPE') && $conf->global->MAIN_USE_PROTOTYPE) @@ -938,7 +942,56 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // For backward compatibility with old modules if (empty($conf->headerdone)) top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); - + + if ($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) + { + print ''; + } print ''; @@ -957,6 +1010,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a return jQuery(this).attr("tooltipText"); } }); }); + + jQuery("body").layout({ applyDefaultStyles: true }); '; /* @@ -974,6 +1029,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a } print "\n".''."\n"; + + print '
'."\n"; print '
'."\n"; @@ -1067,6 +1124,13 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a } print "\n
\n\n"; + + print "
\n"; + + if (! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) + { + print ''; + } } @@ -1087,7 +1151,10 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me $bookmarks=''; // print '
'."\n"; - print '
'; + if (! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print ''; + + print ''."\n"; print ''."\n"; // print ''."\n"; @@ -1245,6 +1314,10 @@ function main_area() { global $conf, $langs; + print '
'."\n"; + + if ($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '
'; + + print "\n".'
'."\n"; + + if (! $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '
'; print "\n"; @@ -1231,7 +1298,9 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me print "\n"; - print '
'; + print '
'."\n"; print "\n"; @@ -1405,6 +1478,7 @@ if (! function_exists("llxFooter")) // print "\n".' '."\n"; print "\n".'
'."\n"; + print ' '."\n"; if (! empty($_SERVER['DOL_TUNING'])) {