Git February 2011

git@phpmyadmin.net

5 participants
230 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1683-g98df129

by Marc Delisle

The branch, master has been updated via 98df129296c83ebe51e7c484c7d57ee31f19e115 (commit) from 5e5f23e5448a7393d354e7f3bc3ca9a6eeb05f43 (commit) - Log ----------------------------------------------------------------- commit 98df129296c83ebe51e7c484c7d57ee31f19e115 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 5 15:58:04 2011 -0500 Avoid notices for undefined indexes ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 2d4bcd8..d77ae86 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -377,6 +377,8 @@ foreach ($rows as $row_id => $vrow) { if (stripos($table_fields[$i]['Type'], 'binary') === 0 || stripos($table_fields[$i]['Type'], 'varbinary') === 0) { $table_fields[$i]['is_binary'] = stristr($table_fields[$i]['Type'], 'binary'); + } else { + $table_fields[$i]['is_binary'] = false; } // If check to ensure types such as "enum('one','two','blob',..)" or @@ -386,6 +388,8 @@ foreach ($rows as $row_id => $vrow) { || stripos($table_fields[$i]['Type'], 'mediumblob') === 0 || stripos($table_fields[$i]['Type'], 'longblob') === 0) { $table_fields[$i]['is_blob'] = stristr($table_fields[$i]['Type'], 'blob'); + } else { + $table_fields[$i]['is_blob'] = false; } // If check to ensure types such as "enum('one','two','char',..)" or @@ -393,6 +397,8 @@ foreach ($rows as $row_id => $vrow) { if (stripos($table_fields[$i]['Type'], 'char') === 0 || stripos($table_fields[$i]['Type'], 'varchar') === 0) { $table_fields[$i]['is_char'] = stristr($table_fields[$i]['Type'], 'char'); + } else { + $table_fields[$i]['is_char'] = false; } $table_fields[$i]['first_timestamp'] = false; hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1682-g5e5f23e

by Michal Čihař

The branch, master has been updated via 5e5f23e5448a7393d354e7f3bc3ca9a6eeb05f43 (commit) via 2548081704638370552d1e151a91d7c858d85536 (commit) via e328967425ca2c9a9cd47d1f7d9ac175b70c8290 (commit) via e9662d8a3058b8426415ba9ba360dafa4cc5b19a (commit) via a81caafd77ba8219b487bf46f8549b0045acfc5b (commit) via 32e31eba4e23b296da0b147a6da7348e591116d9 (commit) via a9dfef6f943257d2c53a42c6cc28a7b7046fe128 (commit) via 9140598f508802ce89ea0e843b948f0cea6f6cc6 (commit) via d0d1e175b0bc60160fec48f232b36614f31fb3b3 (commit) via 176e96b6589eccc2d7e7e31f745db02e146259f9 (commit) via 8553c0a554e5ed2a24be0ee11774bd95acbc259c (commit) via d283a2b77aeeb7aa2113e1c1468c5008e650a7c7 (commit) via e0be4248a8b08e0d057ff80e5c690f51d6414a2e (commit) via 959cefc1ea0446898646e097046b294796329731 (commit) via 30feae589d1c9a571f70ac3c0c83d9ed6d65ee5a (commit) via 8b3ef273537020f2305017622c9792084f1372a9 (commit) via e6838bc2778efb159c8402ec98bd6937c5cc448d (commit) via 3268c033087d60f587103633bcce7758b38feb1a (commit) via 4be0b2ac8f62a62dbbb9a781ffbb9c215880fa28 (commit) via d1795320b28b033b5e673d2030482819c5683766 (commit) via bd59630555de135ff57c6a92a65e621a9bf03d07 (commit) via 2798e515994045c1b97cc8edfd9192d1d9356285 (commit) via 0a66682c10f71498019804faad834a3155bfd9f3 (commit) via 255d9c56667cd54ed76d3b569779e834fb302e6b (commit) via 7bfa81b752de1276e4a384d8e91441094a8f16c6 (commit) via 9cdf01bf60ab703335bf3889310eee999e231265 (commit) via cb56859e3d0752a1b2f7bb5f13bd8dd9403f09ae (commit) via a6d18a7c49240e2202275a9350c75f34eb7ee9de (commit) via da9cad48cf81716395e97bb084d0e700d15dfd68 (commit) via 4200395b70fea014c82d90115cb9949b8cbebb3d (commit) via 927aabcd935979fb73dc2b04e84df75fd8414c4c (commit) via 5b844e663925ede4b60cbb3955b286320556fd6c (commit) via dfa77fb095c06fdb28c4f2e084e75d4ecebd503f (commit) via 81b09ac521830f80aec9319297255bba42e0a982 (commit) via 1e8599f666b2d6ac5304da746c6cdb55e6492160 (commit) via 2875e84e18c21e8c058550bad9a417e67c41592e (commit) via 7287f8933bcb13a985c18d81cf7d16c2f729cb90 (commit) via 5650f76a31b2a0c1dadfd84f8d1205bb10bc6695 (commit) via 424b97cb14f63e4e539564b9e3c8cb4b926e5fca (commit) via 0ef33f24e72dfcc730b15bbcad0fd594e1418378 (commit) via 1ee87d03345fd2b4ee9baf148568d8b8728e4fa1 (commit) via 4b31bea2f4ce4e7cf42b64f9a0f23fc972cb3c6c (commit) via a879a77fc9be598f84445dd2ce2b67efdd4ca2f3 (commit) via 8f12b2059df22122051a9510a00b201c7ff85395 (commit) via a644b826dbce3c8fad428aa7de5f0f93c5e0b9e2 (commit) via 87c17d22f7c3772e09deaad45919348b10d7743d (commit) via 5b6e5cb9734af51d40a01126a2875b78dd72ed79 (commit) via fabb5a186d339fd282adca4f21c1a6fc5166660b (commit) via 5994fc116534fad44edc78138a5e2f5dd6d44ec2 (commit) via 1fd0585fcc89046046c21506c17e6cc50e3985de (commit) via 74dcfb4d0db6b5598462e1bf44a7be27ace53f58 (commit) via 7b9261478796590272ddc58e0bf726e466bebffc (commit) via e857ccb7e4407bd4a1e6083dfb005a00acacb72b (commit) from 9443d6efc2359ba104714fc8d29a4ab2f2ac0447 (commit) - Log ----------------------------------------------------------------- commit 5e5f23e5448a7393d354e7f3bc3ca9a6eeb05f43 Merge: 2548081704638370552d1e151a91d7c858d85536 9443d6efc2359ba104714fc8d29a4ab2f2ac0447 Author: Pootle server <pootle(a)cihar.com> Date: Sat Feb 5 14:40:24 2011 +0100 Merge remote branch 'origin/master' commit 2548081704638370552d1e151a91d7c858d85536 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:27:22 2011 +0200 Translation update done using Pootle. commit e328967425ca2c9a9cd47d1f7d9ac175b70c8290 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:26:20 2011 +0200 Translation update done using Pootle. commit e9662d8a3058b8426415ba9ba360dafa4cc5b19a Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:25:55 2011 +0200 Translation update done using Pootle. commit a81caafd77ba8219b487bf46f8549b0045acfc5b Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:25:37 2011 +0200 Translation update done using Pootle. commit 32e31eba4e23b296da0b147a6da7348e591116d9 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:25:31 2011 +0200 Translation update done using Pootle. commit a9dfef6f943257d2c53a42c6cc28a7b7046fe128 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:25:17 2011 +0200 Translation update done using Pootle. commit 9140598f508802ce89ea0e843b948f0cea6f6cc6 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:24:57 2011 +0200 Translation update done using Pootle. commit d0d1e175b0bc60160fec48f232b36614f31fb3b3 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:24:24 2011 +0200 Translation update done using Pootle. commit 176e96b6589eccc2d7e7e31f745db02e146259f9 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:24:09 2011 +0200 Translation update done using Pootle. commit 8553c0a554e5ed2a24be0ee11774bd95acbc259c Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:24:00 2011 +0200 Translation update done using Pootle. commit d283a2b77aeeb7aa2113e1c1468c5008e650a7c7 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:23:56 2011 +0200 Translation update done using Pootle. commit e0be4248a8b08e0d057ff80e5c690f51d6414a2e Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:23:32 2011 +0200 Translation update done using Pootle. commit 959cefc1ea0446898646e097046b294796329731 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:23:28 2011 +0200 Translation update done using Pootle. commit 30feae589d1c9a571f70ac3c0c83d9ed6d65ee5a Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:23:11 2011 +0200 Translation update done using Pootle. commit 8b3ef273537020f2305017622c9792084f1372a9 Author: Domen <dbc334(a)gmail.com> Date: Sat Feb 5 02:22:59 2011 +0200 Translation update done using Pootle. commit e6838bc2778efb159c8402ec98bd6937c5cc448d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:50:12 2011 +0200 Translation update done using Pootle. commit 3268c033087d60f587103633bcce7758b38feb1a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:49:43 2011 +0200 Translation update done using Pootle. commit 4be0b2ac8f62a62dbbb9a781ffbb9c215880fa28 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:47:32 2011 +0200 Translation update done using Pootle. commit d1795320b28b033b5e673d2030482819c5683766 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:46:04 2011 +0200 Translation update done using Pootle. commit bd59630555de135ff57c6a92a65e621a9bf03d07 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:45:39 2011 +0200 Translation update done using Pootle. commit 2798e515994045c1b97cc8edfd9192d1d9356285 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:43:40 2011 +0200 Translation update done using Pootle. commit 0a66682c10f71498019804faad834a3155bfd9f3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:39:10 2011 +0200 Translation update done using Pootle. commit 255d9c56667cd54ed76d3b569779e834fb302e6b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:32:21 2011 +0200 Translation update done using Pootle. commit 7bfa81b752de1276e4a384d8e91441094a8f16c6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:31:28 2011 +0200 Translation update done using Pootle. commit 9cdf01bf60ab703335bf3889310eee999e231265 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:26:48 2011 +0200 Translation update done using Pootle. commit cb56859e3d0752a1b2f7bb5f13bd8dd9403f09ae Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:26:22 2011 +0200 Translation update done using Pootle. commit a6d18a7c49240e2202275a9350c75f34eb7ee9de Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Fri Feb 4 23:18:32 2011 +0200 Translation update done using Pootle. commit da9cad48cf81716395e97bb084d0e700d15dfd68 Merge: 4200395b70fea014c82d90115cb9949b8cbebb3d d17b0e157d09c67524114f72ab7c1ff824c336f4 Author: Pootle server <pootle(a)cihar.com> Date: Fri Feb 4 20:40:26 2011 +0100 Merge remote branch 'origin/master' commit 4200395b70fea014c82d90115cb9949b8cbebb3d Merge: 927aabcd935979fb73dc2b04e84df75fd8414c4c 8a394db00c9a89af1ad9d56d02cca96dc04a9290 Author: Pootle server <pootle(a)cihar.com> Date: Thu Feb 3 18:40:05 2011 +0100 Merge remote branch 'origin/master' commit 927aabcd935979fb73dc2b04e84df75fd8414c4c Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 19:20:43 2011 +0200 Translation update done using Pootle. commit 5b844e663925ede4b60cbb3955b286320556fd6c Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 19:20:30 2011 +0200 Translation update done using Pootle. commit dfa77fb095c06fdb28c4f2e084e75d4ecebd503f Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 19:20:17 2011 +0200 Translation update done using Pootle. commit 81b09ac521830f80aec9319297255bba42e0a982 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 19:19:44 2011 +0200 Translation update done using Pootle. commit 1e8599f666b2d6ac5304da746c6cdb55e6492160 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 19:19:16 2011 +0200 Translation update done using Pootle. commit 2875e84e18c21e8c058550bad9a417e67c41592e Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 19:19:09 2011 +0200 Translation update done using Pootle. commit 7287f8933bcb13a985c18d81cf7d16c2f729cb90 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 19:18:59 2011 +0200 Translation update done using Pootle. commit 5650f76a31b2a0c1dadfd84f8d1205bb10bc6695 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 19:18:52 2011 +0200 Translation update done using Pootle. commit 424b97cb14f63e4e539564b9e3c8cb4b926e5fca Merge: 0ef33f24e72dfcc730b15bbcad0fd594e1418378 d15c37ba1b87de18dbb4fdbd87e993b43e43c969 Author: Pootle server <pootle(a)cihar.com> Date: Thu Feb 3 14:40:26 2011 +0100 Merge remote branch 'origin/master' commit 0ef33f24e72dfcc730b15bbcad0fd594e1418378 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:37:03 2011 +0200 Translation update done using Pootle. commit 1ee87d03345fd2b4ee9baf148568d8b8728e4fa1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:36:50 2011 +0200 Translation update done using Pootle. commit 4b31bea2f4ce4e7cf42b64f9a0f23fc972cb3c6c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:36:37 2011 +0200 Translation update done using Pootle. commit a879a77fc9be598f84445dd2ce2b67efdd4ca2f3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:35:58 2011 +0200 Translation update done using Pootle. commit 8f12b2059df22122051a9510a00b201c7ff85395 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:33:34 2011 +0200 Translation update done using Pootle. commit a644b826dbce3c8fad428aa7de5f0f93c5e0b9e2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:33:11 2011 +0200 Translation update done using Pootle. commit 87c17d22f7c3772e09deaad45919348b10d7743d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:32:28 2011 +0200 Translation update done using Pootle. commit 5b6e5cb9734af51d40a01126a2875b78dd72ed79 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:30:54 2011 +0200 Translation update done using Pootle. commit fabb5a186d339fd282adca4f21c1a6fc5166660b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:29:58 2011 +0200 Translation update done using Pootle. commit 5994fc116534fad44edc78138a5e2f5dd6d44ec2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:28:45 2011 +0200 Translation update done using Pootle. commit 1fd0585fcc89046046c21506c17e6cc50e3985de Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:28:29 2011 +0200 Translation update done using Pootle. commit 74dcfb4d0db6b5598462e1bf44a7be27ace53f58 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:28:16 2011 +0200 Translation update done using Pootle. commit 7b9261478796590272ddc58e0bf726e466bebffc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:27:58 2011 +0200 Translation update done using Pootle. commit e857ccb7e4407bd4a1e6083dfb005a00acacb72b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Feb 3 13:27:40 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 13 +++++-------- po/fr.po | 13 +++++-------- po/ru.po | 34 ++++++++++++++++++---------------- po/sl.po | 39 +++++++++++++++++++-------------------- po/tr.po | 33 ++++++++++++++++----------------- 5 files changed, 63 insertions(+), 69 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 600c18d..80c4772 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-02 15:32+0100\n" -"PO-Revision-Date: 2011-01-31 19:31+0200\n" +"PO-Revision-Date: 2011-02-03 19:19+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" @@ -1155,10 +1155,9 @@ msgstr "" #. l10n: Latest available phpMyAdmin version #: js/messages.php:115 -#, fuzzy #| msgid "Check for latest version" msgid ", latest stable version:" -msgstr "Check for latest version" +msgstr ", latest stable version:" #. l10n: Display text for calendar close link #: js/messages.php:130 @@ -4235,7 +4234,7 @@ msgstr "Check for latest version" #: libraries/config/messages.inc.php:498 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Enables check for latest version on main phpMyAdmin page" #: libraries/config/messages.inc.php:499 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4852,10 +4851,9 @@ msgid "Display chart" msgstr "Display chart" #: libraries/display_tbl.lib.php:2255 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Create User" +msgstr "Create view" #: libraries/display_tbl.lib.php:2386 msgid "Link not found" @@ -9701,10 +9699,9 @@ msgid "An index has been added on %s" msgstr "An index has been added on %s" #: tbl_structure.php:471 -#, fuzzy #| msgid "Show versions" msgid "Show more actions" -msgstr "Show versions" +msgstr "Show more actions" #: tbl_structure.php:597 tbl_structure.php:599 msgid "Relation view" diff --git a/po/fr.po b/po/fr.po index 44576b9..eb3fbce 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-02 15:32+0100\n" -"PO-Revision-Date: 2011-01-31 19:41+0200\n" +"PO-Revision-Date: 2011-02-03 19:20+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -1168,10 +1168,9 @@ msgstr "" #. l10n: Latest available phpMyAdmin version #: js/messages.php:115 -#, fuzzy #| msgid "Check for latest version" msgid ", latest stable version:" -msgstr "Vérifier la présence d'une nouvelle version" +msgstr ", dernière version stable :" #. l10n: Display text for calendar close link #: js/messages.php:130 @@ -4286,7 +4285,7 @@ msgstr "Vérifier la présence d'une nouvelle version" #: libraries/config/messages.inc.php:498 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Active la vérification de version sur la page principale" #: libraries/config/messages.inc.php:499 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4910,10 +4909,9 @@ msgid "Display chart" msgstr "Afficher le graphique" #: libraries/display_tbl.lib.php:2255 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Créer un compte d'utilisateur" +msgstr "Créer une vue" #: libraries/display_tbl.lib.php:2386 msgid "Link not found" @@ -9853,10 +9851,9 @@ msgid "An index has been added on %s" msgstr "Un index a été ajouté sur %s" #: tbl_structure.php:471 -#, fuzzy #| msgid "Show versions" msgid "Show more actions" -msgstr "Montrer les versions" +msgstr "Montrer d'autres actions" #: tbl_structure.php:597 tbl_structure.php:599 msgid "Relation view" diff --git a/po/ru.po b/po/ru.po index abfd85c..d336b85 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-02 15:32+0100\n" -"PO-Revision-Date: 2011-01-29 16:02+0200\n" +"PO-Revision-Date: 2011-02-04 23:50+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -1168,10 +1168,9 @@ msgstr "" #. l10n: Latest available phpMyAdmin version #: js/messages.php:115 -#, fuzzy #| msgid "Check for latest version" msgid ", latest stable version:" -msgstr "Проверить обновление" +msgstr ", последняя стабильная версия:" #. l10n: Display text for calendar close link #: js/messages.php:130 @@ -2268,13 +2267,12 @@ msgstr "Сбросить" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Улучшает эффективность обновления экрана" #: libraries/config/messages.inc.php:18 -#, fuzzy #| msgid "Enabled" msgid "Enable Ajax" -msgstr "Доступно" +msgstr "Включить Ajax" #: libraries/config/messages.inc.php:19 msgid "" @@ -4296,6 +4294,8 @@ msgstr "Проверить обновление" #: libraries/config/messages.inc.php:498 msgid "Enables check for latest version on main phpMyAdmin page" msgstr "" +"Включает возможность проверки последней версии phpMyAdmin на главной " +"странице" #: libraries/config/messages.inc.php:499 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4923,10 +4923,9 @@ msgid "Display chart" msgstr "Отобразить график" #: libraries/display_tbl.lib.php:2255 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Создать пользователя" +msgstr "Создать представление" #: libraries/display_tbl.lib.php:2386 msgid "Link not found" @@ -5217,20 +5216,21 @@ msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." msgstr "" +"Документацию и другую информацию по PBMS смотрите на %sстраницах сайта The " +"PrimeBase Media Streaming%s." #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Связи" +msgstr "Дополнительные ссылки" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" -msgstr "" +msgstr "Блог Barry Leslie посвященный PrimeBase Media Streaming" #: libraries/engines/pbms.lib.php:99 msgid "PrimeBase XT Home Page" -msgstr "" +msgstr "Домашняя страница PrimeBase XT" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5387,14 +5387,16 @@ msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." msgstr "" +"Документацию и дальнейшую информацию по PBXT смотрите на %sдомашней странице " +"PrimeBase XT%s." #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" -msgstr "" +msgstr "Блог Пола Маккалаха (Paul McCullagh) посвященный PrimeBase XT Blog" #: libraries/engines/pbxt.lib.php:130 msgid "The PrimeBase Media Streaming (PBMS) home page" -msgstr "" +msgstr "Домашняя страница PrimeBase Media Streaming (PBMS)" #: libraries/export/csv.php:21 libraries/import/csv.php:27 msgid "Columns separated with:" diff --git a/po/sl.po b/po/sl.po index 07b42c4..736503f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-02 15:32+0100\n" -"PO-Revision-Date: 2011-01-07 20:04+0200\n" +"PO-Revision-Date: 2011-02-05 02:27+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -1160,14 +1160,13 @@ msgid "" "upgrading. The newest version is %s, released on %s." msgstr "" "Na voljo je novejša različica phpMyAdmina, zato razmislite o posodobitvi. " -"Najnovejša različica je %s, izdaja %s." +"Najnovejša različica je %s, izdana %s." #. l10n: Latest available phpMyAdmin version #: js/messages.php:115 -#, fuzzy #| msgid "Check for latest version" msgid ", latest stable version:" -msgstr "Preveri za najnovejšo različico" +msgstr ", zadnja ustaljena različica:" #. l10n: Display text for calendar close link #: js/messages.php:130 @@ -2267,13 +2266,12 @@ msgstr "Ponastavi" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Izboljša učinkovitost osvežitve okna" #: libraries/config/messages.inc.php:18 -#, fuzzy #| msgid "Enabled" msgid "Enable Ajax" -msgstr "Omogočeno" +msgstr "Omogoči Ajax" #: libraries/config/messages.inc.php:19 msgid "" @@ -4262,7 +4260,7 @@ msgstr "Preveri za najnovejšo različico" #: libraries/config/messages.inc.php:498 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Omogoča preverjanje najnovejše različice na glavni strani phpMyAdmin" #: libraries/config/messages.inc.php:499 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4884,10 +4882,9 @@ msgid "Display chart" msgstr "Prikaži grafikon" #: libraries/display_tbl.lib.php:2255 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Ustvari uporabnika" +msgstr "Ustvari pogled" #: libraries/display_tbl.lib.php:2386 msgid "Link not found" @@ -5168,20 +5165,21 @@ msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." msgstr "" +"Dokumentacijo in nadaljnje informacije o PBMS lahko najdete na %sDomači " +"strani PrimeBase Media Streaming%s." #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Relacije" +msgstr "Sorodne povezave" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" -msgstr "" +msgstr "Blog PrimeBase Media Streaming avtorja Barryja Leslieja" #: libraries/engines/pbms.lib.php:99 msgid "PrimeBase XT Home Page" -msgstr "" +msgstr "Domača stran PrimeBase XT" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5340,14 +5338,16 @@ msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." msgstr "" +"Dokumentacijo in nadaljnje informacije o PBXT lahko najdete na %sDomači " +"strani PrimeBase XT%s." #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" -msgstr "" +msgstr "Blog PrimeBase XT avtorja Paula McCullagha" #: libraries/engines/pbxt.lib.php:130 msgid "The PrimeBase Media Streaming (PBMS) home page" -msgstr "" +msgstr "Domača stran PrimeBase Media Streaming (PBMS)" #: libraries/export/csv.php:21 libraries/import/csv.php:27 msgid "Columns separated with:" @@ -9763,10 +9763,9 @@ msgid "An index has been added on %s" msgstr "Na %s je dodan indeks" #: tbl_structure.php:471 -#, fuzzy #| msgid "Show versions" msgid "Show more actions" -msgstr "Prikaži različice" +msgstr "Prikaži več dejanj" #: tbl_structure.php:597 tbl_structure.php:599 msgid "Relation view" diff --git a/po/tr.po b/po/tr.po index 7cc9a77..28fc3b5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-02 15:32+0100\n" -"PO-Revision-Date: 2011-01-08 23:03+0200\n" +"PO-Revision-Date: 2011-02-03 13:37+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1156,10 +1156,9 @@ msgstr "" #. l10n: Latest available phpMyAdmin version #: js/messages.php:115 -#, fuzzy #| msgid "Check for latest version" msgid ", latest stable version:" -msgstr "Son sürümü kontrol et" +msgstr ", son sağlam sürüm:" #. l10n: Display text for calendar close link #: js/messages.php:130 @@ -2253,13 +2252,12 @@ msgstr "Sıfırla" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Ekran yenilemenin etkinliğini geliştirir" #: libraries/config/messages.inc.php:18 -#, fuzzy #| msgid "Enabled" msgid "Enable Ajax" -msgstr "Etkin" +msgstr "Ajax Etkin" #: libraries/config/messages.inc.php:19 msgid "" @@ -4266,7 +4264,7 @@ msgstr "Son sürümü kontrol et" #: libraries/config/messages.inc.php:498 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Ana phpMyAdmin sayfasında son sürümü kontrol etmeyi etkinleştir" #: libraries/config/messages.inc.php:499 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4891,10 +4889,9 @@ msgid "Display chart" msgstr "Çizelge göster" #: libraries/display_tbl.lib.php:2255 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Kullanıcı Oluştur" +msgstr "Görünüm oluştur" #: libraries/display_tbl.lib.php:2386 msgid "Link not found" @@ -5179,20 +5176,21 @@ msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." msgstr "" +"%sThe PrimeBase Media Streaming ana sayfasında%s PBMS hakkında belge ve daha " +"fazla bilgi bulunabilir." #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Bağlantılar" +msgstr "İlgili Bağlantılar" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" -msgstr "" +msgstr "Barry Leslie'nin The PrimeBase Media Streaming Bloğu" #: libraries/engines/pbms.lib.php:99 msgid "PrimeBase XT Home Page" -msgstr "" +msgstr "PrimeBase XT Ana Sayfası" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5349,14 +5347,16 @@ msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." msgstr "" +"%sPrimeBase XT Ana Sayfasında%s PBXT hakkında belge ve daha fazla bilgi " +"bulunabilir." #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" -msgstr "" +msgstr "Paul McCullagh'ın The PrimeBase XT Bloğu" #: libraries/engines/pbxt.lib.php:130 msgid "The PrimeBase Media Streaming (PBMS) home page" -msgstr "" +msgstr "The PrimeBase Media Streaming (PBMS) ana sayfası" #: libraries/export/csv.php:21 libraries/import/csv.php:27 msgid "Columns separated with:" @@ -9776,10 +9776,9 @@ msgid "An index has been added on %s" msgstr "%s üzerinde bir indeks eklendi" #: tbl_structure.php:471 -#, fuzzy #| msgid "Show versions" msgid "Show more actions" -msgstr "Sürümleri göster" +msgstr "Daha fazla eylem göster" #: tbl_structure.php:597 tbl_structure.php:599 msgid "Relation view" hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1629-g9443d6e

by Marc Delisle

The branch, master has been updated via 9443d6efc2359ba104714fc8d29a4ab2f2ac0447 (commit) via 8b72097fb0333b61da594fdf38361318c360333d (commit) via 3be186360686d07efa34c005248097914a8eced1 (commit) from f328f6d4a933cb4b0d0328687c214f809a919749 (commit) - Log ----------------------------------------------------------------- commit 9443d6efc2359ba104714fc8d29a4ab2f2ac0447 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 5 07:57:30 2011 -0500 Conditional Ajax on display Options commit 8b72097fb0333b61da594fdf38361318c360333d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 5 07:46:27 2011 -0500 Unneeded wrapping of jQuery object commit 3be186360686d07efa34c005248097914a8eced1 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 5 07:34:56 2011 -0500 Conditional Ajax on sorting results ----------------------------------------------------------------------- Summary of changes: js/sql.js | 27 ++++++++++++++++++--------- libraries/display_tbl.lib.php | 12 ++++++++++-- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/js/sql.js b/js/sql.js index f4fe708..593cbe7 100644 --- a/js/sql.js +++ b/js/sql.js @@ -269,6 +269,7 @@ $(document).ready(function() { * @memberOf jQuery * @name paginate_nav_button_click * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $("input[name=navig].ajax").live('click', function(event) { /** @lends jQuery */ @@ -293,11 +294,11 @@ $(document).ready(function() { * Paginate results with Page Selector dropdown * @memberOf jQuery * @name paginate_dropdown_change + * @see $cfg['AjaxEnable'] */ $("#pageselector").live('change', function(event) { var $the_form = $(this).parent("form"); - // see $cfg['AjaxEnable'] if ($(this).hasClass('ajax')) { event.preventDefault(); @@ -317,15 +318,19 @@ $(document).ready(function() { * Ajax Event handler for sorting the results table * @memberOf jQuery * @name table_results_sort_click + * @see $cfg['AjaxEnable'] */ - $("#table_results").find("a[title=Sort]").live('click', function(event) { + $("#table_results.ajax").find("a[title=Sort]").live('click', function(event) { event.preventDefault(); PMA_ajaxShowMessage(); - $.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) { - $("#sqlqueryresults").html(data); - $("#sqlqueryresults").trigger('appendAnchor'); + $anchor = $(this); + + $.get($anchor.attr('href'), $anchor.serialize() + '&ajax_request=true', function(data) { + $("#sqlqueryresults") + .html(data) + .trigger('appendAnchor'); }) // end $.get() })//end Sort results table @@ -333,13 +338,17 @@ $(document).ready(function() { * Ajax Event handler for the display options * @memberOf jQuery * @name displayOptionsForm_submit + * @see $cfg['AjaxEnable'] */ - $("#displayOptionsForm").live('submit', function(event) { + $("#displayOptionsForm.ajax").live('submit', function(event) { event.preventDefault(); - $.post($(this).attr('action'), $(this).serialize() + '&ajax_request=true' , function(data) { - $("#sqlqueryresults").html(data); - $("#sqlqueryresults").trigger('appendAnchor'); + $form = $(this); + + $.post($form.attr('action'), $form.serialize() + '&ajax_request=true' , function(data) { + $("#sqlqueryresults") + .html(data) + .trigger('appendAnchor'); }) // end $.post() }) //end displayOptionsForm handler diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 875cff2..7d0299c 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -540,7 +540,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ // Display options (if we are not in print view) if (! (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1')) { - echo '<form method="post" action="sql.php" name="displayOptionsForm" id="displayOptionsForm">'; + echo '<form method="post" action="sql.php" name="displayOptionsForm" id="displayOptionsForm"'; + if ($GLOBALS['cfg']['AjaxEnable']) { + echo ' class="ajax" '; + } + echo '>'; $url_params = array( 'db' => $db, 'table' => $table, @@ -623,7 +627,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ echo '<input type="hidden" name="goto" value="sql.php" />' . "\n"; } - echo '<table id="table_results" class="data">' . "\n"; + echo '<table id="table_results" class="data'; + if ($GLOBALS['cfg']['AjaxEnable']) { + echo ' ajax'; + } + echo '">' . "\n"; if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { echo '<thead><tr>' . "\n"; hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1626-gf328f6d

by Marc Delisle

The branch, master has been updated via f328f6d4a933cb4b0d0328687c214f809a919749 (commit) from d17b0e157d09c67524114f72ab7c1ff824c336f4 (commit) - Log ----------------------------------------------------------------- commit f328f6d4a933cb4b0d0328687c214f809a919749 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 5 07:18:42 2011 -0500 Conditional Ajax in Privileges ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 27 ++++++++++++++++++--------- server_privileges.php | 18 ++++++++++++------ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 01ffac4..a18ec9f 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -148,11 +148,12 @@ $(document).ready(function() { * * @see PMA_ajaxShowMessage() * @see appendNewUser() + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name add_user_click * */ - $("#fieldset_add_user a").live("click", function(event) { + $("#fieldset_add_user a.ajax").live("click", function(event) { /** @lends jQuery */ event.preventDefault(); @@ -225,10 +226,11 @@ $(document).ready(function() { * Ajax event handler for 'Reload Privileges' anchor * * @see PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name reload_privileges_click */ - $("#reload_privileges_anchor").live("click", function(event) { + $("#reload_privileges_anchor.ajax").live("click", function(event) { event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strReloadingPrivileges']); @@ -248,20 +250,23 @@ $(document).ready(function() { * AJAX handler for 'Revoke User' * * @see PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name revoke_user_click */ - $("#fieldset_delete_user_footer #buttonGo").live('click', function(event) { + $("#fieldset_delete_user_footer #buttonGo.ajax").live('click', function(event) { event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strRemovingSelectedUsers']); + + $form = $("#usersForm"); - $.post($("#usersForm").attr('action'), $("#usersForm").serialize() + "&delete=" + $(this).attr('value') + "&ajax_request=true", function(data) { + $.post($form.attr('action'), $form.serialize() + "&delete=" + $(this).attr('value') + "&ajax_request=true", function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); //Remove the revoked user from the users list - $("#usersForm").find("input:checkbox:checked").parents("tr").slideUp("medium", function() { + $form.find("input:checkbox:checked").parents("tr").slideUp("medium", function() { var this_user_initial = $(this).find('input:checkbox').val().charAt(0).toUpperCase(); $(this).remove(); @@ -271,7 +276,7 @@ $(document).ready(function() { } //Re-check the classes of each row - $("#usersForm") + $form .find('tbody').find('tr:odd') .removeClass('even').addClass('odd') .end() @@ -296,8 +301,9 @@ $(document).ready(function() { * Step 1: Load Edit User Dialog * @memberOf jQuery * @name edit_user_click + * @see $cfg['AjaxEnable'] */ - $(".edit_user_anchor").live('click', function(event) { + $(".edit_user_anchor.ajax").live('click', function(event) { /** @lends jQuery */ event.preventDefault(); @@ -326,6 +332,7 @@ $(document).ready(function() { * Step 2: Submit the Edit User Dialog * * @see PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name edit_user_submit */ @@ -395,10 +402,11 @@ $(document).ready(function() { * AJAX handler for 'Export Privileges' * * @see PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name export_user_click */ - $(".export_user_anchor").live('click', function(event) { + $(".export_user_anchor.ajax").live('click', function(event) { /** @lends jQuery */ event.preventDefault(); @@ -424,10 +432,11 @@ $(document).ready(function() { * AJAX handler to Paginate the Users Table * * @see PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] * @name paginate_users_table_click * @memberOf jQuery */ - $("#initials_table").find("a").live('click', function(event) { + $("#initials_table.ajax").find("a").live('click', function(event) { event.preventDefault(); PMA_ajaxShowMessage(); diff --git a/server_privileges.php b/server_privileges.php index c650300..499fea6 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -19,6 +19,12 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; require './libraries/server_common.inc.php'; +if ($GLOBALS['cfg']['AjaxEnable']) { + $conditional_class = 'ajax'; +} else { + $conditional_class = ''; +} + /** * Messages are built using the message name */ @@ -1346,7 +1352,7 @@ if (isset($_REQUEST['flush_privileges'])) { /** * defines some standard links */ -$link_edit = '<a class="edit_user_anchor" href="server_privileges.php?' . $GLOBALS['url_query'] +$link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . $GLOBALS['url_query'] . '&username=%s' . '&hostname=%s' . '&dbname=%s' @@ -1363,7 +1369,7 @@ $link_revoke = '<a href="server_privileges.php?' . $GLOBALS['url_query'] . PMA_getIcon('b_usrdrop.png', __('Revoke')) . '</a>'; -$link_export = '<a class="export_user_anchor" href="server_privileges.php?' . $GLOBALS['url_query'] +$link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . $GLOBALS['url_query'] . '&username=%s' . '&hostname=%s' . '&initial=%s' @@ -1583,7 +1589,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs uksort($array_initials, "strnatcasecmp"); - echo '<table id="initials_table" cellspacing="5"><tr>'; + echo '<table id="initials_table" class="' . $conditional_class . '" <cellspacing="5"><tr>'; foreach ($array_initials as $tmp_initial => $initial_was_found) { if ($initial_was_found) { echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&initial=' . urlencode($tmp_initial) . '">' . $tmp_initial . '</a></td>' . "\n"; @@ -1685,7 +1691,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs // add/delete user fieldset echo ' <fieldset id="fieldset_add_user">' . "\n" - . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1">' . "\n" + . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1" class="' . $conditional_class . '">' . "\n" . PMA_getIcon('b_usradd.png') . ' ' . __('Add a new User') . '</a>' . "\n" . ' </fieldset>' . "\n" @@ -1702,7 +1708,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' </label>' . "\n" . ' </fieldset>' . "\n" . ' <fieldset id="fieldset_delete_user_footer" class="tblFooters">' . "\n" - . ' <input type="submit" name="delete" value="' . __('Go') . '" id="buttonGo" />' . "\n" + . ' <input type="submit" name="delete" value="' . __('Go') . '" id="buttonGo" class="' . $conditional_class . '"/>' . "\n" . ' </fieldset>' . "\n" . '</form>' . "\n"; } else { @@ -1720,7 +1726,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } $flushnote = new PMA_Message(__('Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.'), PMA_Message::NOTICE); - $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&flush_privileges=1" id="reload_privileges_anchor">', false); + $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&flush_privileges=1" id="reload_privileges_anchor" class="' . $conditional_class . '">', false); $flushnote->addParam('</a>', false); $flushnote->display(); } hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1625-gd17b0e1

by Marc Delisle

The branch, master has been updated via d17b0e157d09c67524114f72ab7c1ff824c336f4 (commit) via a6f5f95600c1ad0b121de79f0d8791ae1612c2f6 (commit) from 9b4543f2e8950022443575fb4614d6c4d390720b (commit) - Log ----------------------------------------------------------------- commit d17b0e157d09c67524114f72ab7c1ff824c336f4 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 4 13:05:54 2011 -0500 Avoid unneeded DOM traversal Avoid unneeded wrapping of a jQuery object commit a6f5f95600c1ad0b121de79f0d8791ae1612c2f6 Author: Jan Prachař <jan.prachar(a)gmail.com> Date: Fri Feb 4 02:10:50 2011 +0100 Fix ajax dropping multiple column index. ----------------------------------------------------------------------- Summary of changes: js/tbl_structure.js | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 2720b51..352848c 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -114,21 +114,30 @@ $(document).ready(function() { $('.drop_primary_key_index_anchor').live('click', function(event) { event.preventDefault(); + $anchor = $(this); + /** - * @var curr_row Object containing reference to the current field's row + * @var $curr_row Object containing reference to the current field's row */ - var curr_row = $(this).parents('tr'); + var $curr_row = $anchor.parents('tr'); + /** @var Number of columns in the key */ + var rows = $anchor.parents('td').attr('rowspan') || 1; + /** @var Rows that should be hidden */ + var $rows_to_hide = $curr_row; + for (var i = 1, $last_row = $curr_row.next(); i < rows; i++, $last_row = $last_row.next()) { + $rows_to_hide = $rows_to_hide.add($last_row); + } - var question = $(curr_row).children('td').children('.drop_primary_key_index_msg').val(); + var question = $curr_row.children('td').children('.drop_primary_key_index_msg').val(); - $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + $anchor.PMA_confirm(question, $anchor.attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strDroppingPrimaryKeyIndex']); $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); - $(curr_row).hide("medium").remove(); + $rows_to_hide.hide("medium").remove(); } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1623-g9b4543f

by Marc Delisle

The branch, master has been updated via 9b4543f2e8950022443575fb4614d6c4d390720b (commit) from c05c4da9840b909c7317e2dbb3ebbf8d8f13b6ab (commit) - Log ----------------------------------------------------------------- commit 9b4543f2e8950022443575fb4614d6c4d390720b Author: Jan Prachař <jan.prachar(a)gmail.com> Date: Tue Feb 1 23:13:10 2011 +0100 CSS: Top menu items margins and paddings converted to absolute units to prevent changing outer width on hover. ----------------------------------------------------------------------- Summary of changes: themes/darkblue_orange/css/theme_right.css.php | 8 ++++---- themes/original/css/theme_right.css.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index e555da9..07e786e 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -680,14 +680,14 @@ ul#topmenu li, ul#topmenu2 li { /* default tab styles */ ul#topmenu a, ul#topmenu span { display: block; - margin: 0.2em 0.2em 0 0.2em; - padding: 0.2em 0.2em 0 0.2em; + margin: 2px 2px 0; + padding: 2px 2px 0; white-space: nowrap; } ul#topmenu ul a { margin: 0; - padding-bottom: 0.2em; + padding-bottom: 2px; } ul#topmenu .submenu { @@ -797,7 +797,7 @@ ul#topmenu ul li:first-child a { ul#topmenu > li > a:hover, ul#topmenu > li > .tabactive { margin: 0; - padding: 0.2em 0.4em 0.2em 0.4em; + padding: 2px 4px; text-decoration: none; } diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index bc5f6ee..02736c6 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -655,14 +655,14 @@ ul#topmenu li, ul#topmenu2 li { /* default tab styles */ ul#topmenu a, ul#topmenu span { display: block; - margin: 0.2em 0.2em 0 0.2em; - padding: 0.2em 0.2em 0 0.2em; + margin: 2px 2px 0; + padding: 2px 2px 0; white-space: nowrap; } ul#topmenu ul a { margin: 0; - padding-bottom: 0.2em; + padding-bottom: 2px; } ul#topmenu .submenu { @@ -772,7 +772,7 @@ ul#topmenu ul li:first-child a { ul#topmenu > li > a:hover, ul#topmenu > li > .tabactive { margin: 0; - padding: 0.2em 0.4em 0.2em 0.4em; + padding: 2px 4px; text-decoration: none; } hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1622-gc05c4da

by Marc Delisle

The branch, master has been updated via c05c4da9840b909c7317e2dbb3ebbf8d8f13b6ab (commit) from 8a394db00c9a89af1ad9d56d02cca96dc04a9290 (commit) - Log ----------------------------------------------------------------- commit c05c4da9840b909c7317e2dbb3ebbf8d8f13b6ab Author: Jan Prachař <jan.prachar(a)gmail.com> Date: Tue Feb 1 22:50:18 2011 +0100 Do not change table row state when clicked on an anchor or inside a form element in inline editing mode. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 542305e..e445b92 100644 --- a/js/functions.js +++ b/js/functions.js @@ -906,10 +906,13 @@ $(document).ready(function() { * next pages reached via AJAX); a tr may have the class noclick to remove * this behavior. */ - $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function() { - var $tr = $(this); - $tr.toggleClass('marked'); - $tr.children().toggleClass('marked'); + $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function(e) { + //do not trigger when clicked on anchor or inside input element (in inline editing mode) with exception of the first checkbox + if (!jQuery(e.target).is('a, a *, :input:not([name^="rows_to_delete"])')) { + var $tr = $(this); + $tr.toggleClass('marked'); + $tr.children().toggleClass('marked'); + } }); /** hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1621-g8a394db

by Marc Delisle

The branch, master has been updated via 8a394db00c9a89af1ad9d56d02cca96dc04a9290 (commit) from d15c37ba1b87de18dbb4fdbd87e993b43e43c969 (commit) - Log ----------------------------------------------------------------- commit 8a394db00c9a89af1ad9d56d02cca96dc04a9290 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Feb 3 12:24:05 2011 -0500 Typo in variable name ----------------------------------------------------------------------- Summary of changes: main.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/main.php b/main.php index 8818033..495de91 100644 --- a/main.php +++ b/main.php @@ -214,7 +214,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) { echo '<div class="group">'; echo '<h2>phpMyAdmin</h2>'; echo '<ul>'; -$clas = null; +$class = null; if ($GLOBALS['cfg']['VersionCheck']) { $class = 'jsversioncheck'; } hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1620-gd15c37b

by Michal Čihař

The branch, master has been updated via d15c37ba1b87de18dbb4fdbd87e993b43e43c969 (commit) from 48d3e6850a9403b89932422f16cfd291cacdf22a (commit) - Log ----------------------------------------------------------------- commit d15c37ba1b87de18dbb4fdbd87e993b43e43c969 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Feb 3 13:21:16 2011 +0100 Another place where dimensions should not be exactly stated ----------------------------------------------------------------------- Summary of changes: server_processlist.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server_processlist.php b/server_processlist.php index 337d917..0bfb5c2 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -47,7 +47,7 @@ $result = PMA_DBI_query($sql_query); <tr><td><a href="<?php echo $full_text_link; ?>" title="<?php echo empty($full) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>"> <img src="<?php echo $pmaThemeImage . 's_' . (empty($_REQUEST['full']) ? 'full' : 'partial'); ?>text.png" - width="50" height="20" alt="<?php echo empty($_REQUEST['full']) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>" /> + alt="<?php echo empty($_REQUEST['full']) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>" /> </a></td> <th><?php echo __('ID'); ?></th> <th><?php echo __('User'); ?></th> hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1619-g48d3e68

by Michal Čihař

The branch, master has been updated via 48d3e6850a9403b89932422f16cfd291cacdf22a (commit) from d296a5222bff9913eedfb7a66efb7ac2809fe204 (commit) - Log ----------------------------------------------------------------- commit 48d3e6850a9403b89932422f16cfd291cacdf22a Author: Michal Čihař <michal(a)cihar.com> Date: Wed Feb 2 23:14:52 2011 +0100 Change More hiding/showing to CSS class from explicit block/none. When theme wants to use something else than display: block; the old method did not work. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 7 +++---- themes/darkblue_orange/css/theme_right.css.php | 4 ++++ themes/original/css/theme_right.css.php | 4 ++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9446485..542305e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2297,7 +2297,7 @@ function menuResize() for (var i = hide_start; i < li.length-1; i++) { $(li[i])[more_shown ? 'prependTo' : 'appendTo'](submenu_ul); } - submenu.show(); + submenu.addClass('shown'); } else if (more_shown) { w -= submenu_w; // nothing hidden, maybe something can be restored @@ -2308,7 +2308,7 @@ function menuResize() if (w+submenu_w < wmax || (i == li2.length-1 && w < wmax)) { $(li2[i]).insertBefore(submenu); if (i == li2.length-1) { - submenu.hide(); + submenu.removeClass('shown'); } continue; } @@ -2349,8 +2349,7 @@ $(function() { if ($(this).find('ul .tabactive').length == 0) { $(this).removeClass('submenuhover').find('> a').removeClass('tabactive'); } - }) - .hide(); + }); topmenu.append(submenu); // populate submenu and register resize event diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index f5ac595..e555da9 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -692,6 +692,10 @@ ul#topmenu ul a { ul#topmenu .submenu { position: relative; + display: none; +} +ul#topmenu .shown { + display: block; } ul#topmenu ul { diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 2e5d6f6..bc5f6ee 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -667,6 +667,10 @@ ul#topmenu ul a { ul#topmenu .submenu { position: relative; + display: none; +} +ul#topmenu .shown { + display: block; } ul#topmenu ul { hooks/post-receive -- phpMyAdmin

13 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git February 2011