Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Bad closing of div

Browse Source
This commit is contained in:
Laurent Destailleur
2013-06-14 19:43:45 +02:00
parent 684c086ad0
commit af8c4cd0d3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/menus/standard/eldy.lib.php
View File

@@ -1269,7 +1269,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
// Show menu // Show menu
if (empty($noout)) if (empty($noout))
{ {
$alt=0; $alt=0; $blockvmenuopened=false;
$num=count($menu_array); $num=count($menu_array);
for ($i = 0; $i < $num; $i++) for ($i = 0; $i < $num; $i++)
{ {
@@ -1279,6 +1279,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$alt++; $alt++;
if (empty($menu_array[$i]['level']) && $showmenu) if (empty($menu_array[$i]['level']) && $showmenu)
{ {
$blockvmenuopened=true;
if (($alt%2==0)) if (($alt%2==0))
{ {
print '<div class="blockvmenuimpair">'."\n"; print '<div class="blockvmenuimpair">'."\n";
@@ -1305,7 +1306,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$url=preg_replace('/__LOGIN__/',$user->login,$url); $url=preg_replace('/__LOGIN__/',$user->login,$url);
$url=preg_replace('/__USERID__/',$user->id,$url); $url=preg_replace('/__USERID__/',$user->id,$url);
print '<!-- Add menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' -->'."\n"; print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].' -->'."\n";
// Menu niveau 0 // Menu niveau 0
if ($menu_array[$i]['level'] == 0) if ($menu_array[$i]['level'] == 0)
@@ -1340,12 +1341,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
} }
} }
// If next is a new block or end // If next is a new block or if there is nothing after
if (empty($menu_array[$i+1]['level'])) if (empty($menu_array[$i+1]['level']))
{ {
if ($showmenu) if ($showmenu)
print '<div class="menu_end"></div>'."\n"; print '<div class="menu_end"></div>'."\n";
print "</div>\n"; if ($blockvmenuopened) { print "</div>\n"; $blockvmenuopened=false; }
} }
} }
} }

6
htdocs/main.inc.php
View File

@@ -1452,9 +1452,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "</div><!-- End top layout -->\n"; if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "</div><!-- End top layout -->\n";
print "<!-- End top horizontal menu -->\n"; print "<!-- End top horizontal menu -->\n\n";
//XXX if (empty($conf->use_javascript_ajax) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print '<table width="100%" class="notopnoleftnoright" summary="leftmenutable" id="undertopmenu"><tr>';
if (empty($conf->dol_hide_leftmenu) && (empty($conf->use_javascript_ajax) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))) print '<div id="id-container">'; if (empty($conf->dol_hide_leftmenu) && (empty($conf->use_javascript_ajax) || empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))) print '<div id="id-container">';
} }
@@ -1486,7 +1485,6 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
if (empty($conf->dol_hide_leftmenu)) if (empty($conf->dol_hide_leftmenu))
{ {
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n"; if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
//XXX else print '<td class="vmenu" valign="top">';
else print '<div id="id-left">'; else print '<div id="id-left">';
print "\n"; print "\n";
@@ -1545,7 +1543,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
// Left column // Left column
print '<!-- Begin left menu -->'."\n"; print '<!-- Begin left menu -->'."\n";
print '<div class="vmenu">'."\n"; print '<div class="vmenu">'."\n\n";
$menumanager->menu_array = $menu_array_before; $menumanager->menu_array = $menu_array_before;
$menumanager->menu_array_after = $menu_array_after; $menumanager->menu_array_after = $menu_array_after;