diff --git a/ChangeLog b/ChangeLog index ce18c8466..de0b8e64e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-07-09 Loïc Chapeaux + * header.inc.php3: cosmetic changes. + * tbl_properties.php3, db_details.php3, functions.js: export the js work + from the formers to the later. + * Updated the Spanish translation thanks to + Martin Marconcini . + 2001-07-10 Steve Alberty * tbl_properties.php3: add avg row size diff --git a/db_details.php3 b/db_details.php3 index e21ac67bb..55b4e37a2 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -232,6 +232,8 @@ echo "\n"; */ ?> + +
    0) { @@ -356,14 +358,14 @@ if ($num_tables > 0) {    - onclick="if (!document.forms['db_dump'].elements['asfile'].checked) document.forms['db_dump'].elements['gzip'].checked = false" /> + - () + () max) { + else if (val < min || val > max) { alert(val + errorMsg2); isFormElementInRange = false; theField.select(); @@ -36,5 +40,37 @@ function checkFormElementInRange(theForm, theFieldName, min, max ) else { theField.value = val; } + return true; } // end of the 'checkFormElementInRange()' function + + +/** + * Ensures the choice between 'transmit' and 'gzipped' checkboxes is consistant + * + * @param object the form + * @param string a code for the action that causes this function to be run + * + * @return boolean always true + */ +function checkTransmitDump(theForm, theAction) +{ + var formElts = theForm.elements; + + // 'gzipped' option has been checked/unchecked + if (theAction == 'gzip') { + if (formElts['gzip'].checked && !formElts['asfile'].checked) { + theForm.elements['asfile'].checked = true; + } + } + // 'transmit' option has been checked/unchecked + else if (theAction == 'transmit') { + if (!formElts['asfile'].checked + && (typeof(formElts['gzip']) != 'undefined' && formElts['gzip'].checked)) { + theForm.elements['gzip'].checked = false; + } + } + + return true; +} // end of the 'checkTransmitDump()' function + diff --git a/tbl_properties.php3 b/tbl_properties.php3 index 36dc323e8..d690b34c3 100755 --- a/tbl_properties.php3 +++ b/tbl_properties.php3 @@ -12,24 +12,27 @@ if (!isset($message)) { } unset($sql_query); -/* + +/** * Selects the db that will be used during this script execution */ mysql_select_db($db); -/* + +/** * Set parameters for links */ -$query="server=$server&lang=$lang&db=$db&table=$table&goto=tbl_properties.php3"; - +$query = "server=$server&lang=$lang&db=$db&table=$table&goto=tbl_properties.php3"; ?> - + +

    -&pos=0&"> - + &pos=0&"> +

    = 3) { $show_comment = $showtable['Comment']; ?> - +

    @@ -87,7 +90,6 @@ $result = mysql_query("SHOW FIELDS FROM $table") or mysql_die(); - @@ -109,8 +111,7 @@ echo "\n"; @@ -178,8 +179,8 @@ while ($row = mysql_fetch_array($result)) { ?>
     

    @@ -190,7 +191,7 @@ while ($row = mysql_fetch_array($result)) { * Displays indexes */ ?> - + 0) { ?> + +
    @@ -221,15 +224,9 @@ if ($index_count > 0) { echo "\n"; ?> - - - + + + @@ -249,7 +246,6 @@ if ($index_count > 0) { * Displays Space usage and row statistics */ ?> - 3 && $tbl_type != "INNODB" && isset($showtable)) { @@ -261,12 +257,14 @@ if (MYSQL_MAJOR_VERSION == "3.23" && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_typ } list($effect_size, $effect_unit) = format_byte_down($showtable['Data_length'] + $showtable['Index_length'] - $showtable['Data_free']); list($tot_size, $tot_unit) = format_byte_down($showtable['Data_length'] + $showtable['Index_length']); + list($avg_size, $avg_unit) = format_byte_down(($showtable['Data_length'] + $showtable['Index_length']) / $showtable['Rows']); // Displays them if ($index_count > 0) { echo ' ' . "\n"; } ?> + - - @@ -292,13 +288,11 @@ if (MYSQL_MAJOR_VERSION == "3.23" && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_typ if (!empty($showtable['Data_free'])) { echo "\n"; ?> - - @@ -308,18 +302,17 @@ if (MYSQL_MAJOR_VERSION == "3.23" && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_typ } echo "\n"; ?> - - 0) { + if (isset($showtable['Data_length']) && $showtable['Rows'] > 0) { echo (++$i%2) ? ' ' : ' '; @@ -395,10 +388,7 @@ if (MYSQL_MAJOR_VERSION == "3.23" && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_typ ?> + +
      @@ -588,14 +580,14 @@ echo "\n";   
    - - - - - - $strDrop\n"; ?>   @@ -276,13 +274,11 @@ if (MYSQL_MAJOR_VERSION == "3.23" && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_typ
    &pos=0&">[] @@ -387,7 +380,7 @@ if (MYSQL_MAJOR_VERSION == "3.23" && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_typ
    - +
    - onclick="if (!document.forms['tbl_dump'].elements['asfile'].checked) document.forms['tbl_dump'].elements['gzip'].checked = false" /> + - () + ()