nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved styles into css

Browse Source
This commit is contained in:
Sebastian Mendel
2005-11-23 15:01:29 +00:00
parent d6391f6346
commit 8fc4a4ce05
10 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -12,6 +12,10 @@ $Source$
tbl_relation.php, browse_foreigners.php, css/phpmyadmin.css.php, tbl_relation.php, browse_foreigners.php, css/phpmyadmin.css.php,
header_printview.inc.php, header_meta_style.inc.php, themes.php: header_printview.inc.php, header_meta_style.inc.php, themes.php:
- drop PMA_setFontSizes() - 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> 2005-11-23 Michal Čihař <michal@cihar.com>
* config.default.php, libraries/import/csv.php, libraries/import/ldi.php: * config.default.php, libraries/import/csv.php, libraries/import/ldi.php:

8
browse_foreigners.php
View File

@@ -134,19 +134,21 @@ if (isset($disp_row) && is_array($disp_row)) {
</script> </script>
</head> </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"> <form action="browse_foreigners.php" method="post">
<fieldset> <fieldset>
<?php echo PMA_generate_common_hidden_inputs( $db, $table ); ?> <?php echo PMA_generate_common_hidden_inputs( $db, $table ); ?>
<input type="hidden" name="field" value="<?php echo urlencode($field); ?>" /> <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 ) ) { ?> <?php if ( isset( $pk ) ) { ?>
<input type="hidden" name="pk" value="<?php echo urlencode($pk); ?>" /> <input type="hidden" name="pk" value="<?php echo urlencode($pk); ?>" />
<?php } ?> <?php } ?>
<span class="formelement"> <span class="formelement">
<label for="input_foreign_filter"><?php echo $strSearch . ':'; ?></label> <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;?>" /> <input type="submit" name="submit_foreign_filter" value="<?php echo $strGo;?>" />
</span> </span>
<span class="formelement"> <span class="formelement">

14
css/phpmyadmin.css.php
View File

