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

Let's get rid of some tables.

Browse Source
This commit is contained in:
Michal Čihař
2004-05-13 18:35:29 +00:00
parent ea63ab24c5
commit 9f07dee9a7
3 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -24,6 +24,7 @@ $Source$
anything, display DROP query on better place (bellow tabs).
* libraries/common.lib.php: Show refresh link only for SELECT and SHOW
queries.
* main.php, css/phpmyadmin.css.php: Let's get rid of some tables.
2004-05-12 Marc Delisle <lem9@users.sourceforge.net>
* db_details_structure.php: bug #951143, undefined $header_url_qry

21
css/phpmyadmin.css.php
View File

@@ -220,14 +220,23 @@ button.mult_submit {
border: 1px dashed #000000;
}
/* Warning showing div with right border and optional icon */
div.warning {
border: 1px solid red;
<?php if($cfg['ErrorIconic']) { ?>
background-image: url(../images/s_warn.png);
background-repeat: no-repeat;
background-position: 10px 50%;
padding: 10px 10px 10px 36px;
margin: 0px;
<?php } ?>
width: 90%;
}
/* some new styles added 20047-05-05 by Michael Keck (mkkeck) */
/* tables */
.tblWarning {
border: 1px solid #cc0000;
background-color: #ffffff;
width: 100%;
}
.tblError {
border: 1px solid #cc0000;
background-color: #ffffcc;
@@ -465,4 +474,4 @@ textarea {
.nospace {
margin: 0px;
padding: 0px;
}
}

35
main.php
View File

@@ -568,12 +568,7 @@ echo "\n";
* modified: 2004-05-05 mkkeck
*/
if ($display_pmaAbsoluteUri_warning) {
echo '<img src="images/spacer.png" width="1" height="5" border="0" />';
echo '<table class="tblWarning" border="0" cellpadding="2" cellspacing="0">'."\n";
echo '<tr>'."\n";
if($cfg['ErrorIconic']){ echo '<td valign="top" width="20"><img src="images/s_warn.png" border="0" align="left" hspace="2" vspace="2" alt="Warning" /></td>'; }
echo '<td class="warning">' . $strPmaUriError . '</td>' . "\n";
echo '</tr>'."\n".'</table>';
echo '<div class="warning">' . $strPmaUriError . '</div>' . "\n";
}
/**
@@ -583,12 +578,7 @@ if ($display_pmaAbsoluteUri_warning) {
if ($server != 0
&& $cfg['Server']['user'] == 'root'
&& $cfg['Server']['password'] == '') {
echo '<img src="images/spacer.png" width="1" height="5" border="0" />';
echo '<table class="tblWarning" border="0" cellpadding="2" cellspacing="0">'."\n";
echo '<tr>'."\n";
if($cfg['ErrorIconic']){ echo '<td valign="top" width="20"><img src="images/s_warn.png" border="0" align="left" hspace="2" vspace="2" alt="Warning" /></td>'; }
echo '<td class="warning">' . $strInsecureMySQL . '</td>' . "\n";
echo '</tr>'."\n".'</table>';
echo '<div class="warning">' . $strInsecureMySQL . '</div>' . "\n";
}
/**
@@ -597,12 +587,7 @@ if ($server != 0
*/
if (PMA_PHP_INT_VERSION == 40203 && @extension_loaded('mbstring')) {
echo '<img src="images/spacer.png" width="1" height="5" border="0" />';
echo '<table class="tblWarning" border="0" cellpadding="2" cellspacing="0">'."\n";
echo '<tr>'."\n";
if($cfg['ErrorIconic']){ echo '<td valign="top" width="20"><img src="images/s_warn.png" border="0" align="left" hspace="2" vspace="2" alt="Warning" /></td>'; }
echo '<td class="warning">' . $strPHP40203 . '</td>' . "\n";
echo '</tr>'."\n".'</table>';
echo '<div class="warning">' . $strPHP40203 . '</div>' . "\n";
}
/**
@@ -611,12 +596,7 @@ if (PMA_PHP_INT_VERSION == 40203 && @extension_loaded('mbstring')) {
*/
if (PMA_PHP_INT_VERSION < 40100) {
echo '<img src="images/spacer.png" width="1" height="5" border="0" />';
echo '<table class="tblWarning" border="0" cellpadding="2" cellspacing="0">'."\n";
echo '<tr>'."\n";
if($cfg['ErrorIconic']){ echo '<td valign="top" width="20"><img src="images/s_warn.png" border="0" align="left" hspace="2" vspace="2" alt="Warning" /></td>'; }
echo '<td class="warning">' . sprintf($strUpgrade, 'PHP', '4.1.0') . '</td>' . "\n";
echo '</tr>'."\n".'</table>';
echo '<div class="warning">' . sprintf($strUpgrade, 'PHP', '4.1.0') . '</div>' . "\n";
}
/**
@@ -625,12 +605,7 @@ if (PMA_PHP_INT_VERSION < 40100) {
*/
// not yet defined before the server choice
if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 32332) {
echo '<img src="images/spacer.png" width="1" height="5" border="0" />';
echo '<table class="tblWarning" border="0" cellpadding="2" cellspacing="0">'."\n";
echo '<tr>'."\n";
if($cfg['ErrorIconic']){ echo '<td valign="top" width="20"><img src="images/s_warn.png" border="0" align="left" hspace="2" vspace="2" alt="Warning" /></td>'; }
echo '<td class="warning">' . sprintf($strUpgrade, 'MySQL', '3.23.32') . '</td>' . "\n";
echo '</tr>'."\n".'</table>';
echo '<div class="warning">' . sprintf($strUpgrade, 'MySQL', '3.23.32') . '</div>' . "\n";
}
/**