diff --git a/ChangeLog b/ChangeLog index 99a377ce1..8bece30ec 100755 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,8 @@ $Source$ $cfg['ShowHttpHostTitle']. * config.inc.php, css/phpmyadmin.css.php, libraries/config_import.lib.php: Can disable main page icons (bug #965550). + * header.inc.php, css/phpmyadmin.css.php: Use span insted of div, div is + not allowed here. 2004-06-02 Alexander M. Turek * db_details_db_info.php, tbl_properties_tbl_info.php: Table type is called diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 345e6f0ab..6c10fef3d 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -497,9 +497,11 @@ textarea { /* Heading */ -h1 div { +h1 span { display: block; float: left; + clear: none; + width: auto; padding: 2px 2px 5px 2px; margin: 0px; font-family: ; @@ -508,7 +510,7 @@ h1 div { white-space: nowrap; } -h1 div a { +h1 span a { background-repeat: no-repeat; background-position: 2px 50%; @@ -516,25 +518,25 @@ h1 div a { } -h1 div a { +h1 span a { font-weight: bolder; } -h1 div.server a { +h1 span.server a { background-image: url(../images/s_host.png); } -h1 div.database a { +h1 span.database a { background-image: url(../images/s_db.png); } -h1 div.table a { +h1 span.table a { background-image: url(../images/s_tbl.png); } -div.database:before , div.table:before { +h1 span.database:before , h1 span.table:before { content: '>'; padding-left: 5px; padding-right: 5px; diff --git a/header.inc.php b/header.inc.php index 2768e5dd9..27c96ddc0 100644 --- a/header.inc.php +++ b/header.inc.php @@ -161,22 +161,22 @@ if (empty($GLOBALS['is_header_sent'])) { : ':' . $cfg['Server']['port'] ) ); - echo '
' . $GLOBALS['strServer'] . ":\n" + echo '' . $GLOBALS['strServer'] . ":\n" . '' . htmlspecialchars($server_info) . '' . "\n" - . '
' . "\n\n"; + . '' . "\n\n"; if (!empty($GLOBALS['db'])) { - echo '
' . $GLOBALS['strDatabase'] . ":\n" + echo '' . $GLOBALS['strDatabase'] . ":\n" . '' . htmlspecialchars($GLOBALS['db']) . '' . "\n" - . '
' . "\n\n"; + . '' . "\n\n"; if (!empty($GLOBALS['table'])) { - echo '
' . $GLOBALS['strTable'] . ":\n" + echo '' . $GLOBALS['strTable'] . ":\n" . '' . htmlspecialchars($GLOBALS['table']) . '' . "\n" - . '
' . "\n\n"; + . '' . "\n\n"; } } echo '';