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

Fix: Pb with Chrome

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-03 22:11:49 +00:00
parent 296d8e490d
commit a4853e4d31
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
htdocs/main.inc.php
View File

@ -753,15 +753,16 @@ $heightforframes=48;
/** /**
* \brief Show HTML header HTML + BODY + Top menu + left menu + DIV * Show HTML header HTML + BODY + Top menu + left menu + DIV
* \param head Add optionnal head lines * @param head Add optionnal head lines
* \param title * @param title Title of web page
* \param help_url * @param help_url Url links to help page
* \param target * @param target Target to use in menu links
* \param disablejs * @param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
* \param disablehead * @param disablehead Do not output head section
* \param arrayofjs * @param arrayofjs Array of js files to add in header
* \param arrayofcss * @param arrayofcss Array of css files to add in header
* @param morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails)
*/ */
if (! function_exists("llxHeader")) if (! function_exists("llxHeader"))
{ {
@ -932,14 +933,15 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
/** /**
* \brief Show an HTML header + a BODY + The top menu bar * Show an HTML header + a BODY + The top menu bar
* \param head Lines in the HEAD * @param head Lines in the HEAD
* \param title Title of web page * @param title Title of web page
* \param target Target to use in menu links * @param target Target to use in menu links
* \param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax) * @param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
* \param disablehead Do not output head section * @param disablehead Do not output head section
* \param arrayofjs Array of js files to add in header * @param arrayofjs Array of js files to add in header
* \param arrayofcss Array of css files to add in header * @param arrayofcss Array of css files to add in header
* @param morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails)
*/ */
function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='') function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
{ {
@ -1125,8 +1127,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
} }
print '<div class="login_block">'."\n"; print '<div class="login_block">'."\n";
print '<table class="nobordernopadding" summary=""><tr>';
print $html->textwithtooltip('',$loginhtmltext,2,1,$logintext);
print $html->textwithtooltip('',$loginhtmltext,2,1,$logintext,'',1);
// Select entity // Select entity
if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY))
@ -1140,14 +1143,14 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
//$mc = new ActionsMulticompany($db); //$mc = new ActionsMulticompany($db);
$entitytext = img_object('', 'globe',"class='entity'"); $entitytext = img_object('', 'globe',"class='entity'");
$entityhtmltext = 'EntityName'; $entityhtmltext = 'EntityName';
print $html->textwithtooltip('',$entityhtmltext,2,1,$entitytext); print $html->textwithtooltip('',$entityhtmltext,2,1,$entitytext,'',1);
//$select_entity = '<div class="loginSelectEntity">'.$mc->select_entities($conf->entity).'</div>'; //$select_entity = '<div class="loginSelectEntity">'.$mc->select_entities($conf->entity).'</div>';
//if ($mc->numEntity >= 1) print $select_entity; //if ($mc->numEntity >= 1) print $select_entity;
} }
} }
} }
print $html->textwithtooltip('',$logouthtmltext,2,1,$logouttext); print $html->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'',1);
// Link to print main content area // Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
@ -1156,10 +1159,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$text.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"'; $text.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"';
$text.=' title="" alt="">'; $text.=' title="" alt="">';
$text.='</a>'; $text.='</a>';
print $html->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text); print $html->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1);
} }
print "\n</div>\n"; print '</tr></table>'."\n";
print "</div>\n";
if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print "</div><!-- End top layout -->\n"; if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print "</div><!-- End top layout -->\n";