Font faces now depends on charset (temporary fix)

This commit is contained in:
Loïc Chapeaux
2001-07-02 21:17:17 +00:00
parent e48d7de32b
commit f1e5efa918
3 changed files with 18 additions and 14 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-07-02 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* left.js & left.php3: font face now depends on charset (temporary fix).
2001-07-02 Marc Delisle <lem9@users.sourceforge.net> 2001-07-02 Marc Delisle <lem9@users.sourceforge.net>
* bug 436108, quotes into manual requests: db_readdump.php3 * bug 436108, quotes into manual requests: db_readdump.php3

20
left.js
View File

@@ -238,31 +238,31 @@ if (capable) {
// to write(). // to write().
if (isDOM) { if (isDOM) {
var lstyle = '<style type="text/css">' var lstyle = '<style type="text/css">'
+ '.parent {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none; display:block}' + '.parent {font-family: ' + fontFamily + '; color: #000000; text-decoration:none; display:block}'
+ '.child {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none; display:none}' + '.child {font-family: ' + fontFamily + '; color: #000000; text-decoration:none; display:none}'
+ '.item { color: darkblue; text-decoration:none; font-size: 8pt;}' + '.item { color: darkblue; text-decoration:none; font-size: 8pt;}'
+ '.highlight { color: red; font-size: 8pt;}' + '.highlight { color: red; font-size: 8pt;}'
+ '.heada { font: 12px\/13px; Times}' + '.heada { font: 12px\/13px; Times}'
+ 'DIV { color:black; }' + 'div { color:black; }'
+ '<\/style>'; + '<\/style>';
write(lstyle); write(lstyle);
} }
else { else {
write('<style type="text/css">'); write('<style type="text/css">');
if (isIE4) { if (isIE4) {
write('.parent {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none;}'); write('.parent {font-family: ' + fontFamily + '; color: #000000; text-decoration:none;}');
write('.child {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none; display:none}'); write('.child {font-family: ' + fontFamily + '; color: #000000; text-decoration:none; display:none}');
write('.item { color: darkblue; text-decoration:none; font-size: 8pt;}'); write('.item { color: darkblue; text-decoration:none; font-size: 8pt;}');
write('.highlight { color: red; font-size: 8pt;}'); write('.highlight { color: red; font-size: 8pt;}');
write('.heada { font: 12px\/13px; Times}'); write('.heada { font: 12px\/13px; Times}');
write('DIV { color:black; }'); write('div { color:black; }');
} }
else { else {
write('.parent {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none; position:absolute; visibility:hidden; color: black;}'); write('.parent {font-family:' + fontFamily + '; color: #000000; text-decoration:none; position:absolute; visibility:hidden; color: black;}');
write('.child {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 8pt;color: #000000; position:absolute; visibility:hidden}'); write('.child {font-family: ' + fontFamily + '; font-size: 8pt;color: #000000; position:absolute; visibility:hidden}');
write('.item { color: darkblue; text-decoration:none;}'); write('.item { color: darkblue; text-decoration:none;}');
write('.regular {font-family: Arial,Helvetica,sans-serif; position:absolute; visibility:hidden}'); write('.regular {font-family: ' + fontFamily + '; position:absolute; visibility:hidden}');
write('DIV { color:black; }'); write('div { color:black; }');
} }
write('<\/style>'); write('<\/style>');
} }

View File

@@ -40,10 +40,11 @@ header('Content-Type: text/html; charset=' . $charset);
<!-- Collapsible tables list scripts --> <!-- Collapsible tables list scripts -->
<script type="text/javascript" language="javascript1.2"> <script type="text/javascript" language="javascript1.2">
<!-- <!--
var isDOM = (typeof(document.getElementsByTagName) != 'undefined') ? 1 : 0; var isDOM = (typeof(document.getElementsByTagName) != 'undefined') ? 1 : 0;
var isIE4 = ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >= 4)) ? 1 : 0; var isIE4 = ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >= 4)) ? 1 : 0;
var isNS4 = (typeof(document.layers) != 'undefined') ? 1 : 0; var isNS4 = (typeof(document.layers) != 'undefined') ? 1 : 0;
var capable = (isDOM || isIE4 || isNS4) ? 1 : 0; var capable = (isDOM || isIE4 || isNS4) ? 1 : 0;
var fontFamily = '<?php echo (($charset == 'iso-8859-1') ? 'verdana, helvetica, arial, geneva, sans-serif' : 'sans-serif'); ?>';
//--> //-->
</script> </script>
<script src="left.js" type="text/javascript" language="javascript1.2"></script> <script src="left.js" type="text/javascript" language="javascript1.2"></script>