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

Small design glitch with "in use" tables.

Browse Source
This commit is contained in:
Alexander M. Turek
2005-01-11 22:07:51 +00:00
parent ad677468e1
commit 8317bab79e
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -10,6 +10,7 @@ $Source$
- Removed redundant code; - Removed redundant code;
- Fixed some comments. - Fixed some comments.
* tbl_properties_structure.php: Corrected TH numbering. * tbl_properties_structure.php: Corrected TH numbering.
* db_details_structure.php: Small design glitch with "in use" tables.
2005-01-11 Marc Delisle <lem9@users.sourceforge.net> 2005-01-11 Marc Delisle <lem9@users.sourceforge.net>
* libraries/dbi/mysqli.dbi.lib.php: bug #1076213, headers sent * libraries/dbi/mysqli.dbi.lib.php: bug #1076213, headers sent

21
db_details_structure.php
View File

@@ -35,6 +35,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) {
// Display function // Display function
function pma_TableHeader($alternate = FALSE) { function pma_TableHeader($alternate = FALSE) {
$cnt = 0; // Let's count the columns...
echo ' <table border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="2" cellspacing="1">' . "\n" echo ' <table border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="2" cellspacing="1">' . "\n"
. ' <tr>' . "\n" . ' <tr>' . "\n"
. ' <td></td>' . "\n" . ' <td></td>' . "\n"
@@ -47,15 +48,18 @@ function pma_TableHeader($alternate = FALSE) {
. ' <th>' . "\n" . ' <th>' . "\n"
. ' &nbsp;' . $GLOBALS['strRecords'] . PMA_showHint($GLOBALS['strApproximateCount']) . '&nbsp;' . "\n" . ' &nbsp;' . $GLOBALS['strRecords'] . PMA_showHint($GLOBALS['strApproximateCount']) . '&nbsp;' . "\n"
. ' </th>' . "\n"; . ' </th>' . "\n";
$cnt += 4;
if (!$alternate) { if (!$alternate) {
if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) { if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
echo ' <th>' . "\n" echo ' <th>' . "\n"
. ' &nbsp;' . $GLOBALS['strType'] . '&nbsp;' . "\n" . ' &nbsp;' . $GLOBALS['strType'] . '&nbsp;' . "\n"
. ' </th>' . "\n"; . ' </th>' . "\n";
$cnt++;
if (PMA_MYSQL_INT_VERSION >= 40100) { if (PMA_MYSQL_INT_VERSION >= 40100) {
echo ' <th>' . "\n" echo ' <th>' . "\n"
. ' &nbsp;' . $GLOBALS['strCollation'] . '&nbsp;' . "\n" . ' &nbsp;' . $GLOBALS['strCollation'] . '&nbsp;' . "\n"
. ' </th>' . "\n"; . ' </th>' . "\n";
$cnt++;
} }
} }
if ($GLOBALS['cfg']['ShowStats']) { if ($GLOBALS['cfg']['ShowStats']) {
@@ -65,10 +69,12 @@ function pma_TableHeader($alternate = FALSE) {
. ' <th>' . "\n" . ' <th>' . "\n"
. ' &nbsp;' . $GLOBALS['strOverhead'] . '&nbsp;' . "\n" . ' &nbsp;' . $GLOBALS['strOverhead'] . '&nbsp;' . "\n"
. ' </th>' . "\n"; . ' </th>' . "\n";
$cnt += 2;
} }
echo "\n"; echo "\n";
} }
echo ' </tr>' . "\n"; echo ' </tr>' . "\n";
$GLOBALS['structure_tbl_col_cnt'] = $cnt;
} }
@@ -406,7 +412,7 @@ else {
} // end if } // end if
} else { } else {
?> ?>
<td colspan="4" align="center" bgcolor="<?php echo $bgcolor; ?>" <?php echo $click_mouse; ?>> <td colspan="<?php echo ($structure_tbl_col_cnt - 8) ?>" align="center" bgcolor="<?php echo $bgcolor; ?>" <?php echo $click_mouse; ?>>
<?php echo $strInUse . "\n"; ?> <?php echo $strInUse . "\n"; ?>
</td> </td>
<?php <?php
@@ -468,20 +474,9 @@ else {
$checkall_url = 'db_details_structure.php?' . PMA_generate_common_url($db); $checkall_url = 'db_details_structure.php?' . PMA_generate_common_url($db);
echo "\n"; echo "\n";
$basecolspan = 9;
if (!($cfg['PropertiesNumColumns'] > 1)) {
$basecolspan++;
if (PMA_MYSQL_INT_VERSION >= 40100) {
$basecolspan++;
}
}
if ($cfg['ShowStats']) {
$basecolspan += 2;
}
?> ?>
<tr> <tr>
<td colspan="<?php echo $basecolspan; ?>" valign="bottom"> <td colspan="<?php echo $structure_tbl_col_cnt; ?>" valign="bottom">
<img src="<?php echo $pmaThemeImage .'arrow_'.$text_dir.'.png'; ?>" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" /> <img src="<?php echo $pmaThemeImage .'arrow_'.$text_dir.'.png'; ?>" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" />
<a href="<?php echo $checkall_url; ?>&amp;checkall=1" onclick="setCheckboxes('tablesForm', true); return false;"> <a href="<?php echo $checkall_url; ?>&amp;checkall=1" onclick="setCheckboxes('tablesForm', true); return false;">
<?php echo $strCheckAll; ?></a> <?php echo $strCheckAll; ?></a>