From 6428290ddf0343e8421b6879740fb9bfb86012ea Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 1 Nov 2010 09:49:34 +0000
Subject: [PATCH] Test: use jquery accordion in left menu (test with auguria
 menu)

---
 htdocs/core/class/menubase.class.php           |  7 ++++---
 htdocs/includes/menus/standard/auguria.lib.php | 15 ++++++++++++---
 htdocs/main.inc.php                            | 16 +++++++++++++++-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index f52981331fa..83024c2b70d 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -379,7 +379,7 @@ class Menubase
 
 					if ($leftmenuConstraint)
 					{
-						//				print "x".$pere." ".$tab[$x][6];
+						//print 'name='.$tab[$x][3].' pere='.$pere." ".$tab[$x][6];
 
 						$this->newmenu->add((! preg_match("/^(http:\/\/|https:\/\/)/i",$tab[$x][2])) ? DOL_URL_ROOT . $tab[$x][2] : $tab[$x][2], $tab[$x][3], $rang -1, $tab[$x][4], $tab[$x][5], $tab[$x][8]);
 						$this->recur($tab, $tab[$x][0], $rang +1);
@@ -609,8 +609,9 @@ class Menubase
                 $enabled = true;
                 if ($menu['enabled'])
                 {
-                    $enabled = verifCond($menu['enabled']);
-                    //print "verifCond rowid=".$menu['rowid']." ".$menu['enabled'].":".$enabled."<br>\n";
+                	$enabled = verifCond($menu['enabled']);
+                	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_ACCORDION && preg_match('/^\$leftmenu/',$menu['enabled'])) $enabled=1;
+                	//print "verifCond chaine=".$chaine." rowid=".$menu['rowid']." ".$menu['enabled'].":".$enabled."<br>\n";
                 }
 
                 if ($menu['rowid'] != $oldrowid && $oldrowid) $b++; // Break on new entry
diff --git a/htdocs/includes/menus/standard/auguria.lib.php b/htdocs/includes/menus/standard/auguria.lib.php
index 7120ce7d3b4..5ff94850623 100644
--- a/htdocs/includes/menus/standard/auguria.lib.php
+++ b/htdocs/includes/menus/standard/auguria.lib.php
@@ -215,6 +215,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
         $menuArbo = new Menubase($db,'auguria','left');
         $overwritemenufor = $menuArbo->listeMainmenu();
         $newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria');
+        //var_dump($newmenu);
 
         /*
          * Menu AUTRES (Pour les menus du haut qui ne serait pas geres)
@@ -246,7 +247,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
             {
                 if (($alt%2==0))
                 {
-                    print '<div class="blockvmenuimpair">'."\n";
+                	if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_ACCORDION)
+                	{
+                		print '<div class="blockvmenupair">'."\n";
+                	}
+                	else
+                	{
+                		print '<div class="blockvmenuimpair">'."\n";
+                	}
                 }
                 else
                 {
@@ -279,13 +287,13 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
             {
                 if ($menu_array[$i]['enabled'])
                 {
-
                     print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>';
                 }
                 else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
                 {
                     print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>';
                 }
+                print "\n".'<div id="section_content">'."\n";
                 print '<div class="menu_top"></div>'."\n";
             }
             // Menu niveau > 0
@@ -305,7 +313,8 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
             if (empty($menu_array[$i+1]['level']))
             {
                 print '<div class="menu_end"></div>'."\n";
-                print "</div>\n";
+                print "</div><!-- end section content -->\n";
+                print "</div><!-- end blockvmenu  pair/impair -->\n";
             }
         }
     }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9adf541b6bb..d652a797a0d 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -997,9 +997,22 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 				}
     		</script>';
 		}
+		
+		if ($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION)
+		{
+			print "\n".'<script type="text/javascript">
+					jQuery(document).ready(function () {
+						jQuery( ".vmenu" ).accordion({
+							autoHeight: false,
+							event: "mouseover",
+							header: "> .blockvmenupair > .menu_titre"
+						});
+					});
+					</script>';
+		}
 
     	// Wrapper to show tooltips
-    	print '<script type="text/javascript">
+    	print "\n".'<script type="text/javascript">
                 jQuery(function() {
                     jQuery(".classfortooltip").tooltip({
                         track: true,
@@ -1216,6 +1229,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 
     // Left column
     print '<!-- Begin left vertical menu '.$left_menu.' -->'."\n";
+    
     print '<div class="vmenu">'."\n";
 
 	$menuleft=new MenuLeft($db,$menu_array_before,$menu_array_after);