Merge branch 'colresize' into aris

This commit is contained in:
Aris Feryanto 2011-06-10 09:33:24 +07:00
commit 0ea798b794
2 changed files with 4 additions and 4 deletions

View File

@ -320,9 +320,9 @@
}
// enable or disable restore button
if (isInitial) {
$('#restore_column').hide();
$('.restore_column').hide();
} else {
$('#restore_column').show();
$('.restore_column').show();
}
}
}
@ -405,7 +405,7 @@
$(document).mouseup(function(e) {
g.dragEnd(e);
});
$('#restore_column').live('click', function() {
$('.restore_column').live('click', function() {
g.restore();
});

View File

@ -375,7 +375,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
} // end move toward
?>
<td>
<input id="restore_column" type="submit" value="Restore column order" />
<input class="restore_column" type="submit" value="Restore column order" />
<?php
// generate the column order, if it is set
$pmatable = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);