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

Modif pour mieux grer l'activation ou dsactivation de code javascript.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-12-03 20:53:18 +00:00
parent 6f4dd8bf60
commit 8b15d24b61
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/main.inc.php
View File

@ -304,7 +304,7 @@ function top_htmlhead($head, $title="", $target="")
if ($conf->use_javascript) if ($conf->use_javascript)
{ {
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib.js"></script>'; print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>';
} }
print "</head>\n"; print "</head>\n";
@ -322,7 +322,7 @@ function top_menu($head, $title="", $target="")
top_htmlhead($head, $title, $target); top_htmlhead($head, $title, $target);
print '<body>'; print '<body><div id="dhtmltooltip"></div>';
/* /*
* Si la constante MAIN_NEED_UPDATE est définie (par le script de migration sql en général), c'est que * Si la constante MAIN_NEED_UPDATE est définie (par le script de migration sql en général), c'est que
@ -366,7 +366,10 @@ function top_menu($head, $title="", $target="")
print '<a href="'.DOL_URL_ROOT.'/user/logout.php"'; print '<a href="'.DOL_URL_ROOT.'/user/logout.php"';
print $menutop->atarget?(' target="'.$menutop->atarget.'"'):''; print $menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
print '>'; print '>';
print '<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png" alt="'.$langs->trans("Logout").'" title="'.$langs->trans("Logout").'"></a>'; print '<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
print ' alt="'.$langs->trans("Logout").'" title="'.$langs->trans("Logout").'"';
print '>';
print '</a>';
} }
print "</div><!-- class=tmenu -->\n"; print "</div><!-- class=tmenu -->\n";
@ -513,7 +516,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$
function llxFooter($foot='') function llxFooter($foot='')
{ {
global $dolibarr_auto_user, $micro_start_time; global $conf, $dolibarr_auto_user, $micro_start_time;
print "\n</div>\n".'<!-- end div class="fiche" -->'."\n"; print "\n</div>\n".'<!-- end div class="fiche" -->'."\n";
print "\n</div>\n".'<!-- end div class="vmenuplusfiche" -->'; print "\n</div>\n".'<!-- end div class="vmenuplusfiche" -->';
@ -524,6 +527,15 @@ function llxFooter($foot='')
print "\n"; print "\n";
} }
print "</body>\n</html>\n"; if ($conf->use_javascript)
{
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_foot.js"></script>';
}
// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
print "\n".'<div class="tabsAction">nbsp;</div>'."\n";
print "</body>\n";
print "</html>\n";
} }
?> ?>