From f1e5efa918b46d563d77cf4997e4ff53e3604f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Mon, 2 Jul 2001 21:17:17 +0000
Subject: [PATCH] Font faces now depends on charset (temporary fix)

---
 ChangeLog |  3 +++
 left.js   | 20 ++++++++++----------
 left.php3 |  9 +++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9084f52b3..7a7b860e5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-07-02  Loï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>
 	* bug 436108, quotes into manual requests: db_readdump.php3
 
diff --git a/left.js b/left.js
index d46df8db5..932ab4887 100644
--- a/left.js
+++ b/left.js
@@ -238,31 +238,31 @@ if (capable) {
     // to write().
     if (isDOM) {
       var lstyle = '<style type="text/css">'
-                 + '.parent {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none; display:block}'
-                 + '.child {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none; display:none}'
+                 + '.parent {font-family: ' + fontFamily + '; color: #000000; text-decoration:none; display:block}'
+                 + '.child {font-family: ' + fontFamily + '; color: #000000; text-decoration:none; display:none}'
                  + '.item { color: darkblue; text-decoration:none; font-size: 8pt;}'
                  + '.highlight { color: red; font-size: 8pt;}'
                  + '.heada { font: 12px\/13px; Times}'
-                 + 'DIV { color:black; }'
+                 + 'div { color:black; }'
                  + '<\/style>';
       write(lstyle);
     }
     else {
       write('<style type="text/css">');
       if (isIE4) {
-        write('.parent {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none;}');
-        write('.child {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration:none; display:none}');
+        write('.parent {font-family: ' + fontFamily + '; color: #000000; text-decoration:none;}');
+        write('.child {font-family: ' + fontFamily + '; color: #000000; text-decoration:none; display:none}');
         write('.item { color: darkblue; text-decoration:none; font-size: 8pt;}');
         write('.highlight { color: red; font-size: 8pt;}');
         write('.heada { font: 12px\/13px; Times}');
-        write('DIV { color:black; }');
+        write('div { color:black; }');
       }
       else {
-        write('.parent {font-family: Verdana, Arial, Helvetica, sans-serif; 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('.parent {font-family:' + fontFamily + '; color: #000000; text-decoration:none; position:absolute; visibility:hidden; color: black;}');
+        write('.child {font-family: ' + fontFamily + '; font-size: 8pt;color: #000000; position:absolute; visibility:hidden}');
         write('.item { color: darkblue; text-decoration:none;}');
-        write('.regular {font-family: Arial,Helvetica,sans-serif; position:absolute; visibility:hidden}');
-        write('DIV { color:black; }');
+        write('.regular {font-family: ' + fontFamily + '; position:absolute; visibility:hidden}');
+        write('div { color:black; }');
       }
       write('<\/style>');
     }
diff --git a/left.php3 b/left.php3
index 9be5c3848..58dfa0f0d 100755
--- a/left.php3
+++ b/left.php3
@@ -40,10 +40,11 @@ header('Content-Type: text/html; charset=' . $charset);
     <!-- Collapsible tables list scripts -->
     <script type="text/javascript" language="javascript1.2">
     <!--
-    var isDOM   = (typeof(document.getElementsByTagName) != 'undefined') ? 1 : 0;
-    var isIE4   = ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >= 4)) ? 1 : 0;
-    var isNS4   = (typeof(document.layers) != 'undefined') ? 1 : 0;
-    var capable = (isDOM || isIE4 || isNS4) ? 1 : 0;
+    var isDOM      = (typeof(document.getElementsByTagName) != 'undefined') ? 1 : 0;
+    var isIE4      = ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >= 4)) ? 1 : 0;
+    var isNS4      = (typeof(document.layers) != 'undefined') ? 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 src="left.js" type="text/javascript" language="javascript1.2"></script>