From 8fc4a4ce056f2e4fe63cebefa64dbaa3d368a219 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Wed, 23 Nov 2005 15:01:29 +0000 Subject: [PATCH] moved styles into css --- ChangeLog | 4 ++++ browse_foreigners.php | 8 +++++--- css/phpmyadmin.css.php | 14 +++++++++++++ db_details_qbe.php | 10 ++++----- header.inc.php | 10 +-------- libraries/auth/config.auth.lib.php | 2 +- libraries/auth/cookie.auth.lib.php | 2 +- querywindow.php | 33 +++++++++++++++--------------- server_collations.php | 6 +++--- themes.php | 2 +- 10 files changed, 51 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d26764a1..f3f4999c1 100755 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,10 @@ $Source$ tbl_relation.php, browse_foreigners.php, css/phpmyadmin.css.php, header_printview.inc.php, header_meta_style.inc.php, themes.php: - drop PMA_setFontSizes() + * browse_foreigners.php, css/phpmyadmin.css.php, querywindow.php, themes.php + header.inc.php, libraries/auth/config.auth.lib.php, db_details_qbe.php + libraries/auth/cookie.auth.lib.php, server_collations.php + - moved styles into css 2005-11-23 Michal Čihař * config.default.php, libraries/import/csv.php, libraries/import/ldi.php: diff --git a/browse_foreigners.php b/browse_foreigners.php index 30738adc5..aaecd0e7d 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -134,19 +134,21 @@ if (isset($disp_row) && is_array($disp_row)) { - +
- + - + diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 99f88c0d9..19ee80097 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -617,6 +617,20 @@ form.login label { img.lightbulb { cursor: pointer; } + + +/********************/ +/* NEW in PMA 2.7.1 */ +/********************/ + +#body_browse_foreigners { + background-color: ; + margin: 5px 5px 0 5px; +} + +#bodyquerywindow { + background-color: ; +} - + :  - + :  - + :  - + :  - + :  " /> - - - > +
- +

diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index b3362aceb..8076abb35 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -120,7 +120,7 @@ if (top != self) { - + diff --git a/querywindow.php b/querywindow.php index 82341a011..bacd07518 100644 --- a/querywindow.php +++ b/querywindow.php @@ -80,7 +80,7 @@ if ( empty( $querydisplay_tab ) ) { $onload = 'onload="resize();"'; ?> function resize() { - + // for Gecko if ( typeof( self.sizeToContent ) == 'function' ) { self.sizeToContent(); @@ -89,14 +89,14 @@ function resize() { self.resizeBy( 10, 50 ); return; } - + // for IE, Opera if (document.getElementById && typeof(document.getElementById('querywindowcontainer')) != 'undefined' ) { - + // get content size var newWidth = document.getElementById('querywindowcontainer').offsetWidth; var newHeight = document.getElementById('querywindowcontainer').offsetHeight; - + // set size to contentsize // plus some offset for scrollbars, borders, statusbar, menus ... self.resizeTo( newWidth + 45, newHeight + 75 ); @@ -112,8 +112,7 @@ function resize() { - - bgcolor=""> + >
'; @@ -176,12 +175,12 @@ if ( ! empty( $query_history_latest ) && ! empty( $query_history_latest_db ) ) { 'db' => $query_history_latest_db, 'table' => isset($query_history_latest_table) ? $query_history_latest_table : '', ); - + $_sql_history[$query_history_latest] = array( 'db' => $query_history_latest_db, 'table' => isset( $query_history_latest_table ) ? $query_history_latest_table : '', ); - + $sql_query = urldecode($query_history_latest); $db = $query_history_latest_db; $table = $query_history_latest_table; @@ -284,19 +283,19 @@ if ( count( $_sql_history ) > 0 .'querydisplay_tab.value = \'' . $tab . '\';' .' document.getElementById(\'hiddenqueryform\').' .'query_history_latest.value = \'' - . preg_replace('/(\r|\n)+/i', '\\n', + . preg_replace('/(\r|\n)+/i', '\\n', htmlentities( $sql, ENT_QUOTES ) ) . '\';' .' document.getElementById(\'hiddenqueryform\').' .'auto_commit.value = \'false\';' .' document.getElementById(\'hiddenqueryform\').' .'db.value = \'' . htmlspecialchars( $query['db'] ) . '\';' .' document.getElementById(\'hiddenqueryform\').' - .'query_history_latest_db.value = \'' + .'query_history_latest_db.value = \'' . htmlspecialchars( $query['db'] ) . '\';' .' document.getElementById(\'hiddenqueryform\').' .'table.value = \'' . htmlspecialchars( $query['table'] ) . '\';' .' document.getElementById(\'hiddenqueryform\').' - .'query_history_latest_table.value = \'' + .'query_history_latest_table.value = \'' . htmlspecialchars( $query['table'] ) . '\';' .' document.getElementById(\'hiddenqueryform\').submit();' .' return false;">' . $titles['Change'] . ''; @@ -306,24 +305,24 @@ if ( count( $_sql_history ) > 0 .'querydisplay_tab.value = \'' . $tab . '\';' .' document.getElementById(\'hiddenqueryform\').' .'query_history_latest.value = \'' - . preg_replace('/(\r|\n)+/i', '\\r\\n', + . preg_replace('/(\r|\n)+/i', '\\r\\n', htmlentities( $sql, ENT_QUOTES ) ) . '\';' .' document.getElementById(\'hiddenqueryform\').' .'auto_commit.value = \'true\';' .' document.getElementById(\'hiddenqueryform\').' .'db.value = \'' . htmlspecialchars( $query['db'] ) . '\';' .' document.getElementById(\'hiddenqueryform\').' - .'query_history_latest_db.value = \'' + .'query_history_latest_db.value = \'' . htmlspecialchars( $query['db'] ) . '\';' .' document.getElementById(\'hiddenqueryform\').' .'table.value = \'' . htmlspecialchars( $query['table'] ) . '\';' .' document.getElementById(\'hiddenqueryform\').' - .'query_history_latest_table.value = \'' + .'query_history_latest_table.value = \'' . htmlspecialchars( $query['table'] ) . '\';' .' document.getElementById(\'hiddenqueryform\').submit();' - .' return false;">[' . htmlspecialchars( $query['db'] ) . '] ' + .' return false;">[' . htmlspecialchars( $query['db'] ) . '] ' . urldecode( $sql ) . '' . "\n"; - + echo '' . "\n"; } unset( $tab, $_sql_history, $sql, $query ); diff --git a/server_collations.php b/server_collations.php index 18f2ebf92..ad8c1bdd3 100644 --- a/server_collations.php +++ b/server_collations.php @@ -20,7 +20,7 @@ require('./server_links.inc.php'); * Displays the sub-page heading */ echo '

' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '' : '') . '' . $strCharsetsAndCollations . "\n" . '

' . "\n"; @@ -77,10 +77,10 @@ foreach ($mysql_charsets as $current_charset) { } $i++; echo ' ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . '  ' . htmlspecialchars($current_charset) . '' . "\n" . (empty($mysql_charsets_descriptions[$current_charset]) ? '' : ' (' . htmlspecialchars($mysql_charsets_descriptions[$current_charset]) . ') ' . "\n") - . ' ' . "\n" + . ' ' . "\n" . ' ' . "\n"; $useBgcolorOne = TRUE; foreach ($mysql_collations[$current_charset] as $current_collation) { diff --git a/themes.php b/themes.php index 368f8a6de..b9348d635 100644 --- a/themes.php +++ b/themes.php @@ -29,7 +29,7 @@ require('./libraries/header_meta_style.inc.php'); - +
phpMyAdmin -