diff --git a/ChangeLog b/ChangeLog index ff4f0ae795..4df55e5fd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,8 @@ phpMyAdmin - ChangeLog + Display direction (horizontal/vertical) no longer displayed by default + Shift/click support in database Structure + Show/hide column in table Browse +- bug #3353856 [AJAX] AJAX dialogs use wrong font-size +- bug #3354356 [interface] Timepicker does not work in AJAX dialogs 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/js/db_routines.js b/js/db_routines.js index 95254ca064..ceb09626dd 100644 --- a/js/db_routines.js +++ b/js/db_routines.js @@ -308,7 +308,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - $ajaxDialog = $('
'+data.message+'
').dialog({ + $ajaxDialog = $('
'+data.message+'
').dialog({ width: 700, // TODO: make a better decision about the size height: 550, // of the dialog based on the size of the viewport buttons: button_options, @@ -529,7 +529,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - $ajaxDialog = $('
'+data.message+'
').dialog({ + $ajaxDialog = $('
'+data.message+'
').dialog({ width: 650, // TODO: make a better decision about the size // of the dialog based on the size of the viewport buttons: button_options, diff --git a/js/functions.js b/js/functions.js index e25ec982ea..9cdb44e751 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2445,7 +2445,7 @@ $(document).ready(function() { /** * Display the dialog to the user */ - var $ajaxDialog = $('
'+data.message+'
').dialog({ + var $ajaxDialog = $('
'+data.message+'
').dialog({ width: 500, buttons: button_options, title: data.title diff --git a/js/makegrid.js b/js/makegrid.js index 8b1bd7cd0d..11bfa09f17 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -215,6 +215,7 @@ $cb.css('left', $this.position().left + $this.outerWidth(true)) .show(); } + $(this.cRsz).css('height', $(this.t).height()); }, /** diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index f844bbc90b..bfb60818fa 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -142,7 +142,7 @@ class PMA_RecentTable $html = ''; if (count($this->tables)) { foreach ($this->tables as $table) { - $html .= ''; + $html .= ''; } } else { $html .= ''; @@ -158,7 +158,7 @@ class PMA_RecentTable public function getHtmlSelect() { $html = ''; + htmlspecialchars($GLOBALS['cfg']['LeftDefaultTabTable']) . '" />'; $html .= ''; diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 5e5c533da4..e78b653081 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -48,4 +48,11 @@ if ($GLOBALS['text_dir'] == 'ltr') { + + + diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css new file mode 100644 index 0000000000..2835781529 --- /dev/null +++ b/themes/original/jquery/jquery-ui-1.8.override.css @@ -0,0 +1,8 @@ +/** + * Use this file to override styles set by jquery-ui-1.8.custom.css + */ + +/* Component containers +----------------------------------*/ +.ui-widget { font-size: 1em; } +#ui-timepicker-div { z-index: 1003; } diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css new file mode 100644 index 0000000000..2835781529 --- /dev/null +++ b/themes/pmahomme/jquery/jquery-ui-1.8.override.css @@ -0,0 +1,8 @@ +/** + * Use this file to override styles set by jquery-ui-1.8.custom.css + */ + +/* Component containers +----------------------------------*/ +.ui-widget { font-size: 1em; } +#ui-timepicker-div { z-index: 1003; }