Bug #942362 - Colspan off by one

This commit is contained in:
Garvin Hicking
2004-04-29 15:50:45 +00:00
parent 2bb3740852
commit 32c532d474
2 changed files with 18 additions and 3 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-04-29 Garvin Hicking <pma@supergarv.de>
* db_details_structure.php: Bug #942362 - Colspan off by one
2004-04-29 Marc Delisle <lem9@users.sourceforge.net> 2004-04-29 Marc Delisle <lem9@users.sourceforge.net>
* scripts/create-release.sh: keep only one previous version in cvs-prev * scripts/create-release.sh: keep only one previous version in cvs-prev
* lang/estonian: Updated, thanks to Alvar Soome (finsoft). * lang/estonian: Updated, thanks to Alvar Soome (finsoft).

View File

@@ -564,9 +564,21 @@ else {
// Check all tables url // Check all tables url
$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 (($cfg['ShowStats']) ? '11' : '10'); ?>" valign="bottom"> <td colspan="<?php echo $basecolspan; ?>" valign="bottom">
<img src="./images/arrow_<?php echo $text_dir; ?>.gif" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" /> <img src="./images/arrow_<?php echo $text_dir; ?>.gif" 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>