Fix: Target was wrong on url build with dynamic menu
This commit is contained in:
parent
cab4764502
commit
5228dbb3e6
@ -101,7 +101,7 @@ class MenuTop {
|
|||||||
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
|
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
|
||||||
else print '<td class="tmenu" id="td_'.$idsel.'">';
|
else print '<td class="tmenu" id="td_'.$idsel.'">';
|
||||||
|
|
||||||
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
|
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||||
print $tabMenu[$i]['titre'];
|
print $tabMenu[$i]['titre'];
|
||||||
print '</a>';
|
print '</a>';
|
||||||
|
|
||||||
|
|||||||
@ -101,7 +101,7 @@ class MenuTop {
|
|||||||
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
|
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
|
||||||
else print '<td class="tmenu" id="td_'.$idsel.'">';
|
else print '<td class="tmenu" id="td_'.$idsel.'">';
|
||||||
|
|
||||||
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
|
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||||
print $tabMenu[$i]['titre'];
|
print $tabMenu[$i]['titre'];
|
||||||
print '</a>';
|
print '</a>';
|
||||||
|
|
||||||
|
|||||||
@ -433,7 +433,7 @@ class MenuTop {
|
|||||||
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
|
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
|
||||||
else $class='class="tmenu"';
|
else $class='class="tmenu"';
|
||||||
print '<td class="tmenu" id="td_'.$idsel.'">';
|
print '<td class="tmenu" id="td_'.$idsel.'">';
|
||||||
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
|
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||||
print $tabMenu[$i]['titre'];
|
print $tabMenu[$i]['titre'];
|
||||||
print '</a>';
|
print '</a>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|||||||
@ -433,7 +433,7 @@ class MenuTop {
|
|||||||
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
|
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
|
||||||
else $class='class="tmenu"';
|
else $class='class="tmenu"';
|
||||||
print '<td class="tmenu" id="td_'.$idsel.'">';
|
print '<td class="tmenu" id="td_'.$idsel.'">';
|
||||||
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
|
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||||
print $tabMenu[$i]['titre'];
|
print $tabMenu[$i]['titre'];
|
||||||
print '</a>';
|
print '</a>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|||||||
@ -55,7 +55,7 @@ class MenuTop {
|
|||||||
|
|
||||||
// Menu Home
|
// Menu Home
|
||||||
print '<td class="tmenu">';
|
print '<td class="tmenu">';
|
||||||
print '<a href="'.DOL_URL_ROOT.'/index.php?mainmenu=home">'.$langs->trans("Home").'</a>';
|
print '<a href="'.DOL_URL_ROOT.'/index.php?mainmenu=home"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
// Put here top menu entries
|
// Put here top menu entries
|
||||||
@ -93,14 +93,14 @@ class MenuTop {
|
|||||||
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
|
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
|
||||||
else $class='class="tmenu"';
|
else $class='class="tmenu"';
|
||||||
print '<td class="tmenu">';
|
print '<td class="tmenu">';
|
||||||
print '<a '.$class.' '.$idsel.'href="'.$url.'"'.($this->atarget?" target=$this->atarget":"").'>';
|
print '<a '.$class.' '.$idsel.'href="'.$url.'"'.($this->atarget?" target=$this->atarget":($this->atarget?" target=$this->atarget":"")).'>';
|
||||||
print $tabMenu[$i]['titre'];
|
print $tabMenu[$i]['titre'];
|
||||||
print '</a>';
|
print '</a>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (! $this->hideifnotallowed)
|
if (! $this->hideifnotallowed)
|
||||||
{
|
{
|
||||||
print '<td class="tmenu">';
|
print '<td class="tmenu">';
|
||||||
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a>';
|
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a>';
|
||||||
|
|||||||
@ -372,7 +372,7 @@ class MenuTop {
|
|||||||
}
|
}
|
||||||
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
|
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
|
||||||
else $class='class="tmenu"';
|
else $class='class="tmenu"';
|
||||||
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
|
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||||
print $tabMenu[$i]['titre'];
|
print $tabMenu[$i]['titre'];
|
||||||
print '</a></td>';
|
print '</a></td>';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,7 +30,7 @@ function llxHeader($head = '', $title='', $help_url='')
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
top_menu($head);
|
top_menu($head, $title);
|
||||||
|
|
||||||
$menu = new Menu();
|
$menu = new Menu();
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user