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

bug 786710

Browse Source
This commit is contained in:
Marc Delisle
2003-08-15 17:28:12 +00:00
parent 2549eebf5a
commit 6f6abb039f
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-08-15 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties_structure.php3: bug 786710, IE and dropping fields
2003-08-15 Garvin Hicking <me@supergarv.de> 2003-08-15 Garvin Hicking <me@supergarv.de>
* tbl_properties_structure.php3: RFE #784900 (show alternate text for * tbl_properties_structure.php3: RFE #784900 (show alternate text for
multi-submit button) multi-submit button)

33
tbl_properties_structure.php3
View File

@@ -2,7 +2,6 @@
/* $Id$ */ /* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) { if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
include('./libraries/grab_globals.lib.php3'); include('./libraries/grab_globals.lib.php3');
} }
@@ -16,6 +15,15 @@ if (PMA_MYSQL_INT_VERSION >= 40100 && !defined('PMA_MYSQL_CHARSETS_LIB_INCLUDED'
/** /**
* Drop multiple fields if required * Drop multiple fields if required
*/ */
// workaround for IE problem:
if (isset($submit_mult_change_x)) {
$submit_mult = $strChange;
}
if (isset($submit_mult_drop_x)) {
$submit_mult = $strDrop;
}
if ((!empty($submit_mult) && isset($selected_fld)) if ((!empty($submit_mult) && isset($selected_fld))
|| isset($mult_btn)) { || isset($mult_btn)) {
$action = 'tbl_properties_structure.php3'; $action = 'tbl_properties_structure.php3';
@@ -73,7 +81,7 @@ $fields_cnt = mysql_num_rows($fields_rs);
<!-- TABLE INFORMATIONS --> <!-- TABLE INFORMATIONS -->
<form action="tbl_properties_structure.php3" name="fieldsForm"> <form method="post" action="tbl_properties_structure.php3" name="fieldsForm">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<table border="<?php echo $cfg['Border']; ?>"> <table border="<?php echo $cfg['Border']; ?>">
@@ -379,14 +387,23 @@ $checkall_url = 'tbl_properties_structure.php3?' . PMA_generate_common_url($db,$
if ($cfg['PropertiesIconic']) { if ($cfg['PropertiesIconic']) {
/* Opera has trouble with <input type="image"> */ /* Opera has trouble with <input type="image"> */
echo ' <button class="mult_submit" type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '">' . "\n" /* IE has trouble with <button> */
. ' <img src="./images/button_edit.png" title="' . $strChange . '" alt="' . $strChange . '" width="12" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n" if (PMA_USR_BROWSER_AGENT != 'IE') {
. ' </button>' . "\n"; echo ' <button class="mult_submit" type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '">' . "\n"
. ' <img src="./images/button_edit.png" title="' . $strChange . '" alt="' . $strChange . '" width="12" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n"
. ' </button>' . "\n";
} else {
echo ' <input type="image" name="submit_mult_change" value="' .$strChange . '" title="' . $strChange . '" src="./images/button_edit.png" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n";
}
// Drop button if there is at least two fields // Drop button if there is at least two fields
if ($fields_cnt > 1) { if ($fields_cnt > 1) {
echo ' <button class="mult_submit" type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '">' . "\n" if (PMA_USR_BROWSER_AGENT != 'IE') {
. ' <img src="./images/button_drop.png" title="' . $strDrop . '" alt="' . $strDrop . '" width="11" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n" echo ' <button class="mult_submit" type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '">' . "\n"
. ' </button>' . "\n"; . ' <img src="./images/button_drop.png" title="' . $strDrop . '" alt="' . $strDrop . '" width="11" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n"
. ' </button>' . "\n";
} else {
echo ' <input type="image" name="submit_mult_drop" value="' .$strDrop . '" title="' . $strDrop . '" src="./images/button_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n";
}
} }
} else { } else {
echo ' <input type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '" />' . "\n"; echo ' <input type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '" />' . "\n";