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

Test: use jquery accordion in left menu (test with auguria menu)

Browse Source
This commit is contained in:
Regis Houssin 2010-11-01 09:49:34 +00:00
parent b283d28fd5
commit 6428290ddf
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/menubase.class.php
View File

@ -379,7 +379,7 @@ class Menubase
if ($leftmenuConstraint) 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->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); $this->recur($tab, $tab[$x][0], $rang +1);
@ -610,7 +610,8 @@ class Menubase
if ($menu['enabled']) if ($menu['enabled'])
{ {
$enabled = verifCond($menu['enabled']); $enabled = verifCond($menu['enabled']);
//print "verifCond rowid=".$menu['rowid']." ".$menu['enabled'].":".$enabled."<br>\n"; 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 if ($menu['rowid'] != $oldrowid && $oldrowid) $b++; // Break on new entry

13
htdocs/includes/menus/standard/auguria.lib.php
View File

@ -215,6 +215,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
$menuArbo = new Menubase($db,'auguria','left'); $menuArbo = new Menubase($db,'auguria','left');
$overwritemenufor = $menuArbo->listeMainmenu(); $overwritemenufor = $menuArbo->listeMainmenu();
$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria'); $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) * Menu AUTRES (Pour les menus du haut qui ne serait pas geres)
@ -245,9 +246,16 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
if (empty($menu_array[$i]['level'])) if (empty($menu_array[$i]['level']))
{ {
if (($alt%2==0)) if (($alt%2==0))
{
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_ACCORDION)
{
print '<div class="blockvmenupair">'."\n";
}
else
{ {
print '<div class="blockvmenuimpair">'."\n"; print '<div class="blockvmenuimpair">'."\n";
} }
}
else else
{ {
print '<div class="blockvmenupair">'."\n"; print '<div class="blockvmenupair">'."\n";
@ -279,13 +287,13 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
{ {
if ($menu_array[$i]['enabled']) 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>'; 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)) 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 '<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"; print '<div class="menu_top"></div>'."\n";
} }
// Menu niveau > 0 // 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'])) if (empty($menu_array[$i+1]['level']))
{ {
print '<div class="menu_end"></div>'."\n"; print '<div class="menu_end"></div>'."\n";
print "</div>\n"; print "</div><!-- end section content -->\n";
print "</div><!-- end blockvmenu pair/impair -->\n";
} }
} }
} }

16
htdocs/main.inc.php
View File

@ -998,8 +998,21 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
</script>'; </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 // Wrapper to show tooltips
print '<script type="text/javascript"> print "\n".'<script type="text/javascript">
jQuery(function() { jQuery(function() {
jQuery(".classfortooltip").tooltip({ jQuery(".classfortooltip").tooltip({
track: true, track: true,
@ -1216,6 +1229,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
// Left column // Left column
print '<!-- Begin left vertical menu '.$left_menu.' -->'."\n"; print '<!-- Begin left vertical menu '.$left_menu.' -->'."\n";
print '<div class="vmenu">'."\n"; print '<div class="vmenu">'."\n";
$menuleft=new MenuLeft($db,$menu_array_before,$menu_array_after); $menuleft=new MenuLeft($db,$menu_array_before,$menu_array_after);