diff --git a/ChangeLog b/ChangeLog index c5b2a96ff..ffde381b4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-12-08 Alexander M. Turek + * Documentation.html, header.inc.php3, header_printview.inc.php3, main.php3, + server_common.inc.php3, server_links.inc.php3, server_status.php3, + server_variables.php3, lang/*.inc.php3, libraries/common.lib.php3: + Started working on a new interface to server related pages. + * lang/thai-*.inc.php3: Updates, thanks to Arthit Suriyawongkul (bacteria). + 2002-12-07 Marc Delisle * db_search.php3, libraries/display_tbl.lib.php3, libraries/common.lib.php3 bug 633422, use a button if search result would generate a too big URL diff --git a/Documentation.html b/Documentation.html index b05867bf7..46ee35dc4 100755 --- a/Documentation.html +++ b/Documentation.html @@ -2559,8 +2559,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
  • Please try to keep up the file-naming conventions. Table-related stuff - goes to tbl_*.php3, db-related code to db_*.php3 and so - on. + goes to tbl_*.php3, db-related code to db_*.php3, + server-related tools to server_*.php3 and so on.
  • Please don't use verbose strings in your code, instead add the string diff --git a/header.inc.php3 b/header.inc.php3 index 7f286487a..d732f9077 100755 --- a/header.inc.php3 +++ b/header.inc.php3 @@ -82,16 +82,18 @@ input {font-family: ; font-size: ; font-size: ; color: #000000; background-color: #FFFFFF} select {font-family: ; font-size: ; color: #000000; background-color: #FFFFFF} textarea {font-family: ; font-size: ; color: #000000; background-color: #FFFFFF} -h1 {font-family: ; font-size: ; font-weight: bold} +h1 {font-family: ; font-size: ; font-weight: bold} +h2 {font-family: ; font-size: ; font-weight: bold} a:link {font-family: ; font-size: ; text-decoration: none; color: #0000FF} a:visited {font-family: ; font-size: ; text-decoration: none; color: #0000FF} a:hover {font-family: ; font-size: ; text-decoration: underline; color: #FF0000} a.nav:link {font-family: ; color: #000000} a.nav:visited {font-family: ; color: #000000} a.nav:hover {font-family: ; color: #FF0000} -a.h1:link {font-family: ; font-size: ; font-weight: bold; color: #000000} -a.h1:visited {font-family: ; font-size: ; font-weight: bold; color: #000000} -a.h1:hover {font-family: ; font-size: ; font-weight: bold; color: #FF0000} +a.h1:link {font-family: ; font-size: ; font-weight: bold; color: #000000} +a.h1:active {font-family: ; font-size: ; font-weight: bold; color: #000000} +a.h1:visited {font-family: ; font-size: ; font-weight: bold; color: #000000} +a.h1:hover {font-family: ; font-size: ; font-weight: bold; color: #FF0000} a.drop:link {font-family: ; color: #ff0000} a.drop:visited {font-family: ; color: #ff0000} a.drop:hover {font-family: ; color: #ffffff; background-color:#ff0000; text-decoration: none} @@ -224,17 +226,31 @@ if ($GLOBALS['cfg']['RightBgImage'] != '') { ?> > ' . "\n"; - echo ' ' . $GLOBALS['strDatabase'] . ' ' . htmlspecialchars($GLOBALS['db']) . '' . "\n"; - if (!empty($GLOBALS['table'])) { - echo ' - ' . $GLOBALS['strTable'] . ' ' . htmlspecialchars($GLOBALS['table']) . '' . "\n"; + $server_info = (!empty($cfg['Server']['verbose']) + ? $cfg['Server']['verbose'] + : $server_info = $cfg['Server']['host'] . (empty($cfg['Server']['port']) + ? '' + : ':' . $cfg['Server']['port'] + ) + ); + if (isset($GLOBALS['db'])) { + echo ' ' . $GLOBALS['strDatabase'] . ' ' . htmlspecialchars($GLOBALS['db']) . '' . "\n"; + if (!empty($GLOBALS['table'])) { + echo ' - ' . $GLOBALS['strTable'] . ' ' . htmlspecialchars($GLOBALS['table']) . '' . "\n"; + } + echo ' ' . sprintf($GLOBALS['strRunning'], '' . htmlspecialchars($server_info) . ''); + } else { + echo ' ' . sprintf($GLOBALS['strServer'], '' . htmlspecialchars($server_info) . ''); } - echo ' ' . sprintf($GLOBALS['strRunning'], ' ' . (($GLOBALS['cfg']['Server']['verbose']) ? htmlspecialchars($GLOBALS['cfg']['Server']['verbose']) : $GLOBALS['cfg']['Server']['host']) . '') . "\n"; - echo '' . "\n"; + echo "\n" . '' . "\n"; } echo "\n"; diff --git a/header_printview.inc.php3 b/header_printview.inc.php3 index 07756d851..f269165a8 100644 --- a/header_printview.inc.php3 +++ b/header_printview.inc.php3 @@ -52,7 +52,7 @@ if ($text_dir == 'ltr') {