- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1319-g1fb01bc
by Michal Čihař 02 Apr '10

02 Apr '10

The branch, master has been updated via 1fb01bc42068ddf020ee8695a33319bb6d8fbe6d (commit) via bb9897aa91efbc3d40018b0596d65c0e7d46a90d (commit) via 20b105ea4a0a73ac51d7eed1e47c06073a1c9ad6 (commit) via 57049283a6476fab59902cf9e5137687e2b2b818 (commit) via 9aa28b26d16ec7400772ed3e78d4913dfb1fd694 (commit) via 45f3c63ab35c785c640145d18b5f2f005c2bca30 (commit) via 60d01fd31df97f3d2785ed0cb40e2ae093f3b5cb (commit) via bba850a909443e771d8b732dbc0b2c44bc2d9662 (commit) via fee7f0fae0dfcf40c831dee60cc7bfbbd04f2652 (commit) via cfec2c13ff18604a222b0f348afb0795062789e5 (commit) via 5820c5b1ff403b5e98f303db4feaff254c1ba125 (commit) via 1ca0b6179f63fcf86a4d350111bf07cce53a01fa (commit) via 11e57e066a9f019e23dd0cdecd76d09f4dd17414 (commit) via c6713d93e36b3401dbb69fda4d17204dac7b30a6 (commit) via 18d7ab3d729a251059e27ccd80c9ec50d56fa0ae (commit) via d42783055798b059471b19f7e6e2fc721b8ac20d (commit) via e20a9408794046edb3a3e3887558be2efec82f0c (commit) via 0d763ab9bc3564b53f4e0ceca529c74a780491e5 (commit) via 713ed2ba7cc70828c0934529ff83f84949f08e55 (commit) via 8daf320790452056747f096cc8d5ae26e0456619 (commit) via 0fbacd3c494d13708cbe1aa265f8429ce337bdd6 (commit) from c9b86a7dfa0f5b334115a57fdfeaf2bbe23d1416 (commit) - Log ----------------------------------------------------------------- commit 1fb01bc42068ddf020ee8695a33319bb6d8fbe6d Merge: bb9897aa91efbc3d40018b0596d65c0e7d46a90d c9b86a7dfa0f5b334115a57fdfeaf2bbe23d1416 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:57:59 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit bb9897aa91efbc3d40018b0596d65c0e7d46a90d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:56:05 2010 +0200 Translation update done using Pootle. commit 20b105ea4a0a73ac51d7eed1e47c06073a1c9ad6 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:55:59 2010 +0200 Translation update done using Pootle. commit 57049283a6476fab59902cf9e5137687e2b2b818 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:55:47 2010 +0200 Translation update done using Pootle. commit 9aa28b26d16ec7400772ed3e78d4913dfb1fd694 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:55:18 2010 +0200 Translation update done using Pootle. commit 45f3c63ab35c785c640145d18b5f2f005c2bca30 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:55:05 2010 +0200 Translation update done using Pootle. commit 60d01fd31df97f3d2785ed0cb40e2ae093f3b5cb Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:54:52 2010 +0200 Translation update done using Pootle. commit bba850a909443e771d8b732dbc0b2c44bc2d9662 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:54:24 2010 +0200 Translation update done using Pootle. commit fee7f0fae0dfcf40c831dee60cc7bfbbd04f2652 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:54:14 2010 +0200 Translation update done using Pootle. commit cfec2c13ff18604a222b0f348afb0795062789e5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:54:05 2010 +0200 Translation update done using Pootle. commit 5820c5b1ff403b5e98f303db4feaff254c1ba125 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:53:52 2010 +0200 Translation update done using Pootle. commit 1ca0b6179f63fcf86a4d350111bf07cce53a01fa Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:53:40 2010 +0200 Translation update done using Pootle. commit 11e57e066a9f019e23dd0cdecd76d09f4dd17414 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:52:59 2010 +0200 Translation update done using Pootle. commit c6713d93e36b3401dbb69fda4d17204dac7b30a6 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:52:42 2010 +0200 Translation update done using Pootle. commit 18d7ab3d729a251059e27ccd80c9ec50d56fa0ae Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:52:36 2010 +0200 Translation update done using Pootle. commit d42783055798b059471b19f7e6e2fc721b8ac20d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:51:44 2010 +0200 Translation update done using Pootle. commit e20a9408794046edb3a3e3887558be2efec82f0c Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:50:58 2010 +0200 Translation update done using Pootle. commit 0d763ab9bc3564b53f4e0ceca529c74a780491e5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:49:56 2010 +0200 Translation update done using Pootle. commit 713ed2ba7cc70828c0934529ff83f84949f08e55 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:49:43 2010 +0200 Translation update done using Pootle. commit 8daf320790452056747f096cc8d5ae26e0456619 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:49:28 2010 +0200 Translation update done using Pootle. commit 0fbacd3c494d13708cbe1aa265f8429ce337bdd6 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 2 13:48:18 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/po/cs.po b/po/cs.po index 6dc29cc..a95cf23 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,13 +5,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-02 13:41+0200\n" -"PO-Revision-Date: 2010-04-01 15:34+0200\n" +"PO-Revision-Date: 2010-04-02 13:56+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.1\n" @@ -3506,6 +3506,8 @@ msgid "" "Now, add the following lines at the end of [mysqld] section in your my.cnf " "and please restart the MySQL server afterwards." msgstr "" +"Nyní, prosím, přidejte následující řádky na konec sekce [mysqld] ve vašem " +"souboru my.cnf a poté restartutje MySQL server." #: libraries/messages.inc.php:781 msgid "Add slave replication user" @@ -3518,7 +3520,7 @@ msgstr "Nadřízený server bych úspěšně změněn na %s" #: libraries/messages.inc.php:783 msgid "This server is configured as master in a replication process." -msgstr "" +msgstr "Tento server je v replikačním procesu nastavený jako nadřízený." #: libraries/messages.inc.php:784 msgid "Control slave:" @@ -3536,11 +3538,11 @@ msgstr "Nepodařilo se připojit k nadřízenému %s." #: libraries/messages.inc.php:787 msgid "Replicate all databases; Ignore:" -msgstr "" +msgstr "Replikovat všechny databáze s výjimkou::" #: libraries/messages.inc.php:788 msgid "Ignore all databases; Replicate:" -msgstr "" +msgstr "Nereplikovat databáze s výjimkou:" #: libraries/messages.inc.php:789 msgid "" @@ -3601,7 +3603,7 @@ msgstr "" #: libraries/messages.inc.php:800 msgid "Change or reconfigure master server" -msgstr "" +msgstr "Změnit nebo přenastavit nadřízený server" #: libraries/messages.inc.php:801 msgid "Slave configuration" @@ -6493,10 +6495,11 @@ msgstr "Databáze PMA" #: setup/lib/messages.inc.php:133 msgid "Tracking of changes made in database. Requires configured PMA database." msgstr "" +"Sledování změn provedených v databazí. Vyžaduje nastavenou databázi PMA." #: setup/lib/messages.inc.php:134 msgid "Changes tracking" -msgstr "" +msgstr "Sledování změn" #: setup/lib/messages.inc.php:135 msgid "Customization" @@ -7217,10 +7220,9 @@ msgstr "" "pma_table_pages[/kbd]" #: setup/lib/messages.inc.php:280 -#, fuzzy #| msgid "SQL query history table" msgid "SQL query tracking table" -msgstr "Tabulka pro historii SQL dotazů" +msgstr "Tabulka pro sledování SQL dotazů" #: setup/lib/messages.inc.php:281 msgid "Hostname where MySQL server is running" @@ -7314,6 +7316,8 @@ msgid "" "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types" "[/a] for an example" msgstr "" +"Příklad můžete nalézt na " +"[a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a]" #: setup/lib/messages.inc.php:301 msgid "Signon session name" @@ -7330,50 +7334,52 @@ msgid "" msgstr "" #: setup/lib/messages.inc.php:304 -#, fuzzy #| msgid "Automatic recovery mode" msgid "Automatically create versions" -msgstr "Automatický režim obnovy" +msgstr "Automaticky vytvářet verze" #: setup/lib/messages.inc.php:305 msgid "Defines the list of statements the auto-creation uses for new versions." msgstr "" #: setup/lib/messages.inc.php:306 -#, fuzzy #| msgid "Statements" msgid "Statements to track" -msgstr "Údaj" +msgstr "Sledované příkazy" #: setup/lib/messages.inc.php:307 msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." msgstr "" +"Jestli přidat příkaz DROP VIEW IF EXISTS jako první při vytváření pohledu." #: setup/lib/messages.inc.php:308 msgid "Add DROP VIEW" -msgstr "" +msgstr "Přidat DROP VIEW" #: setup/lib/messages.inc.php:309 msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." msgstr "" +"Jestli přidat příkaz DROP TABLE IF EXISTS jako první při vytváření tabulky." #: setup/lib/messages.inc.php:310 msgid "Add DROP TABLE" -msgstr "" +msgstr "Přidat DROP TABLE" #: setup/lib/messages.inc.php:311 msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." msgstr "" +"Jestli přidat příkaz DROP DATABASE IF EXISTS jako první při vytváření " +"databáze." #: setup/lib/messages.inc.php:312 msgid "Add DROP DATABASE" -msgstr "" +msgstr "Přidat DROP DATABASE" #: setup/lib/messages.inc.php:313 msgid "You should use SSL connections if your web server supports it" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1298-gc9b86a7
by Marc Delisle 02 Apr '10

