diff options
| author | Sebastian Mendel <cybot_tm@users.sourceforge.net> | 2005-11-23 18:01:29 +0300 |
|---|---|---|
| committer | Sebastian Mendel <cybot_tm@users.sourceforge.net> | 2005-11-23 18:01:29 +0300 |
| commit | 8fc4a4ce056f2e4fe63cebefa64dbaa3d368a219 (patch) | |
| tree | 5737f8a16dae13db83edeadb55a346c74c89b54b | |
| parent | d6391f63468dfc61895eec6cfb648f91e7d235cf (diff) | |
moved styles into css
| -rwxr-xr-x | ChangeLog | 4 | ||||
| -rw-r--r-- | browse_foreigners.php | 8 | ||||
| -rw-r--r-- | css/phpmyadmin.css.php | 14 | ||||
| -rw-r--r-- | db_details_qbe.php | 10 | ||||
| -rw-r--r-- | header.inc.php | 10 | ||||
| -rw-r--r-- | libraries/auth/config.auth.lib.php | 2 | ||||
| -rw-r--r-- | libraries/auth/cookie.auth.lib.php | 2 | ||||
| -rw-r--r-- | querywindow.php | 33 | ||||
| -rw-r--r-- | server_collations.php | 6 | ||||
| -rw-r--r-- | themes.php | 2 |
10 files changed, 51 insertions, 40 deletions
@@ -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ř <michal@cihar.com> * config.default.php, libraries/import/csv.php, libraries/import/ldi.php: diff --git a/browse_foreigners.php b/browse_foreigners.php index 30738adc56..aaecd0e7d0 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -134,19 +134,21 @@ if (isset($disp_row) && is_array($disp_row)) { </script> </head> -<body bgcolor="<?php echo $cfg['LeftBgColor']; ?>" style="margin-left: 5px; margin-top: 5px; margin-right: 5px; margin-bottom: 0px"> +<body id="body_browse_foreigners"> <form action="browse_foreigners.php" method="post"> <fieldset> <?php echo PMA_generate_common_hidden_inputs( $db, $table ); ?> <input type="hidden" name="field" value="<?php echo urlencode($field); ?>" /> -<input type="hidden" name="fieldkey" value="<?php echo isset($fieldkey) ? $fieldkey : ''; ?>" /> +<input type="hidden" name="fieldkey" + value="<?php echo isset($fieldkey) ? $fieldkey : ''; ?>" /> <?php if ( isset( $pk ) ) { ?> <input type="hidden" name="pk" value="<?php echo urlencode($pk); ?>" /> <?php } ?> <span class="formelement"> <label for="input_foreign_filter"><?php echo $strSearch . ':'; ?></label> - <input type="text" name="foreign_filter" id="input_foreign_filter" value="<?php echo isset($foreign_filter) ? htmlspecialchars($foreign_filter) : ''; ?>" /> + <input type="text" name="foreign_filter" id="input_foreign_filter" + value="<?php echo isset($foreign_filter) ? htmlspecialchars($foreign_filter) : ''; ?>" /> <input type="submit" name="submit_foreign_filter" value="<?php echo $strGo;?>" /> </span> <span class="formelement"> diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 99f88c0d95..19ee800977 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: <?php echo $cfg['LeftBgColor']; ?>; + margin: 5px 5px 0 5px; +} + +#bodyquerywindow { + background-color: <?php echo $cfg['LeftBgColor']; ?>; +} <?php $_valid_css = array( 'left', 'right', 'print' ); diff --git a/db_details_qbe.php b/db_details_qbe.php index 3df2616fcd..5c100e2cfe 100644 --- a/db_details_qbe.php +++ b/db_details_qbe.php @@ -168,7 +168,7 @@ $realwidth = $wid . 'ex'; <!-- Fields row --> <tr> - <td class="tblHeaders" align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>"> + <td class="tblHeaders" align="<?php echo $cell_align_right; ?>"> <b><?php echo $strField; ?>: </b> </td> <?php @@ -229,7 +229,7 @@ for ($x = 0; $x < $col; $x++) { <!-- Sort row --> <tr> - <td class="tblHeaders" align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>"> + <td class="tblHeaders" align="<?php echo $cell_align_right; ?>"> <b><?php echo $strSort; ?>: </b> </td> <?php @@ -294,7 +294,7 @@ for ($x = 0; $x < $col; $x++) { <!-- Show row --> <tr> - <td class="tblHeaders" align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>"> + <td class="tblHeaders" align="<?php echo $cell_align_right; ?>"> <b><?php echo $strShow; ?>: </b> </td> <?php @@ -332,7 +332,7 @@ for ($x = 0; $x < $col; $x++) { <!-- Criteria row --> <tr> - <td class="tblHeaders" align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>"> + <td class="tblHeaders" align="<?php echo $cell_align_right; ?>"> <b><?php echo $strCriteria; ?>: </b> </td> <?php @@ -542,7 +542,7 @@ for ($y = 0; $y <= $row; $y++) { <!-- Modify columns --> <tr> - <td class="tblHeaders" align="<?php echo $cell_align_right; ?>" bgcolor="<?php echo $cfg['ThBgcolor']; ?>"> + <td class="tblHeaders" align="<?php echo $cell_align_right; ?>"> <b><?php echo $strModify; ?>: </b> </td> <?php diff --git a/header.inc.php b/header.inc.php index 0732b6dafa..fa9c06e866 100644 --- a/header.inc.php +++ b/header.inc.php @@ -137,15 +137,7 @@ if (empty($GLOBALS['is_header_sent'])) { <meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" /> </head> - - <?php - if ($GLOBALS['cfg']['RightBgImage'] != '') { - $bkg_img = ' background="' . $GLOBALS['cfg']['RightBgImage'] . '"'; - } else { - $bkg_img = ''; - } - ?> - <body bgcolor="<?php echo $GLOBALS['cfg']['RightBgColor'] . '"' . $bkg_img; ?>> + <body> <div id="TooltipContainer" onmouseover="holdTooltip();" onmouseout="swapTooltip('default');"></div> <?php include('./config.header.inc.php'); diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 322b5d33b1..cacea33081 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -87,7 +87,7 @@ function PMA_auth_fails() ?> </head> -<body bgcolor="<?php echo $cfg['RightBgColor']; ?>"> +<body> <br /><br /> <center> <h1><?php echo sprintf($GLOBALS['strWelcome'], ' phpMyAdmin ' . PMA_VERSION); ?></h1> diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index b3362aceb1..8076abb352 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -120,7 +120,7 @@ if (top != self) { </script> </head> -<body class="loginform" bgcolor="<?php echo $cfg['RightBgColor']; ?>"> +<body class="loginform"> <?php include('./config.header.inc.php'); ?> diff --git a/querywindow.php b/querywindow.php index 82341a0119..bacd07518f 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() { <script src="libraries/functions.js" type="text/javascript" language="javascript"></script> </head> -<body id="bodyquerywindow" <?php echo $onload; ?> - bgcolor="<?php echo $GLOBALS['cfg']['LeftBgColor']; ?>"> +<body id="bodyquerywindow" <?php echo $onload; ?> > <div id="querywindowcontainer"> <?php if ( !isset($no_js) ) { @@ -150,7 +149,7 @@ if ( !isset($no_js) ) { } if ( true == $GLOBALS['cfg']['PropertiesIconic'] ) { - $titles['Change'] = + $titles['Change'] = '<img class="icon" width="16" height="16" src="' . $pmaThemeImage . 'b_edit.png" alt="' . $strChange . '" title="' . $strChange . '" />'; @@ -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'] . '</a>'; @@ -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 ) . '</a>' . "\n"; - + echo '</li>' . "\n"; } unset( $tab, $_sql_history, $sql, $query ); diff --git a/server_collations.php b/server_collations.php index 18f2ebf924..ad8c1bdd35 100644 --- a/server_collations.php +++ b/server_collations.php @@ -20,7 +20,7 @@ require('./server_links.inc.php'); * Displays the sub-page heading */ echo '<h2>' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" alt="" />' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" alt="" />' : '') . '' . $strCharsetsAndCollations . "\n" . '</h2>' . "\n"; @@ -77,10 +77,10 @@ foreach ($mysql_charsets as $current_charset) { } $i++; echo ' <tr>' . "\n" - . ' <td colspan="2" bgcolor="' . $cfg['ThBgcolor'] . '" align="right">' . "\n" + . ' <th colspan="2" align="right">' . "\n" . ' <b>' . htmlspecialchars($current_charset) . '</b>' . "\n" . (empty($mysql_charsets_descriptions[$current_charset]) ? '' : ' (<i>' . htmlspecialchars($mysql_charsets_descriptions[$current_charset]) . '</i>) ' . "\n") - . ' </td>' . "\n" + . ' </th>' . "\n" . ' </tr>' . "\n"; $useBgcolorOne = TRUE; foreach ($mysql_collations[$current_charset] as $current_collation) { diff --git a/themes.php b/themes.php index 368f8a6de5..b9348d6355 100644 --- a/themes.php +++ b/themes.php @@ -29,7 +29,7 @@ require('./libraries/header_meta_style.inc.php'); </script> </head> -<body bgcolor="<?php echo $cfg['RightBgColor']; ?>"> +<body> <table border="0" align="center" cellpadding="3" cellspacing="1"> <tr> <th class="tblHeaders"><b>phpMyAdmin - <?php echo $strTheme; ?></b></th> |