From ac665a8945096f632313ca8c1116ddc103e173d2 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 12 Mar 2015 00:27:50 +0200 Subject: [PATCH 1/6] RFE #1617. Click back on the button closes the card. Signed-off-by: Dan Ungureanu --- js/console.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/console.js b/js/console.js index 28994df12f..489f71dc29 100644 --- a/js/console.js +++ b/js/console.js @@ -148,6 +148,9 @@ var PMA_console = { $('#pma_bookmarks .switch_button').click(function() { PMA_console.hideCard($(this).closest('.card')); }); + $('#pma_console_options .switch_button').click(function() { + PMA_console.hideCard($(this).closest('.card')); + }); $('#pma_console_options input[type=checkbox]').change(function() { PMA_console.updateConfig(); From 45fbe0bc2a092eb79010386e534a8f2eaa7a5779 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Thu, 12 Mar 2015 23:19:31 +0530 Subject: [PATCH 2/6] Fix bug#4797 Inline edit of DATETIME fields, can't change month nor time Signed-off-by: Atul Pratap Singh --- js/makegrid.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 6ec43bf73f..2bbfc6e9c1 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1029,10 +1029,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi //move ui-datepicker-div inside cEdit div var datepicker_div = $('#ui-datepicker-div'); datepicker_div.css({'top': 0, 'left': 0, 'position': 'relative'}); - $('.cEdit').append(datepicker_div); + $(g.cEdit).append(datepicker_div); var edit_area_top = $('#ui-datepicker-div').height()+32; - $('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'}); + $(g.cEdit).find('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'}); if (is_null){ $(g.cEdit).find('.edit_area').hide(); From 5b1eb0752f3b682fcb569f45ac1d82cfaf57c75e Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Fri, 13 Mar 2015 17:52:34 +0530 Subject: [PATCH 3/6] Remove unnecessary checkbox repositioning Signed-off-by: Atul Pratap Singh --- js/makegrid.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 2bbfc6e9c1..d676d50fb3 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1031,9 +1031,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi datepicker_div.css({'top': 0, 'left': 0, 'position': 'relative'}); $(g.cEdit).append(datepicker_div); - var edit_area_top = $('#ui-datepicker-div').height()+32; - $(g.cEdit).find('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'}); - if (is_null){ $(g.cEdit).find('.edit_area').hide(); } From 7934919b9edcc1e54aa204157a7f005b47a2e2e4 Mon Sep 17 00:00:00 2001 From: Andrea Vallorani Date: Fri, 13 Mar 2015 08:47:52 -0400 Subject: [PATCH 4/6] Bug #4786 SELECT width on relations page Signed-off-by: Andrea Vallorani andrea.vallorani@gmail.com --- themes/pmahomme/css/common.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index f0796b0f48..35fda394a0 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -539,7 +539,7 @@ fieldset .formelement { width: 25%; } #foreign_keys.relationalTable td:first-child + td select { - width: 32%; + width: auto; margin-right: 1%; } #foreign_keys.relationalTable { From 3f62197019975e7f0928b9724b6452a29899bbb0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 13 Mar 2015 08:49:36 -0400 Subject: [PATCH 5/6] Bug #4786: also fix the original theme Signed-off-by: Marc Delisle --- themes/original/css/common.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 6aff4b73ed..9a3e5a339f 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -255,7 +255,7 @@ fieldset .formelement { width: 25%; } #foreign_keys.relationalTable td:first-child + td select { - width: 32%; + width: auto; margin-right: 1%; } #foreign_keys.relationalTable { @@ -3095,4 +3095,4 @@ th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon { th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon { background-image: url(getImgPath('s_asc.png');?>); } -/* end of styles of sortable tables */ \ No newline at end of file +/* end of styles of sortable tables */ From 2f7d6cb323f97fad085680396a47b3f94c774ccc Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 13 Mar 2015 08:50:44 -0400 Subject: [PATCH 6/6] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 1ea2025419..c95557e788 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore - bug #4789 Views aren't dropped when copying a database - bug #4784 Incomplete bookmark saving +- bug #4786 SELECT width on relations page 4.3.11.1 (2015-03-04) - bug [security] Risk of BREACH attack, see PMASA-2015-1