@@ -617,6 +617,20 @@ form.login label {
img.lightbulb { img.lightbulb {
cursor: pointer; 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 <?php
$_valid_css = array( 'left', 'right', 'print' ); $_valid_css = array( 'left', 'right', 'print' );

10
db_details_qbe.php
View File

@@ -168,7 +168,7 @@ $realwidth = $wid . 'ex';
<!-- Fields row --> <!-- Fields row -->
<tr> <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; ?>:&nbsp;</b> <b><?php echo $strField; ?>:&nbsp;</b>
</td> </td>
<?php <?php
@@ -229,7 +229,7 @@ for ($x = 0; $x < $col; $x++) {
<!-- Sort row --> <!-- Sort row -->
<tr> <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; ?>:&nbsp;</b> <b><?php echo $strSort; ?>:&nbsp;</b>
</td> </td>
<?php <?php
@@ -294,7 +294,7 @@ for ($x = 0; $x < $col; $x++) {
<!-- Show row --> <!-- Show row -->
<tr> <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; ?>:&nbsp;</b> <b><?php echo $strShow; ?>:&nbsp;</b>
</td> </td>
<?php <?php
@@ -332,7 +332,7 @@ for ($x = 0; $x < $col; $x++) {
<!-- Criteria row --> <!-- Criteria row -->
<tr> <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; ?>:&nbsp;</b> <b><?php echo $strCriteria; ?>:&nbsp;</b>
</td> </td>
<?php <?php
@@ -542,7 +542,7 @@ for ($y = 0; $y <= $row; $y++) {
<!-- Modify columns --> <!-- Modify columns -->
<tr> <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; ?>:&nbsp;</b> <b><?php echo $strModify; ?>:&nbsp;</b>
</td> </td>
<?php <?php

10
header.inc.php
View File

@@ -137,15 +137,7 @@ if (empty($GLOBALS['is_header_sent'])) {
<meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" /> <meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" />
</head> </head>
<body>
<?php
if ($GLOBALS['cfg']['RightBgImage'] != '') {
$bkg_img = ' background="' . $GLOBALS['cfg']['RightBgImage'] . '"';
} else {
$bkg_img = '';
}
?>
<body bgcolor="<?php echo $GLOBALS['cfg']['RightBgColor'] . '"' . $bkg_img; ?>>
<div id="TooltipContainer" onmouseover="holdTooltip();" onmouseout="swapTooltip('default');"></div> <div id="TooltipContainer" onmouseover="holdTooltip();" onmouseout="swapTooltip('default');"></div>
<?php <?php
include('./config.header.inc.php'); include('./config.header.inc.php');

2
libraries/auth/config.auth.lib.php
View File

@@ -87,7 +87,7 @@ function PMA_auth_fails()
?> ?>
</head> </head>
<body bgcolor="<?php echo $cfg['RightBgColor']; ?>"> <body>
<br /><br /> <br /><br />
<center> <center>
<h1><?php echo sprintf($GLOBALS['strWelcome'], ' phpMyAdmin ' . PMA_VERSION); ?></h1> <h1><?php echo sprintf($GLOBALS['strWelcome'], ' phpMyAdmin ' . PMA_VERSION); ?></h1>

2
libraries/auth/cookie.auth.lib.php
View File

@@ -120,7 +120,7 @@ if (top != self) {
</script> </script>
</head> </head>
<body class="loginform" bgcolor="<?php echo $cfg['RightBgColor']; ?>"> <body class="loginform">
<?php include('./config.header.inc.php'); ?> <?php include('./config.header.inc.php'); ?>

33
querywindow.php
View File

@@ -80,7 +80,7 @@ if ( empty( $querydisplay_tab ) ) {
$onload = 'onload="resize();"'; $onload = 'onload="resize();"';
?> ?>
function resize() { function resize() {
// for Gecko // for Gecko
if ( typeof( self.sizeToContent ) == 'function' ) { if ( typeof( self.sizeToContent ) == 'function' ) {
self.sizeToContent(); self.sizeToContent();
@@ -89,14 +89,14 @@ function resize() {
self.resizeBy( 10, 50 ); self.resizeBy( 10, 50 );
return; return;
} }
// for IE, Opera // for IE, Opera
if (document.getElementById && typeof(document.getElementById('querywindowcontainer')) != 'undefined' ) { if (document.getElementById && typeof(document.getElementById('querywindowcontainer')) != 'undefined' ) {
// get content size // get content size
var newWidth = document.getElementById('querywindowcontainer').offsetWidth; var newWidth = document.getElementById('querywindowcontainer').offsetWidth;
var newHeight = document.getElementById('querywindowcontainer').offsetHeight; var newHeight = document.getElementById('querywindowcontainer').offsetHeight;
// set size to contentsize // set size to contentsize
// plus some offset for scrollbars, borders, statusbar, menus ... // plus some offset for scrollbars, borders, statusbar, menus ...
self.resizeTo( newWidth + 45, newHeight + 75 ); self.resizeTo( newWidth + 45, newHeight + 75 );
@@ -112,8 +112,7 @@ function resize() {
<script src="libraries/functions.js" type="text/javascript" language="javascript"></script> <script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
</head> </head>
<body id="bodyquerywindow" <?php echo $onload; ?> <body id="bodyquerywindow" <?php echo $onload; ?> >
bgcolor="<?php echo $GLOBALS['cfg']['LeftBgColor']; ?>">
<div id="querywindowcontainer"> <div id="querywindowcontainer">
<?php <?php
if ( !isset($no_js) ) { if ( !isset($no_js) ) {
@@ -150,7 +149,7 @@ if ( !isset($no_js) ) {
} }
if ( true == $GLOBALS['cfg']['PropertiesIconic'] ) { if ( true == $GLOBALS['cfg']['PropertiesIconic'] ) {
$titles['Change'] = $titles['Change'] =
'<img class="icon" width="16" height="16" src="' . $pmaThemeImage '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'b_edit.png" alt="' . $strChange . '" title="' . $strChange . '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, 'db' => $query_history_latest_db,
'table' => isset($query_history_latest_table) ? $query_history_latest_table : '', 'table' => isset($query_history_latest_table) ? $query_history_latest_table : '',
); );
$_sql_history[$query_history_latest] = array( $_sql_history[$query_history_latest] = array(
'db' => $query_history_latest_db, 'db' => $query_history_latest_db,
'table' => isset( $query_history_latest_table ) ? $query_history_latest_table : '', 'table' => isset( $query_history_latest_table ) ? $query_history_latest_table : '',
); );
$sql_query = urldecode($query_history_latest); $sql_query = urldecode($query_history_latest);
$db = $query_history_latest_db; $db = $query_history_latest_db;
$table = $query_history_latest_table; $table = $query_history_latest_table;
@@ -284,19 +283,19 @@ if ( count( $_sql_history ) > 0
.'querydisplay_tab.value = \'' . $tab . '\';' .'querydisplay_tab.value = \'' . $tab . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'query_history_latest.value = \'' .'query_history_latest.value = \''
. preg_replace('/(\r|\n)+/i', '\\n', . preg_replace('/(\r|\n)+/i', '\\n',
htmlentities( $sql, ENT_QUOTES ) ) . '\';' htmlentities( $sql, ENT_QUOTES ) ) . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'auto_commit.value = \'false\';' .'auto_commit.value = \'false\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'db.value = \'' . htmlspecialchars( $query['db'] ) . '\';' .'db.value = \'' . htmlspecialchars( $query['db'] ) . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'query_history_latest_db.value = \'' .'query_history_latest_db.value = \''
. htmlspecialchars( $query['db'] ) . '\';' . htmlspecialchars( $query['db'] ) . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'table.value = \'' . htmlspecialchars( $query['table'] ) . '\';' .'table.value = \'' . htmlspecialchars( $query['table'] ) . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'query_history_latest_table.value = \'' .'query_history_latest_table.value = \''
. htmlspecialchars( $query['table'] ) . '\';' . htmlspecialchars( $query['table'] ) . '\';'
.' document.getElementById(\'hiddenqueryform\').submit();' .' document.getElementById(\'hiddenqueryform\').submit();'
.' return false;">' . $titles['Change'] . '</a>'; .' return false;">' . $titles['Change'] . '</a>';
@@ -306,24 +305,24 @@ if ( count( $_sql_history ) > 0
.'querydisplay_tab.value = \'' . $tab . '\';' .'querydisplay_tab.value = \'' . $tab . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'query_history_latest.value = \'' .'query_history_latest.value = \''
. preg_replace('/(\r|\n)+/i', '\\r\\n', . preg_replace('/(\r|\n)+/i', '\\r\\n',
htmlentities( $sql, ENT_QUOTES ) ) . '\';' htmlentities( $sql, ENT_QUOTES ) ) . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'auto_commit.value = \'true\';' .'auto_commit.value = \'true\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'db.value = \'' . htmlspecialchars( $query['db'] ) . '\';' .'db.value = \'' . htmlspecialchars( $query['db'] ) . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'query_history_latest_db.value = \'' .'query_history_latest_db.value = \''
. htmlspecialchars( $query['db'] ) . '\';' . htmlspecialchars( $query['db'] ) . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'table.value = \'' . htmlspecialchars( $query['table'] ) . '\';' .'table.value = \'' . htmlspecialchars( $query['table'] ) . '\';'
.' document.getElementById(\'hiddenqueryform\').' .' document.getElementById(\'hiddenqueryform\').'
.'query_history_latest_table.value = \'' .'query_history_latest_table.value = \''
. htmlspecialchars( $query['table'] ) . '\';' . htmlspecialchars( $query['table'] ) . '\';'
.' document.getElementById(\'hiddenqueryform\').submit();' .' document.getElementById(\'hiddenqueryform\').submit();'
.' return false;">[' . htmlspecialchars( $query['db'] ) . '] ' .' return false;">[' . htmlspecialchars( $query['db'] ) . '] '
. urldecode( $sql ) . '</a>' . "\n"; . urldecode( $sql ) . '</a>' . "\n";
echo '</li>' . "\n"; echo '</li>' . "\n";
} }
unset( $tab, $_sql_history, $sql, $query ); unset( $tab, $_sql_history, $sql, $query );

6
server_collations.php
View File

@@ -20,7 +20,7 @@ require('./server_links.inc.php');
* Displays the sub-page heading * Displays the sub-page heading
*/ */
echo '<h2>' . "\n" 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" . '' . $strCharsetsAndCollations . "\n"
. '</h2>' . "\n"; . '</h2>' . "\n";
@@ -77,10 +77,10 @@ foreach ($mysql_charsets as $current_charset) {
} }
$i++; $i++;
echo ' <tr>' . "\n" echo ' <tr>' . "\n"
. ' <td colspan="2" bgcolor="' . $cfg['ThBgcolor'] . '" align="right">' . "\n" . ' <th colspan="2" align="right">' . "\n"
. ' &nbsp;<b>' . htmlspecialchars($current_charset) . '</b>' . "\n" . ' &nbsp;<b>' . htmlspecialchars($current_charset) . '</b>' . "\n"
. (empty($mysql_charsets_descriptions[$current_charset]) ? '' : ' (<i>' . htmlspecialchars($mysql_charsets_descriptions[$current_charset]) . '</i>)&nbsp;' . "\n") . (empty($mysql_charsets_descriptions[$current_charset]) ? '' : ' (<i>' . htmlspecialchars($mysql_charsets_descriptions[$current_charset]) . '</i>)&nbsp;' . "\n")
. ' </td>' . "\n" . ' </th>' . "\n"
. ' </tr>' . "\n"; . ' </tr>' . "\n";
$useBgcolorOne = TRUE; $useBgcolorOne = TRUE;
foreach ($mysql_collations[$current_charset] as $current_collation) { foreach ($mysql_collations[$current_charset] as $current_collation) {

2
themes.php
View File

@@ -29,7 +29,7 @@ require('./libraries/header_meta_style.inc.php');
</script> </script>
</head> </head>
<body bgcolor="<?php echo $cfg['RightBgColor']; ?>"> <body>
<table border="0" align="center" cellpadding="3" cellspacing="1"> <table border="0" align="center" cellpadding="3" cellspacing="1">
<tr> <tr>
<th class="tblHeaders"><b>phpMyAdmin - <?php echo $strTheme; ?></b></th> <th class="tblHeaders"><b>phpMyAdmin - <?php echo $strTheme; ?></b></th>