02 Apr '10

The branch, master has been updated via c9b86a7dfa0f5b334115a57fdfeaf2bbe23d1416 (commit) via 7813d53ef6361ee0019f3a0e710b81c9183e7a0f (commit) from 8a754ce1d694a682d498cb50885efefc07681f0e (commit) - Log ----------------------------------------------------------------- commit c9b86a7dfa0f5b334115a57fdfeaf2bbe23d1416 Merge: 7813d53ef6361ee0019f3a0e710b81c9183e7a0f 8a754ce1d694a682d498cb50885efefc07681f0e Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 2 07:43:35 2010 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 7813d53ef6361ee0019f3a0e710b81c9183e7a0f Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 2 07:43:00 2010 -0400 remove Mootools for Synchronize ----------------------------------------------------------------------- Summary of changes: js/server_synchronize.js | 10 ++++++++++ server_synchronize.php | 34 +++++++++------------------------- 2 files changed, 19 insertions(+), 25 deletions(-) create mode 100644 js/server_synchronize.js diff --git a/js/server_synchronize.js b/js/server_synchronize.js new file mode 100644 index 0000000..e8e626b --- /dev/null +++ b/js/server_synchronize.js @@ -0,0 +1,10 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * for server_synchronize.php + * + */ +$(document).ready(function() { + $('.server_selector').change(function() { + $(this).parent().parent().parent().children('.toggler').toggle(); + }); +}); diff --git a/server_synchronize.php b/server_synchronize.php index ca5250c..c1c873b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -16,7 +16,7 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'mootools-more.js'; +$GLOBALS['js_include'][] = 'server_synchronize.js'; require_once './libraries/server_common.inc.php'; /** @@ -1124,37 +1124,37 @@ if (isset($_REQUEST['synchronize_db'])) { </tr> <tr class="odd"> <td colspan="2" style="text-align: center"> - <select name="' . $type . '_type" id="' . $type . '_type"> + <select name="' . $type . '_type" id="' . $type . '_type" class="server_selector"> <option value="rmt">' . $GLOBALS['strRemoteServer'] . '</option> <option value="cur">' . $GLOBALS['strCurrentServer'] . '</option> </select> </td> </tr> - <tr class="even" id="' . $type . 'tr1"> + <tr class="even toggler"> <td>' . $GLOBALS['strHost'] . '</td> <td><input type="text" name="' . $type . '_host" /></td> </tr> - <tr class="odd" id="' . $type . 'tr2"> + <tr class="odd toggler"> <td>' . $GLOBALS['strPort'] . '</td> <td><input type="text" name="' . $type . '_port" value="3306" maxlength="5" size="5" /></td> </tr> - <tr class="even" id="' . $type . 'tr3"> + <tr class="even toggler"> <td>' . $GLOBALS['strSocket'] . '</td> <td><input type="text" name="' . $type . '_socket" /></td> </tr> - <tr class="odd" id="'.$type.'tr4"> + <tr class="odd toggler"> <td>' . $GLOBALS['strUserName']. '</td> <td><input type="text" name="'. $type . '_username" /></td> </tr> - <tr class="even" id="' . $type . 'tr5"> + <tr class="even toggler"> <td>' . $GLOBALS['strPassword'] . '</td> <td><input type="password" name="' . $type . '_pass" /> </td> </tr> - <tr class="odd" id="' . $type . 'tr6"> + <tr class="odd toggler"> <td>' . $GLOBALS['strDatabase'] . '</td> <td><input type="text" name="' . $type . '_db" /></td> </tr> - <tr class="even" id="' . $type . 'tr7" style="display: none;"> + <tr class="even toggler" style="display: none;"> <td>' . $GLOBALS['strDatabase'] . '</td> <td>'; // these unset() do not complain if the elements do not exist @@ -1174,22 +1174,6 @@ if (isset($_REQUEST['synchronize_db'])) { } echo '</td> </tr> </table>'; - - // Add JS to show/hide rows based on the selection - PMA_js(''. - '$(\'' . $type . '_type\').addEvent(\'change\',function() {' . - ' if ($(\'' . $type . 'tr1\').getStyle(\'display\')=="none") {' . - ' for (var i=1; i<7; i++)' . - ' $(\'' . $type . 'tr\'+i).tween(\'display\', \'table-row\');' . - ' $(\'' . $type . 'tr7\').tween(\'display\', \'none\');' . - ' }' . - ' else {' . - ' for (var i=1; i<7; i++)'. - ' $(\'' . $type . 'tr\'+i).tween(\'display\', \'none\');' . - ' $(\'' . $type . 'tr7\').tween(\'display\', \'table-row\');'. - ' }' . - '});' - ); } unset ($types, $type); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1251-gc276639
by Michal Čihař 02 Apr '10

02 Apr '10

The branch, master has been updated via c27663917fadccbfb7f7613e5e95c8e0f30f5d3d (commit) via e049a44f5964ea4fbc6f447ab2808964b03c268d (commit) via 829a7d81469c64d7b01260738698f0a76b553493 (commit) via 0098927245c72015bd2f504147b9dfee250c6762 (commit) via 111ba5d79f95575dddc4178f7d9fc63321094406 (commit) via 4b79515d00f1cfe57cf92f2b6311f6644cced7e8 (commit) via 6f602b6777455a596f7bdd91511feefd4e5eab4a (commit) via 686f330dc9e07910db506d6472d9b162811b1c38 (commit) from 0805f5701eef84538f06d69a7802c6c2d9f4d7c6 (commit) - Log ----------------------------------------------------------------- commit c27663917fadccbfb7f7613e5e95c8e0f30f5d3d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:34:27 2010 +0200 Do not try to play with parent if there is none. commit e049a44f5964ea4fbc6f447ab2808964b03c268d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:33:12 2010 +0200 Move input event binding to separate js file. commit 829a7d81469c64d7b01260738698f0a76b553493 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:30:01 2010 +0200 Bind clear event in javascript. commit 0098927245c72015bd2f504147b9dfee250c6762 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:24:17 2010 +0200 Move inline CSS to themes. commit 111ba5d79f95575dddc4178f7d9fc63321094406 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:20:44 2010 +0200 Adjust CSS to display clear button over the input. commit 4b79515d00f1cfe57cf92f2b6311f6644cced7e8 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:14:45 2010 +0200 Separate function for clearing input. commit 6f602b6777455a596f7bdd91511feefd4e5eab4a Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:09:36 2010 +0200 Move unhiding code to js file. commit 686f330dc9e07910db506d6472d9b162811b1c38 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:05:24 2010 +0200 Wrap code a bit to make it more readable. No functional changes. ----------------------------------------------------------------------- Summary of changes: js/navigation.js | 23 +++++++++++++++++++++-- navigation.php | 7 ++++++- themes/darkblue_orange/css/theme_right.css.php | 19 +++++++++++++++++++ themes/original/css/theme_left.css.php | 18 ++++++++++++++++++ 4 files changed, 64 insertions(+), 3 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 1e038ab..2932105 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -88,7 +88,7 @@ function PMA_setFrameSize() { pma_navi_width = PMA_getCookie('pma_navi_width'); //alert('from cookie: ' + typeof(pma_navi_width) + ' : ' + pma_navi_width); - if (pma_navi_width != null) { + if (pma_navi_width != null && parent.document != document) { if (parent.text_dir == 'ltr') { parent.document.getElementById('mainFrameset').cols = pma_navi_width + ',*'; } else { @@ -171,4 +171,23 @@ function fast_filter(value){ } } document.getElementById('fast_filter').disabled=false; -} \ No newline at end of file +} + +/** + * Clears fast filter. + */ +function clear_fast_filter() { + var elm = jQuery('#NavFilter input'); + elm.val(''); + fast_filter(''); + elm.focus(); +} + +/* Performed on load */ +jQuery(document).ready(function(){ + /* Display filter */ + jQuery('#NavFilter').css('display', 'inline'); + jQuery('#clear_fast_filter').click(clear_fast_filter); + jQuery('#fast_filter').focus(function (evt) {evt.target.select();}); + jQuery('#fast_filter').keyup(function (evt) {fast_filter(evt.target.value);}); +}); diff --git a/navigation.php b/navigation.php index 82f7f95..5f544e7 100644 --- a/navigation.php +++ b/navigation.php @@ -315,7 +315,12 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { } echo '</a></p>'; if ($table_count) { - echo '<span id=\'NavFilter\' style="display:none;"><span onclick="document.getElementById(\'fast_filter\').value=\'\'; fast_filter(\'\');document.getElementById(\'fast_filter\').focus();" style="background:white;color:black;cursor:pointer;padding:2px;margin:0 0 0 -20px;position:relative;float:right;" title="' . $strReset . '">X</span><input type="text" name="fast_filter" id="fast_filter" title="' . $strNavTableFilter . '" onkeyup="setTimeout(function(word){ return function(){ fast_filter(word);}}(this.value),1000);" style="width:90%;padding:0 -20px 0 0; padding:2px;" onfocus="this.select();" /></span><script type="text/javascript">document.getElementById(\'NavFilter\').style.display=\'\';</script>'; + ?> + <span id="NavFilter"> + <input type="text" name="fast_filter" id="fast_filter" title="<?php echo $strNavTableFilter; ?>" /> + <span id="clear_fast_filter" title="<?php echo $strReset; ?>">X</span> + </span> + <?php } /** diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index 72420e3..0a59056 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -1265,3 +1265,22 @@ table#serverconnection_src_local, table#serverconnection_trg_local { float:left; } + +#NavFilter { + display: none; +} + +#clear_fast_filter { + background: white; + color: black; + cursor: pointer; + padding: 0; + margin: 0; + position: relative; + right: 3ex; +} + +#fast_filter { + width: 90%; + padding: 0.1em; +} diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 2ffd388..ab794f5 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -232,3 +232,21 @@ div#left_tableList ul ul { padding: 1em; } +#NavFilter { + display: none; +} + +#clear_fast_filter { + background: white; + color: black; + cursor: pointer; + padding: 0; + margin: 0; + position: relative; + right: 3ex; +} + +#fast_filter { + width: 90%; + padding: 0.1em; +} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1243-g0805f57
by Michal Čihař 02 Apr '10

02 Apr '10

The branch, master has been updated via 0805f5701eef84538f06d69a7802c6c2d9f4d7c6 (commit) from a164ce48e564634a3d576df9ba43199f1ccfff5a (commit) - Log ----------------------------------------------------------------- commit 0805f5701eef84538f06d69a7802c6c2d9f4d7c6 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 13:00:45 2010 +0200 Do all javascript updating after loading document. ----------------------------------------------------------------------- Summary of changes: libraries/footer.inc.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 7f7f344..deacb53 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -100,6 +100,7 @@ if (! empty($_SESSION['debug'])) { <?php if (empty($GLOBALS['error_message'])) { ?> +jQuery(document).ready(function(){ // updates current settings if (window.parent.setAll) { window.parent.setAll('<?php @@ -154,6 +155,7 @@ if (window.parent.frame_content) { //window.parent.frame_content.setAttribute('name', 'frame_content'); //window.parent.frame_content.setAttribute('id', 'frame_content'); } +}); //]]> </script> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1242-ga164ce4
by Michal Čihař 02 Apr '10

02 Apr '10

The branch, master has been updated via a164ce48e564634a3d576df9ba43199f1ccfff5a (commit) from 764a808e1a919acb511b651a4e72d8da06783cd6 (commit) - Log ----------------------------------------------------------------- commit a164ce48e564634a3d576df9ba43199f1ccfff5a Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 11:52:25 2010 +0200 Fix error handling for language from cookie. ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 4c16df7..9f026de 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -68,9 +68,9 @@ function PMA_langCheck() if (! empty($_COOKIE['pma_lang'])) { if (PMA_langSet($_COOKIE['pma_lang'])) { return true; - } elseif (!is_string($_COOKIE['lang'])) { + } elseif (!is_string($_COOKIE['pma_lang'])) { /* Faked request, don't care on localisation */ - $GLOBALS['lang_failed_request'] = 'Yes'; + $GLOBALS['lang_failed_cookie'] = 'Yes'; } else { $GLOBALS['lang_failed_cookie'] = $_COOKIE['pma_lang']; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1241-g764a808
by Michal Čihař 02 Apr '10

02 Apr '10

The branch, master has been updated via 764a808e1a919acb511b651a4e72d8da06783cd6 (commit) from 4086ce69da2ad301caad8fd2501f8d649b09be1b (commit) - Log ----------------------------------------------------------------- commit 764a808e1a919acb511b651a4e72d8da06783cd6 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 10:13:08 2010 +0200 Add changelog entry for recent fixes. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1db24c3..d7976e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ $Id$ thanks to GreenRover - greenrover - [core] Provide way for vendors to easily change paths to config files. + patch #2979922, rfe #2804874 [interface] Add inline query editing, thanks to Muhammd Adnan. +- bug #2966752 [setup] Allow to configure changes tracking in setup script. 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1233-gc9465ae
by Michal Čihař 02 Apr '10

02 Apr '10

The branch, master has been updated via c9465ae77cfc79d482cb5ad4a2e138bc39c42e2c (commit) via d31133e60954de2513e1e720532d8709235d0b90 (commit) via b86f3c01f26d221fd010029dd02b331a477b76b3 (commit) via b4eac4ea1bec5027fb409340b6cd9f5bfa84aff4 (commit) from 7d106d4aa3ea4139f2621b517436689f4366f30a (commit) - Log ----------------------------------------------------------------- commit c9465ae77cfc79d482cb5ad4a2e138bc39c42e2c Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 08:51:23 2010 +0200 Remove not used code paths. commit d31133e60954de2513e1e720532d8709235d0b90 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 08:50:51 2010 +0200 Whitespace cleanup. commit b86f3c01f26d221fd010029dd02b331a477b76b3 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 08:42:16 2010 +0200 Merge single function for replication into other js. Separate js file with single function will only worse loading times. commit b4eac4ea1bec5027fb409340b6cd9f5bfa84aff4 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 08:38:48 2010 +0200 Add missing jQuery include. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 50 +++++++++++++++++++++++++++++------------------ js/mootools_common.js | 15 -------------- navigation.php | 1 + server_replication.php | 1 - 4 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 js/mootools_common.js diff --git a/js/functions.js b/js/functions.js index 045e55a..8dea75d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -576,26 +576,23 @@ function validateConnection(form_name, form_obj) { // All the text fields are checked excluding the port field because the default port can be used. if ((form_name.elements[i].type == 'text') && (form_name.elements[i].name != 'src_port') && (form_name.elements[i].name != 'trg_port')) { - check = true; check = emptyFormElements(form_obj, form_name.elements[i].name); - - if (check==false) { - element = form_name.elements[i].name; - if (form_name.elements[i].name == 'src_host') { - src_hostfilled = false; - continue; - } - if (form_name.elements[i].name == 'trg_host') { - trg_hostfilled = false; - continue; - } - if ((form_name.elements[i].name == 'src_socket' && src_hostfilled==false) || (form_name.elements[i].name == 'trg_socket' && trg_hostfilled==false)) - break; - else - continue; - break; - } - } + if (check==false) { + element = form_name.elements[i].name; + if (form_name.elements[i].name == 'src_host') { + src_hostfilled = false; + continue; + } + if (form_name.elements[i].name == 'trg_host') { + trg_hostfilled = false; + continue; + } + if ((form_name.elements[i].name == 'src_socket' && src_hostfilled==false) || (form_name.elements[i].name == 'trg_socket' && trg_hostfilled==false)) + break; + else + continue; + } + } } if (!check) { form_obj.reset(); @@ -1678,3 +1675,18 @@ $(document).ready(function(){ $(".sql").html("<span class=\"syntax\">"+$oldText+"</span>"); }); }); + +/** + * Used for replication support + * + * @version $Id$ + */ + +function divShowHideFunc(ahref, id) { + $(ahref).addEvent('click', function() { + if ($(id).getStyle('display')=="none") + $(id).tween('display', 'block'); + else + $(id).tween('display', 'none'); + }); +} diff --git a/js/mootools_common.js b/js/mootools_common.js deleted file mode 100644 index 8de3bdb..0000000 --- a/js/mootools_common.js +++ /dev/null @@ -1,15 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * Used for replication support - * - * @version $Id$ - */ - -function divShowHideFunc(ahref, id) { - $(ahref).addEvent('click', function() { - if ($(id).getStyle('display')=="none") - $(id).tween('display', 'block'); - else - $(id).tween('display', 'none'); - }); -} diff --git a/navigation.php b/navigation.php index 8fcc7ab..82f7f95 100644 --- a/navigation.php +++ b/navigation.php @@ -151,6 +151,7 @@ require_once './libraries/header_http.inc.php'; <base target="frame_content" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> + <script src="./js/jquery/jquery-1.4.2-min.js" type="text/javascript"></script> <script type="text/javascript" src="js/navigation.js"></script> <script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript"> diff --git a/server_replication.php b/server_replication.php index 5dd4212..7397d76 100644 --- a/server_replication.php +++ b/server_replication.php @@ -17,7 +17,6 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; -$GLOBALS['js_include'][] = 'mootools_common.js'; require './libraries/server_common.inc.php'; require './libraries/replication.inc.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1229-g7d106d4
by Marc Delisle 01 Apr '10

01 Apr '10

The branch, master has been updated via 7d106d4aa3ea4139f2621b517436689f4366f30a (commit) from 20a402ba29776f2ed1ba3122e48df98bfc11cafe (commit) - Log ----------------------------------------------------------------- commit 7d106d4aa3ea4139f2621b517436689f4366f30a Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 1 16:30:59 2010 -0400 missing jQuery on login page (needed by update-location.js ----------------------------------------------------------------------- Summary of changes: libraries/auth/cookie.auth.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index ab5bae7..8c85922 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -184,7 +184,7 @@ function PMA_auth() $page_title = 'phpMyAdmin '; require './libraries/header_meta_style.inc.php'; ?> -<script src="./js/mootools.js" type="text/javascript"></script> +<script src="./js/jquery/jquery-1.4.2-min.js" type="text/javascript"></script> <script src="./js/update-location.js" type="text/javascript"></script> <script type="text/javascript"> //<![CDATA[ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1228-g20a402b
by Dieter Adriaenssens 01 Apr '10

01 Apr '10

The branch, master has been updated via 20a402ba29776f2ed1ba3122e48df98bfc11cafe (commit) via 366d50a79b53c827926f97e14ee2f6937f161909 (commit) from 7a23444873b8a41fb379204236d27368a5427def (commit) - Log ----------------------------------------------------------------- commit 20a402ba29776f2ed1ba3122e48df98bfc11cafe Merge: 7a23444873b8a41fb379204236d27368a5427def 366d50a79b53c827926f97e14ee2f6937f161909 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Apr 1 21:07:09 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_status.php | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0655ba..1db24c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ $Id$ - patch #2979234 [import] Create tables with current charset and collation. - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. - bug #2973280 [export] Proper handling of temporary directory in XLS export. +- bug #2980582 [interface] Properly format server status parameter. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/server_status.php b/server_status.php index ec6083a..a6d63bd 100644 --- a/server_status.php +++ b/server_status.php @@ -143,6 +143,10 @@ if (isset($server_status['Threads_created']) * 100; } +// Format Uptime_since_flush_status : show as days, hours, minutes, seconds +if (isset($server_status['Uptime_since_flush_status'])) { + $server_status['Uptime_since_flush_status'] = PMA_timespanFormat($server_status['Uptime_since_flush_status']); +} /** * define some alerts hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-87-g366d50a
by Dieter Adriaenssens 01 Apr '10

01 Apr '10

The branch, QA_3_3 has been updated via 366d50a79b53c827926f97e14ee2f6937f161909 (commit) from acb30d5a2ae4d4235f95fe1087065c5562ae194f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_status.php | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61e090d..c02f8c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #2979234 [import] Create tables with current charset and collation. - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. - bug #2973280 [export] Proper handling of temporary directory in XLS export. +- bug #2980582 [interface] Properly format server status parameter. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/server_status.php b/server_status.php index 64048b3..9c8fe01 100644 --- a/server_status.php +++ b/server_status.php @@ -143,6 +143,10 @@ if (isset($server_status['Threads_created']) * 100; } +// Format Uptime_since_flush_status : show as days, hours, minutes, seconds +if (isset($server_status['Uptime_since_flush_status'])) { + $server_status['Uptime_since_flush_status'] = PMA_timespanFormat($server_status['Uptime_since_flush_status']); +} /** * define some alerts hooks/post-receive -- phpMyAdmin

1 0