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

JavaScript errors, layout errors

Browse Source
This commit is contained in:
Sebastian Mendel
2005-10-13 10:43:35 +00:00
parent 7dd2e62d3d
commit efa10c4bb8
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
XHTML compl., NOTICE, Icons for Edit/Revoke Links XHTML compl., NOTICE, Icons for Edit/Revoke Links
* server_processlist.php, libraries/display_import.lib.php, * server_processlist.php, libraries/display_import.lib.php,
css/phpmyadmin.css.php: XHTML compl. css/phpmyadmin.css.php: XHTML compl.
* libraries/display_import.lib.php, css/phpmyadmin.css.php:
JavaScript errors, layout errors
2005-10-12 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-10-12 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* css/phpmyadmin.css.php, libraries/common.lib.php, * css/phpmyadmin.css.php, libraries/common.lib.php,

11
css/phpmyadmin.css.php
View File

@@ -181,6 +181,7 @@ div#queryboxcontainer div#bookmarkoptions {
margin-top: 0.5em; margin-top: 0.5em;
} }
fieldset .formelementrow,
fieldset .formelement { fieldset .formelement {
line-height: 2.4em; line-height: 2.4em;
float: left; float: left;
@@ -189,11 +190,14 @@ fieldset .formelement {
white-space: nowrap; white-space: nowrap;
} }
/* revert for Gecko */ /* revert for Gecko */
fieldset div[class=formelementrow],
fieldset div[class=formelement] { fieldset div[class=formelement] {
white-space: normal; white-space: normal;
} }
/* IE */ /* IE */
fieldset .formelementrow input,
fieldset .formelementrow select,
fieldset .formelement input, fieldset .formelement input,
fieldset .formelement select { fieldset .formelement select {
margin-top: 0.5em; margin-top: 0.5em;
@@ -201,6 +205,8 @@ fieldset .formelement select {
height: 1.3em; height: 1.3em;
} }
/* revert for Gecko */ /* revert for Gecko */
fieldset div[class=formelementrow] input,
fieldset div[class=formelementrow] select,
fieldset div[class=formelement] input, fieldset div[class=formelement] input,
fieldset div[class=formelement] select { fieldset div[class=formelement] select {
margin-top: auto; margin-top: auto;
@@ -208,6 +214,11 @@ fieldset div[class=formelement] select {
height: auto; height: auto;
} }
fieldset .formelementrow {
clear: left;
float: none;
}
/* end querybox */ /* end querybox */

32
libraries/display_import.lib.php
View File

@@ -77,10 +77,10 @@ echo ' <input type="hidden" name="import_type" value="' . $import_type . '" /
<?php <?php
foreach($import_list as $key => $val) { foreach($import_list as $key => $val) {
if (isset($val['options'])) { if (isset($val['options'])) {
echo 'getElement("' . $key . '_options").style.display = "none";'; echo 'document.getElementById("' . $key . '_options").style.display = "none";';
} }
}?> }?>
getElement("none_options").style.display = 'none'; document.getElementById("none_options").style.display = 'none';
} }
function init_options() { function init_options() {
@@ -89,15 +89,15 @@ echo ' <input type="hidden" name="import_type" value="' . $import_type . '" /
foreach($import_list as $key => $val) { foreach($import_list as $key => $val) {
echo 'if (document.getElementById("radio_import_' . $key . '").checked) {'; echo 'if (document.getElementById("radio_import_' . $key . '").checked) {';
if (isset($val['options'])) { if (isset($val['options'])) {
echo 'getElement("' . $key . '_options").style.display = "block";'; echo 'document.getElementById("' . $key . '_options").style.display = "block";';
} else { } else {
echo 'getElement("none_options").style.display = "block";'; echo 'document.getElementById("none_options").style.display = "block";';
} }
echo ' } else '; echo ' } else ';
} }
?> ?>
{ {
getElement('none_options').style.display = 'block'; document.getElementById('none_options').style.display = 'block';
} }
} }
@@ -127,6 +127,7 @@ foreach($import_list as $key => $val) {
<fieldset class="options"> <fieldset class="options">
<legend><?php echo $strFileToImport; ?></legend> <legend><?php echo $strFileToImport; ?></legend>
<div class="formelementrow">
<div class="formelement"> <div class="formelement">
<label for="input_import_file"><?php echo $strLocationTextfile; ?></label> <label for="input_import_file"><?php echo $strLocationTextfile; ?></label>
<input style="margin: 5px" type="file" name="import_file" id="input_import_file" onchange="match_file(this.value);" /> <input style="margin: 5px" type="file" name="import_file" id="input_import_file" onchange="match_file(this.value);" />
@@ -135,6 +136,7 @@ foreach($import_list as $key => $val) {
echo '<div class="formelement">' . "\n"; echo '<div class="formelement">' . "\n";
echo PMA_displayMaximumUploadSize($max_upload_size); echo PMA_displayMaximumUploadSize($max_upload_size);
echo '</div>' . "\n"; echo '</div>' . "\n";
echo '</div>' . "\n";
// some browsers should respect this :) // some browsers should respect this :)
echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n"; echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";
@@ -147,14 +149,14 @@ if (!empty($cfg['UploadDir'])) {
$matcher = '@\.(' . $extensions . ')(\.(' . PMA_supportedDecompressions() . '))?$@'; $matcher = '@\.(' . $extensions . ')(\.(' . PMA_supportedDecompressions() . '))?$@';
$files = PMA_getFileSelectOptions($cfg['UploadDir'], $matcher, (isset($timeout_passed) && $timeout_passed && isset($local_import_file)) ? $local_import_file : ''); $files = PMA_getFileSelectOptions($cfg['UploadDir'], $matcher, (isset($timeout_passed) && $timeout_passed && isset($local_import_file)) ? $local_import_file : '');
echo '<div class="formelement">' . "\n"; echo '<div class="formelementrow">' . "\n";
if ($files === FALSE) { if ($files === FALSE) {
echo ' <div style="margin-bottom: 5px">' . "\n"; echo ' <div class="warning">' . "\n";
echo ' <font color="red">' . $strError . '</font><br />' . "\n"; echo ' <strong>' . $strError . '</strong>: ' . "\n";
echo ' ' . $strWebServerUploadDirectoryError . "\n"; echo ' ' . $strWebServerUploadDirectoryError . "\n";
echo ' </div>' . "\n"; echo ' </div>' . "\n";
} elseif (!empty($files)) { } elseif (!empty($files)) {
echo "<br />\n"; echo "\n";
echo ' <i>' . $strOr . '</i><br/><label for="select_local_import_file">' . $strWebServerUploadDirectory . '</label>&nbsp;: ' . "\n"; echo ' <i>' . $strOr . '</i><br/><label for="select_local_import_file">' . $strWebServerUploadDirectory . '</label>&nbsp;: ' . "\n";
echo ' <select style="margin: 5px" size="1" name="local_import_file" onchange="match_file(this.value)" id="select_local_import_file">' . "\n"; echo ' <select style="margin: 5px" size="1" name="local_import_file" onchange="match_file(this.value)" id="select_local_import_file">' . "\n";
echo ' <option value=""></option>' . "\n"; echo ' <option value=""></option>' . "\n";
@@ -165,7 +167,7 @@ if (!empty($cfg['UploadDir'])) {
} // end if (web-server upload directory) } // end if (web-server upload directory)
// charset of file // charset of file
echo '<div class="formelement">' . "\n"; echo '<div class="formelementrow">' . "\n";
if (PMA_MYSQL_INT_VERSION < 40100 && $cfg['AllowAnywhereRecoding'] && $allow_recoding) { if (PMA_MYSQL_INT_VERSION < 40100 && $cfg['AllowAnywhereRecoding'] && $allow_recoding) {
echo '<label for="charset_of_file">' . $strCharsetOfFile . '</label>' . "\n"; echo '<label for="charset_of_file">' . $strCharsetOfFile . '</label>' . "\n";
$temp_charset = reset($cfg['AvailableCharsets']); $temp_charset = reset($cfg['AvailableCharsets']);
@@ -199,7 +201,7 @@ if ($cfg['ZipDump'] && @function_exists('gzinflate')) $compressions .= ', zip';
// We don't have show anything about compression, when no supported // We don't have show anything about compression, when no supported
if ($compressions != $strNone) { if ($compressions != $strNone) {
echo '<div class="formelement">' . "\n"; echo '<div class="formelementrow">' . "\n";
printf( $strCompressionWillBeDetected, $compressions); printf( $strCompressionWillBeDetected, $compressions);
echo '</div>' . "\n"; echo '</div>' . "\n";
} }
@@ -211,19 +213,19 @@ echo "\n";
<?php <?php
if (isset($timeout_passed) && $timeout_passed) { if (isset($timeout_passed) && $timeout_passed) {
echo '<div class="formelement">' . "\n"; echo '<div class="formelementrow">' . "\n";
echo '<input type="hidden" name="skip" value="' . $offset . '" />'; echo '<input type="hidden" name="skip" value="' . $offset . '" />';
echo sprintf($strTimeoutInfo, $offset) . ''; echo sprintf($strTimeoutInfo, $offset) . '';
echo '</div>' . "\n"; echo '</div>' . "\n";
} }
?> ?>
<div class="formelement"> <div class="formelementrow">
<input type="checkbox" name="allow_interrupt" value="yes" <input type="checkbox" name="allow_interrupt" value="yes"
id="checkbox_allow_interrupt" <?php echo PMA_importCheckboxCheck('allow_interrupt'); ?>/> id="checkbox_allow_interrupt" <?php echo PMA_importCheckboxCheck('allow_interrupt'); ?>/>
<label for="checkbox_allow_interrupt"><?php echo $strAllowInterrupt; ?></label><br /> <label for="checkbox_allow_interrupt"><?php echo $strAllowInterrupt; ?></label><br />
</div> </div>
<div class="formelement"> <div class="formelementrow">
<label for="text_skip_queries"><?php echo $strSkipQueries; ?></label> <label for="text_skip_queries"><?php echo $strSkipQueries; ?></label>
<input type="text" name="skip_queries" value="<?php echo PMA_importGetDefault('skip_queries');?>" id="text_skip_queries" /> <input type="text" name="skip_queries" value="<?php echo PMA_importGetDefault('skip_queries');?>" id="text_skip_queries" />
</div> </div>
@@ -237,7 +239,7 @@ echo "\n";
foreach($import_list as $key => $val) { foreach($import_list as $key => $val) {
?> ?>
<!-- <?php echo $key; ?> --> <!-- <?php echo $key; ?> -->
<input type="radio" name="what" value="<?php echo $key; ?>" id="radio_import_<?php echo $key; ?>" onclick="if(this.checked) { hide_them_all(); getElement('<?php echo isset($val['options']) ? $key : 'none';?>_options').style.display = 'block'; }; return true" <?php echo PMA_importIsActive('format', $key); ?>/> <input type="radio" name="what" value="<?php echo $key; ?>" id="radio_import_<?php echo $key; ?>" onclick="if(this.checked) { hide_them_all(); document.getElementById('<?php echo isset($val['options']) ? $key : 'none';?>_options').style.display = 'block'; }; return true" <?php echo PMA_importIsActive('format', $key); ?>/>
<label for="radio_import_<?php echo $key; ?>"><?php echo PMA_getString($val['text']); ?></label> <label for="radio_import_<?php echo $key; ?>"><?php echo PMA_getString($val['text']); ?></label>
<br /><br /> <br /><br />
<?php <?php