Ensured that the correct font families are used.

This commit is contained in:
Alexander M. Turek
2003-03-10 20:32:25 +00:00
parent 3ae253e400
commit 41fad76d63
7 changed files with 192 additions and 189 deletions

View File

@@ -9,6 +9,9 @@ $Source$
* translators.html: Another mechanism against stupid people who use the * translators.html: Another mechanism against stupid people who use the
translator list as a list of localised support hotlines or try to get a translator list as a list of localised support hotlines or try to get a
translation by mail order... :o) translation by mail order... :o)
* header_printview.inc.php3, index.php3, left.php3, queryframe.php3,
libraries/common.lib.php3, libraries/header_meta_style.inc.php3: Ensured
that the correct font families are used.
2003-03-10 Garvin Hicking <me@supergarv.de> 2003-03-10 Garvin Hicking <me@supergarv.de>
* sql.php3: Fixed another occurence of addslashes() where it no longer * sql.php3: Fixed another occurence of addslashes() where it no longer

View File

@@ -42,7 +42,7 @@ if ($text_dir == 'ltr') {
<head> <head>
<title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title> <title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=print" /> <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=print" />
</style> </style>
</head> </head>

View File

@@ -54,8 +54,8 @@ if ($cfg['QueryHistoryDB'] && $cfgRelation['historywork']) {
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][2]; ?>" lang="<?php echo $available_languages[$lang][2]; ?>" dir="<?php echo $text_dir; ?>"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][2]; ?>" lang="<?php echo $available_languages[$lang][2]; ?>" dir="<?php echo $text_dir; ?>">
<head> <head>
<title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title> <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=right" /> <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=right" />
</head> </head>
<frameset cols="<?php echo $cfg['LeftWidth']; ?>,*" rows="*"> <frameset cols="<?php echo $cfg['LeftWidth']; ?>,*" rows="*">

View File

@@ -94,11 +94,11 @@ if ($num_dbs > 1 && !$cfg['LeftFrameLight']) {
var isServer = <?php echo ($server > 0) ? 'true' : 'false'; ?>; var isServer = <?php echo ($server > 0) ? 'true' : 'false'; ?>;
document.writeln('<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&amp;js_capable=' + capable + '&amp;js_isDOM=' + isDOM + '&amp;js_isIE4=' + isIE4 + '" />'); document.writeln('<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=left&amp;js_capable=' + capable + '&amp;js_isDOM=' + isDOM + '&amp;js_isIE4=' + isIE4 + '" />');
//--> //-->
</script> </script>
<noscript> <noscript>
<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" /> <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
</noscript> </noscript>
<script src="libraries/left.js" type="text/javascript" language="javascript1.2"></script> <script src="libraries/left.js" type="text/javascript" language="javascript1.2"></script>

View File

@@ -142,7 +142,6 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
include('./libraries/config_import.lib.php3'); include('./libraries/config_import.lib.php3');
} }
if ($is_minimum_common == FALSE) {
/** /**
* Includes the language file if it hasn't been included yet * Includes the language file if it hasn't been included yet
*/ */
@@ -150,6 +149,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
include('./libraries/select_lang.lib.php3'); include('./libraries/select_lang.lib.php3');
} }
if ($is_minimum_common == FALSE) {
/** /**
* Include MySQL wrappers. * Include MySQL wrappers.
*/ */

View File

@@ -28,4 +28,4 @@ if (!empty($GLOBALS['cfg']['PmaAbsoluteUri'])) {
echo '<base href="' . $GLOBALS['cfg']['PmaAbsoluteUri'] . '" />' . "\n"; echo '<base href="' . $GLOBALS['cfg']['PmaAbsoluteUri'] . '" />' . "\n";
} }
?> ?>
<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=right" /> <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $GLOBALS['lang']; ?>&amp;js_frame=right" />

View File

@@ -45,7 +45,7 @@ PMA_setFontSizes();
<title>phpMyAdmin</title> <title>phpMyAdmin</title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
<base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> /> <base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> />
<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&num_dbs=0" /> <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=left&num_dbs=0" />
<?php <?php
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) { if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
?> ?>