From fee00e61aa505a83b097021e3f8e3c6f4dd37b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sch=C3=B6nberger?= Date: Sat, 28 Aug 2010 08:16:05 -0400 Subject: [PATCH 1/3] Patch #3050492, Cannot drag table box to the edge --- ChangeLog | 2 ++ js/functions.js | 1 + pdf_pages.php | 8 +++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a21d0fd5f..268298d66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ 3.3.7.0 (not yet released) +- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after + a page size increase, thanks to Martin Schönberger - mad05 3.3.6.0 (not yet released) - bug #3033063 [core] Navi gets wrong db name diff --git a/js/functions.js b/js/functions.js index 93cee6047..697c344be 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1385,6 +1385,7 @@ function refreshDragOption(e) { myid = getElement(e); if (myid.style.visibility == 'visible') { refreshLayout(); + TableDragInit(); } } diff --git a/pdf_pages.php b/pdf_pages.php index aff73850c..7b0d6a859 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -349,7 +349,7 @@ foreach ($array_sh_page AS $key => $temp_sh_page) { $drag_x = $temp_sh_page['x']; $drag_y = $temp_sh_page['y']; - $draginit .= ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n"; + $draginit2 = ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n"; $draginit .= ' getElement("table_' . $i . '").onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n"; $draginit .= ' getElement("table_' . $i . '").style.left = "' . $drag_x . 'px";' . "\n"; $draginit .= ' getElement("table_' . $i . '").style.top = "' . $drag_y . 'px";' . "\n"; @@ -385,6 +385,12 @@ function init() { refreshLayout(); myid = getElement('pdflayout'); + TableDragInit(); +} + +function TableDragInit() { + myid = getElement('pdflayout'); + } function resetDrag() { From 2e7f9b3cfacb49ba1f928f50e363c845af894575 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 28 Aug 2010 10:43:33 -0400 Subject: [PATCH 2/3] 3.3.6 release --- ChangeLog | 4 ++-- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81670e91e..24cc7577c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ -3.3.6.0 (not yet released) +3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name - bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. @@ -19,7 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3044189 [doc] Cleared documentation for hide_db. - bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php. -3.3.5.1 (2010-10-20) +3.3.5.1 (2010-08-20) - [core] Fixed various XSS issues, see PMASA-2010-5 for more details. 3.3.5.0 (2010-07-26) diff --git a/Documentation.html b/Documentation.html index 3ef61da61..7cacfdbb1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.3.6-rc1 - Documentation + phpMyAdmin 3.3.6 - Documentation @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 141934b92..8810ad147 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.6-rc1 - ----------------- + Version 3.3.6 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 2dab78ded..afd226ce6 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.6-rc1'); + $this->set('PMA_VERSION', '3.3.6'); /** * @deprecated */ diff --git a/translators.html b/translators.html index f4d3a4bab..c642c1152 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.3.6-rc1 - Official translators + phpMyAdmin 3.3.6 - Official translators @@ -19,7 +19,7 @@ From 23da6a6e1ababe74c9db0b781cb7c3d65c890814 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 28 Aug 2010 10:44:56 -0400 Subject: [PATCH 3/3] 3.3.6 release --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 268298d66..87a4ec158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -3.3.6.0 (not yet released) +3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name - bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. @@ -23,7 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3044189 [doc] Cleared documentation for hide_db. - bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php. -3.3.5.1 (2010-10-20) +3.3.5.1 (2010-08-20) - [core] Fixed various XSS issues, see PMASA-2010-5 for more details. 3.3.5.0 (2010-07-26)