Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

This commit is contained in:
Madhura Jayaratne
2011-03-10 23:25:35 +05:30
6 changed files with 17 additions and 9 deletions

View File

@@ -1005,10 +1005,14 @@ function PMA_changeClassForColumn($this_th, newclass) {
var th_index = $this_th.index(); var th_index = $this_th.index();
// .eq() is zero-based // .eq() is zero-based
th_index--; th_index--;
var $tr_with_data = $this_th.closest('table').find('tbody tr ').has('td.data'); var $tds = $this_th.closest('table').find('tbody tr').find('td.data:eq('+th_index+')');
$tr_with_data.each(function() { if ($this_th.data('has_class_'+newclass)) {
$(this).find('td.data:eq('+th_index+')').toggleClass(newclass); $tds.removeClass(newclass);
}); $this_th.data('has_class_'+newclass, false);
} else {
$tds.addClass(newclass);
$this_th.data('has_class_'+newclass, true);
}
} }
$(document).ready(function() { $(document).ready(function() {

View File

@@ -4,7 +4,7 @@
* navigation css file from theme Original * navigation css file from theme Original
* *
* @package phpMyAdmin-theme * @package phpMyAdmin-theme
* @subpackage Original * @subpackage pmahomme
*/ */
// unplanned execution path // unplanned execution path

View File

@@ -4,7 +4,7 @@
* print css file from theme Original * print css file from theme Original
* *
* @package phpMyAdmin-theme * @package phpMyAdmin-theme
* @subpackage Original * @subpackage pmahomme
*/ */
?> ?>
/* For printview */ /* For printview */

View File

@@ -4,7 +4,7 @@
* main css file from theme Original * main css file from theme Original
* *
* @package phpMyAdmin-theme * @package phpMyAdmin-theme
* @subpackage Original * @subpackage pmahomme
*/ */
// unplanned execution path // unplanned execution path
@@ -1593,6 +1593,10 @@ code.sql, div.sqlvalidate {
width: 98%; width: 98%;
} }
textarea#partitiondefinition {
height:3em;
}
/* for elements that should be revealed only via js */ /* for elements that should be revealed only via js */
.hide { .hide {
display: none; display: none;

View File

@@ -4,7 +4,7 @@
* Theme information * Theme information
* *
* @package phpMyAdmin-theme * @package phpMyAdmin-theme
* @subpackage Original * @subpackage pmahomme
*/ */
/** /**

View File

@@ -5,7 +5,7 @@
* for detailed layout configuration please refer to the css files * for detailed layout configuration please refer to the css files
* *
* @package phpMyAdmin-theme * @package phpMyAdmin-theme
* @subpackage Original * @subpackage pmahomme
*/ */
/** /**