- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 89a6183f2bdb7c1e7df9d6d0ad215ca35e3b7a78
by Michal Čihař 21 Jan '11

21 Jan '11

The branch, master has been updated via 89a6183f2bdb7c1e7df9d6d0ad215ca35e3b7a78 (commit) from d122c9e628999df1f30e607d497d10ecda94e4fc (commit) - Log ----------------------------------------------------------------- commit 89a6183f2bdb7c1e7df9d6d0ad215ca35e3b7a78 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jan 21 08:23:04 2011 +0100 Switch to other mirror ----------------------------------------------------------------------- Summary of changes: render.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/render.py b/render.py index b3d24ec..187341d 100755 --- a/render.py +++ b/render.py @@ -475,7 +475,7 @@ class SFGenerator: 'size_k' : int(size) / 1024, 'size_m' : int(size) / (1024 * 1024), 'humansize' : fmt_bytes(size), - 'url' : 'http://dl2.cihar.com/phpMyAdmin/master/%s' % name, + 'url' : 'http://dl.cihar.com/phpMyAdmin/master/%s' % name, 'md5' : md5s[name], }) self.data['release_vcs'] = vcs hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1271-gbb0229f
by Madhura Jayaratne 21 Jan '11

21 Jan '11

The branch, master has been updated via bb0229fc07e40347d02b26ad84399ac6cd91354f (commit) from 09707e067762971183543ad71fbc03458c650209 (commit) - Log ----------------------------------------------------------------- commit bb0229fc07e40347d02b26ad84399ac6cd91354f Author: madhuracj <madhura.cj(a)gmail.com> Date: Fri Jan 21 09:00:01 2011 +0530 Schema export to PDF functionality made compatible with TCPDF 5.9 ----------------------------------------------------------------------- Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 32 +++++++++--------------- 1 files changed, 12 insertions(+), 20 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 7763701..5b8e517 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -41,14 +41,14 @@ class PMA_PDF extends TCPDF var $Alias = array(); var $widths; - public function getFh() + public function getH() { - return $this->fh; + return $this->h; } - public function getFw() + public function getW() { - return $this->fw; + return $this->w; } public function setCMargin($c_margin) @@ -343,15 +343,6 @@ class PMA_PDF extends TCPDF $this->_putbookmarks(); } - function _putcatalog() - { - parent::_putcatalog(); - if (count($this->Outlines) > 0) { - $this->_out('/Outlines ' . $this->def_outlines . ' 0 R'); - $this->_out('/PageMode /UseOutlines'); - } - } - function SetWidths($w) { // column widths @@ -862,7 +853,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $this->setExportType($_POST['export_type']); // Initializes a new document - $pdf = new PMA_PDF('L', 'mm', $this->paper); + $pdf = new PMA_PDF($this->orientation, 'mm', $this->paper); $pdf->SetTitle(sprintf(__('Schema of the %s database - Page %s'), $GLOBALS['db'], $this->pageNumber)); $pdf->setCMargin(0); $pdf->Open(); @@ -908,8 +899,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema // Defines the scale factor $this->scale = ceil( max( - ($this->_xMax - $this->_xMin) / ($pdf->getFh() - $this->rightMargin - $this->leftMargin), - ($this->_yMax - $this->_yMin) / ($pdf->getFw() - $this->topMargin - $this->bottomMargin)) + ($this->_xMax - $this->_xMin) / ($pdf->getW() - $this->rightMargin - $this->leftMargin), + ($this->_yMax - $this->_yMin) / ($pdf->getH() - $this->topMargin - $this->bottomMargin)) * 100) / 100; $pdf->PMA_PDF_setScale($this->scale, $this->_xMin, $this->_yMin, $this->leftMargin, $this->topMargin); @@ -1002,7 +993,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->SetDrawColor(200, 200, 200); // Draws horizontal lines for ($l = 0; $l < 21; $l++) { - $pdf->line(0, $l * 10, $pdf->getFh(), $l * 10); + $pdf->line(0, $l * 10, $pdf->getW(), $l * 10); // Avoid duplicates if ($l > 0) { $pdf->SetXY(0, $l * 10); @@ -1012,7 +1003,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } // end for // Draws vertical lines for ($j = 0; $j < 30 ;$j++) { - $pdf->line($j * 10, 0, $j * 10, $pdf->getFw()); + $pdf->line($j * 10, 0, $j * 10, $pdf->getH()); $pdf->SetXY($j * 10, 0); $label = (string) sprintf('%.0f', ($j * 10 - $this->leftMargin) * $this->scale + $this->_xMin); $pdf->Cell(5, 7, $label); @@ -1114,12 +1105,13 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['RT']['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i + 1 . ' ' . __('Relational schema'), 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i . ' ' . __('Relational schema'), 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables as $table) { $z++; + $pdf->SetAutoPageBreak(true); $pdf->addpage($GLOBALS['orientation']); $pdf->Bookmark($table); $pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo()) ; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1270-g09707e0
by Marc Delisle 19 Jan '11

19 Jan '11

The branch, master has been updated via 09707e067762971183543ad71fbc03458c650209 (commit) from 8a39a95993538aba2b8e0be8dcb483458e21401f (commit) - Log ----------------------------------------------------------------- commit 09707e067762971183543ad71fbc03458c650209 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jan 19 12:54:52 2011 -0500 Credits for TCPDF ----------------------------------------------------------------------- Summary of changes: Documentation.html | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Documentation.html b/Documentation.html index 64ddbcb..85f3174 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4750,6 +4750,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA <li>many bugfixes and improvements</li> </ul></li> +<li>Nicola Asuni (Tecnick.com) +<ul> + <li>TCPDF library (<a + href="http://www.tcpdf.org">http://www.tcpdf.org</a>)</li> +</ul></li> + <li>Michael Keck <mkkeck_at_users.sourceforge.net> <ul> <li>redesign for 2.6.0</li> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1266-g382fdd7
by Michal Čihař 18 Jan '11

18 Jan '11

The branch, master has been updated via 382fdd7555cbeb10dd54fbb3db0e619de23c99e1 (commit) via c8f3fce146687330c18afbd1b7aa66f768f7857e (commit) via 3ed6f6a2544a1800ad2ade8bab1b8bdd1ec7e908 (commit) via aa14d2fcafff50b735577f7d1238cdd90c116e38 (commit) via b99d3ecb8ea9a2a7638378af88742dd335562b35 (commit) via 58045ab7503bf55e1828a33c78931f2740d1584f (commit) via 1634428337c9a1fd6e488737d4c8948e257e7921 (commit) via 2b7e76307b0b2cb94333675203382cca65f2e726 (commit) via 528940b18b5cbe2c2edf76522858c00a77922e37 (commit) via 555932be4e8d7ceef46a6bcbac70b5517ff7f63f (commit) via ed85825f013043308c9c6776f5de0ca683ca0770 (commit) via 90c3b48f51104b461ecb0dc335946248fc529464 (commit) via 2e28026e3468175fde881d2f0e6379283267f1fa (commit) from e061b8d0ac4c99317efd660e19d1ac0246351bef (commit) - Log ----------------------------------------------------------------- commit 382fdd7555cbeb10dd54fbb3db0e619de23c99e1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:41:24 2011 +0200 Translation update done using Pootle. commit c8f3fce146687330c18afbd1b7aa66f768f7857e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:40:55 2011 +0200 Translation update done using Pootle. commit 3ed6f6a2544a1800ad2ade8bab1b8bdd1ec7e908 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:37:52 2011 +0200 Translation update done using Pootle. commit aa14d2fcafff50b735577f7d1238cdd90c116e38 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:33:17 2011 +0200 Translation update done using Pootle. commit b99d3ecb8ea9a2a7638378af88742dd335562b35 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:32:46 2011 +0200 Translation update done using Pootle. commit 58045ab7503bf55e1828a33c78931f2740d1584f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:27:01 2011 +0200 Translation update done using Pootle. commit 1634428337c9a1fd6e488737d4c8948e257e7921 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:24:21 2011 +0200 Translation update done using Pootle. commit 2b7e76307b0b2cb94333675203382cca65f2e726 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:21:54 2011 +0200 Translation update done using Pootle. commit 528940b18b5cbe2c2edf76522858c00a77922e37 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:16:46 2011 +0200 Translation update done using Pootle. commit 555932be4e8d7ceef46a6bcbac70b5517ff7f63f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:12:23 2011 +0200 Translation update done using Pootle. commit ed85825f013043308c9c6776f5de0ca683ca0770 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:11:38 2011 +0200 Translation update done using Pootle. commit 90c3b48f51104b461ecb0dc335946248fc529464 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:09:05 2011 +0200 Translation update done using Pootle. commit 2e28026e3468175fde881d2f0e6379283267f1fa Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Mon Jan 17 21:08:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/po/ru.po b/po/ru.po index ceb9979..e7c1a98 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-14 14:45+0200\n" +"PO-Revision-Date: 2011-01-17 21:41+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -4085,15 +4085,15 @@ msgid "" "Whether the tracking mechanism creates versions for tables and views " "automatically." msgstr "" +"Должен ли механизм слежения создавать версии таблиц и представлений " +"автоматически." #: libraries/config/messages.inc.php:426 -#, fuzzy #| msgid "Automatic recovery mode" msgid "Automatically create versions" -msgstr "Режим автоматического восстановления" +msgstr "Автоматическое создание версий" #: libraries/config/messages.inc.php:427 -#, fuzzy #| msgid "" #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history" #| "[/kbd]" @@ -4101,12 +4101,12 @@ msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/kbd]" msgstr "" -"Для отключения поддержки истории SQL запросов оставьте поле пустым. " -"Рекомендуется: [kbd]pma_history[/kbd]" +"Для отключения возможности хранения пользовательских настроек в базе данных " +"оставьте поле пустым. Рекомендуется: [kbd]pma_config[/kbd]" #: libraries/config/messages.inc.php:428 msgid "User preferences storage table" -msgstr "" +msgstr "Таблица хранения настроек пользователя" #: libraries/config/messages.inc.php:430 msgid "User for config auth" @@ -4138,11 +4138,10 @@ msgid "Verbose name of this server" msgstr "Пользовательское имя сервера" #: libraries/config/messages.inc.php:435 -#, fuzzy #| msgid "" #| "Whether a user should be displayed a "show all (records)" button" msgid "Whether a user should be displayed a "show all (rows)" button" -msgstr "Позволяет вывести кнопку "показать все (записи)"" +msgstr "Позволяет вывести пользователю кнопку "показать все (записи)"" #: libraries/config/messages.inc.php:436 msgid "Allow to display all the rows" @@ -4172,12 +4171,13 @@ msgid "" "Defines whether or not type fields should be initially displayed in edit/" "insert mode" msgstr "" +"Определяет изначальное отображение типа полей в режиме редакции или вставки " +"данных" #: libraries/config/messages.inc.php:441 -#, fuzzy #| msgid "Show open tables" msgid "Show field types" -msgstr "Список открытых таблиц" +msgstr "Отображение типа полей" #: libraries/config/messages.inc.php:442 msgid "Display the function fields in edit/insert mode" @@ -4265,7 +4265,7 @@ msgstr "Пропускать заблокированные таблицы" #: libraries/config/messages.inc.php:462 msgid "Requires SQL Validator to be enabled" -msgstr "" +msgstr "Требуется подключенный SQL валидатор" #: libraries/config/messages.inc.php:464 #: libraries/display_change_password.lib.php:40 @@ -4282,16 +4282,20 @@ msgid "" "[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be " "installed" msgstr "" +"[strong]Внимание:[/strong] требуется расширение PHP SOAP, либо установленный " +"PEAR SOAP" #: libraries/config/messages.inc.php:466 msgid "Enable SQL Validator" -msgstr "" +msgstr "Включение SQL валидатора" #: libraries/config/messages.inc.php:467 msgid "" "If you have a custom username, specify it here (defaults to [kbd]anonymous[/" "kbd])" msgstr "" +"При наличии выделенного имени пользователя, пропишите его здесь (изначально " +"используется [kbd]anonymous[/kbd])" #: libraries/config/messages.inc.php:468 tbl_tracking.php:405 #: tbl_tracking.php:456 @@ -4312,11 +4316,11 @@ msgstr "Предлагать имя новой базы данных" #: libraries/config/messages.inc.php:471 msgid "A warning is displayed on the main page if Suhosin is detected" -msgstr "" +msgstr "При определении Suhosin, на главной странице выводится предупреждение" #: libraries/config/messages.inc.php:472 msgid "Suhosin warning" -msgstr "" +msgstr "Предупреждение о Suhosin" #: libraries/config/messages.inc.php:473 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1253-ge061b8d
by Michal Čihař 17 Jan '11

17 Jan '11

The branch, master has been updated via e061b8d0ac4c99317efd660e19d1ac0246351bef (commit) from f44f3eb5a12c8ab4ccf408650df2c40700ab7d4f (commit) - Log ----------------------------------------------------------------- commit e061b8d0ac4c99317efd660e19d1ac0246351bef Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jan 17 12:49:16 2011 +0100 Fix format strings ----------------------------------------------------------------------- Summary of changes: po/sv.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/sv.po b/po/sv.po index 6a05bad..cb19be2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4522,7 +4522,7 @@ msgstr "Felaktig IP-adress: %s" #: libraries/core.lib.php:262 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "%S tillägg saknas. Vänligen kontrollera din PHP konfiguration." +msgstr "%s tillägg saknas. Vänligen kontrollera din PHP konfiguration." #: libraries/db_events.inc.php:14 libraries/db_events.inc.php:16 #: libraries/export/sql.php:481 @@ -7021,7 +7021,7 @@ msgid "" "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" "Dina inställningar kommer enbart att sparas för den aktuella sessionen.För " -"att lagra dem permanent krävs %sphpMyAdmin% configuration storage%s." +"att lagra dem permanent krävs %sphpMyAdmin configuration storage%s." #: libraries/user_preferences.lib.php:141 #| msgid "Cannot load or save configuration" @@ -9463,8 +9463,8 @@ msgid "" "(currently %d)." msgstr "" "%sLogin cookie validity%s är mer än 1440 sekunder kan orsaka slumpmässit " -"ogiltigförklarande av session om%ssession.gc_maxlifetime s är mindre än dess " -"värde (för närvarande%d)." +"ogiltigförklarande av session om %ssession.gc_maxlifetime%s s är mindre än dess " +"värde (för närvarande %d)." #: setup/lib/index.lib.php:262 #, php-format @@ -9506,7 +9506,7 @@ msgid "" "of users, including you, are connected to." msgstr "" "Om du känner att detta är nödvändigt, använd extra skyddsinställningar - " -"shost autentisering%s inställningarna och %strusted proxies listan%s. Dock " +"%shost autentisering%s inställningarna och %strusted proxies listan%s. Dock " "kan IP-baserat skydd inte vara tillförlitligt om din IP tillhör en ISP där " "tusentals användare, inklusive dig, är anslutna till" @@ -9553,7 +9553,7 @@ msgid "" "%sZip decompression%s requires functions (%s) which are unavailable on this " "system." msgstr "" -"%sZip dekompression%s kräver funktioner ( s) som inte är tillgängliga på " +"%sZip dekompression%s kräver funktioner (%s) som inte är tillgängliga på " "detta system." #: setup/lib/index.lib.php:296 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 7fa9f0342e0a05e83e17f3a080bba08ad441d4da
by Michal Čihař 17 Jan '11

17 Jan '11

The branch, master has been updated via 7fa9f0342e0a05e83e17f3a080bba08ad441d4da (commit) via bb216bac290c1e97682b2b793c8e21f64c2641fb (commit) via 78ebdb6ea643387474d82c15b5bebbd50c364197 (commit) via 30de00061f049e144be030c963aa0cbcbb04ef01 (commit) via d2d73f8ab28e715dc7c201da4b6c937834e4f86f (commit) via 62bd4666a98b3d805223debb4073cc743a3bdb91 (commit) via 932f082451ebeb16d6ed1bfd708b9efada979f4b (commit) via 1ffbd729efa9d9c54e26c80a8d6125c853c3158b (commit) via ea2342a92fff99350778359a2c444da405833654 (commit) via 9df6e28f822dc107a3c132bf61a6416997207b72 (commit) via 515f156161a171af2813bd619ec388ddf5470eb8 (commit) via 47bc1d77dd091d426fb22f292d3cac4019f7bb71 (commit) via 2a168e097c72ffd9786be06f8e80ecf56bda68b2 (commit) via 220cde5ab8ec351e6e09dce0e516167052cc952c (commit) via d8bc1160485c616abe56ef4fc48c67e3ba59d58d (commit) via 1e27a9a445d1885c379dcb5ebed7e1c326d8f0af (commit) via c6da9e6169b459c3cae98154f11f4aa8398a6837 (commit) via 78df82cda6b028122e7a1b9e4e495309d8e01095 (commit) via 4b0852b5a3c2f6d1d5a196f18196eb7621c9aa7d (commit) via b732af448c76119ee11133d8611c1ca90c0ee927 (commit) from 9a2ba2f815e5b8e9a80477f78ea9c434de1c5ba7 (commit) - Log ----------------------------------------------------------------- commit 7fa9f0342e0a05e83e17f3a080bba08ad441d4da Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 13:00:16 2011 +0200 Translation update done using Pootle. commit bb216bac290c1e97682b2b793c8e21f64c2641fb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:59:10 2011 +0200 Translation update done using Pootle. commit 78ebdb6ea643387474d82c15b5bebbd50c364197 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:58:45 2011 +0200 Translation update done using Pootle. commit 30de00061f049e144be030c963aa0cbcbb04ef01 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:56:53 2011 +0200 Translation update done using Pootle. commit d2d73f8ab28e715dc7c201da4b6c937834e4f86f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:55:55 2011 +0200 Translation update done using Pootle. commit 62bd4666a98b3d805223debb4073cc743a3bdb91 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:52:35 2011 +0200 Translation update done using Pootle. commit 932f082451ebeb16d6ed1bfd708b9efada979f4b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:44:47 2011 +0200 Translation update done using Pootle. commit 1ffbd729efa9d9c54e26c80a8d6125c853c3158b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:28:52 2011 +0200 Translation update done using Pootle. commit ea2342a92fff99350778359a2c444da405833654 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:28:33 2011 +0200 Translation update done using Pootle. commit 9df6e28f822dc107a3c132bf61a6416997207b72 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:06:23 2011 +0200 Translation update done using Pootle. commit 515f156161a171af2813bd619ec388ddf5470eb8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:05:35 2011 +0200 Translation update done using Pootle. commit 47bc1d77dd091d426fb22f292d3cac4019f7bb71 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 12:03:40 2011 +0200 Translation update done using Pootle. commit 2a168e097c72ffd9786be06f8e80ecf56bda68b2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Jan 16 11:59:09 2011 +0200 Translation update done using Pootle. commit 220cde5ab8ec351e6e09dce0e516167052cc952c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 15 13:49:40 2011 +0200 Translation update done using Pootle. commit d8bc1160485c616abe56ef4fc48c67e3ba59d58d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 15 13:43:47 2011 +0200 Translation update done using Pootle. commit 1e27a9a445d1885c379dcb5ebed7e1c326d8f0af Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 15 13:42:17 2011 +0200 Translation update done using Pootle. commit c6da9e6169b459c3cae98154f11f4aa8398a6837 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 15 13:35:04 2011 +0200 Translation update done using Pootle. commit 78df82cda6b028122e7a1b9e4e495309d8e01095 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Jan 14 23:06:32 2011 +0200 Translation update done using Pootle. commit 4b0852b5a3c2f6d1d5a196f18196eb7621c9aa7d Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Jan 14 23:06:23 2011 +0200 Translation update done using Pootle. commit b732af448c76119ee11133d8611c1ca90c0ee927 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Jan 14 23:06:07 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 16 ++++++---------- po/tr.po | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 3a677a1..740e909 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-11 15:11+0100\n" -"PO-Revision-Date: 2011-01-02 11:53+0200\n" +"PO-Revision-Date: 2011-01-14 23:06+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -9315,9 +9315,8 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3402 -#, fuzzy msgid "<a href=\"#faq3_12\">3.12 (withdrawn).</a>" -msgstr "<a href=\"#faq1_13\">1.13 (withdrawn).</a>" +msgstr "<a href=\"#faq3_12\">3.12 (withdrawn).</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3405 @@ -9330,15 +9329,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3409 -#, fuzzy msgid "" "The tests I have made with MySQL 5.1.49 shows that the API does not accept " "this syntax for the USE command." msgstr "" -"The tests I have made with current MySQL 4.1.11 API shows that the API does " -"not accept this syntax for the USE command. Enclosing the db name with " -"backquotes works. For further confusion, no backquotes are needed with " -"command-line mysql." +"The tests I have made with MySQL 5.1.49 shows that the API does not accept " +"this syntax for the USE command." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3414 @@ -14021,7 +14017,7 @@ msgstr "" #. type: Plain text #: orig-docs/README:26 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 2001-2011\n" " Marc Delisle <marc_at_infomarc.info>\n" @@ -14034,7 +14030,7 @@ msgid "" " Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" " [check Documentation.txt/.html file for more details]\n" msgstr "" -"Copyright (C) 2001-2010\n" +"Copyright (C) 2001-2011\n" " Marc Delisle <marc_at_infomarc.info>\n" " Olivier Müller <om_at_omnis.ch>\n" " Robin Johnson <robbat2_at_users.sourceforge.net>\n" diff --git a/po/tr.po b/po/tr.po index e3dbd24..ac5f62c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-11 15:11+0100\n" -"PO-Revision-Date: 2011-01-11 13:03+0200\n" +"PO-Revision-Date: 2011-01-16 13:00+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -1003,7 +1003,7 @@ msgstr "" "<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> ve tanımlama bilgisi " "kimlik doğrulaması kipleri kullanıcılara kendi veritabanına erişim vermek " "istediğiniz ve diğerleriyle oynamalarını istemediğiniz <b>çoklu-kullanıcı " -"ortamlarında</b> önerilir." +"ortamında</b> önerilir." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:381 @@ -1011,6 +1011,8 @@ msgid "" "Nevertheless be aware that MS Internet Explorer seems to be really buggy " "about cookies, at least till version 6." msgstr "" +"Yine de haberiniz olsun, MS Internet Explorer tanımlama bilgileri konusunda " +"gerçekten hatalı görünüyor, en azından sürüm 6 hala öyle." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:383 @@ -1019,6 +1021,10 @@ msgid "" "title=\"HyperText Transfer Protocol\">HTTP</abbr> or cookie mode so that " "your user/password pair are not in clear in the configuration file." msgstr "" +"Hatta <b>tek-kullanıcı ortamında</b>, kullanıcı adı/parola ikilinizin " +"yapılandırma dosyasında açıkça olmamasından <abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr> veya tanımlama bilgileri kipi kullanmayı tecih " +"edebilirsiniz." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:388 @@ -1028,6 +1034,10 @@ msgid "" "need to be set in the phpMyAdmin configuration file (except possibly for the " "<a href=\"#controluser\">controluser</a>)." msgstr "" +"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> ve tanımlama bilgisi " +"kimlik doğrulaması kipleri daha güvenlidir: MySQL oturum açma bilgisinin " +"phpMyAdmin yapılandırma dosyasında (mümkünse <a href=\"#controluser\">denetim " +"kullanıcısı</a> için hariç) ayarlanmasına ihtiyacı yoktur." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:392 @@ -1035,6 +1045,8 @@ msgid "" "However, keep in mind that the password travels in plain text, unless you " "are using the HTTPS protocol." msgstr "" +"Yinede aklınızda olsun HTTPS protokolü kullanmadığınız sürece parola düz " +"metinde yolculuk eder." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:394 @@ -1042,6 +1054,8 @@ msgid "" "In cookie mode, the password is stored, encrypted with the blowfish " "algorithm, in a temporary cookie." msgstr "" +"Tanımlama bilgisi kipinde parola geçici tanımlama bilgisinde depolanır, " +"blowfish algoritması ile şifrelenir." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:397 @@ -1049,6 +1063,8 @@ msgid "" "Note: this section is only applicable if your MySQL server is running with " "<tt>--skip-show-database</tt>." msgstr "" +"Not: bu bölüm sadece eğer MySQL sunucunuz <tt>--veritabanı-göstermeyi-" +"atla</tt> ile çalışıyorsa uygulanabilir." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:400 @@ -1060,6 +1076,12 @@ msgid "" "<i>`mysql`.`tables_priv` (all columns except `Grantor` and `Timestamp`)</i> " "tables." msgstr "" +"'<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>' ve 'tanımlama " +"bilgisi' kipleri için phpMyAdmin, <i>`mysql`.`user` (`Password` hariç tüm " +"sütunlar)</i>, <i>`mysql`.`db` (tüm sütunlar)</i>, <i>`mysql`.`host` (tüm " +"sütunlar)</i> ve <i>`mysql`.`tables_priv` (`Grantor` ve `Timestamp` hariç " +"tüm sütunlar)</i> tablolarında <b>sadece</b> <tt>SELECT</tt> yetkisi olan " +"denetim kullanıcısına ihtiyaç duyar." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:405 @@ -1070,6 +1092,13 @@ msgid "" "['controluser']</a></tt> and <tt><a href=\"#cfg_Servers_controlpass\" class=" "\"configrule\"> $cfg['Servers'][$i]['controlpass']</a></tt> settings." msgstr "" +"<tt>Config.inc.php</tt> dosyası içindeki <tt><a " +"href=\"#cfg_Servers_controluser\" class=\"configrule\"> " +"$cfg['Servers'][$i]['controluser']</a></tt> ve <tt><a " +"href=\"#cfg_Servers_controlpass\" class=\"configrule\"> " +"$cfg['Servers'][$i]['controlpass']</a></tt> ayarları altında <a " +"href=\"#controluser\">denetim kullanıcısı</a> için ayrıntıları " +"belirlemelisiniz." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:412 @@ -1079,6 +1108,11 @@ msgid "" "example: use something else in your file!</b> Input these statements from " "the phpMyAdmin SQL Query window or mysql command–line client." msgstr "" +"Aşağıdaki örnekte denetim kullanıcısı olarak <tt>pma</tt> ve denetim " +"parolası olarak <tt>pmapass</tt> kullanmak istediğiniz farz ediliyor ama " +"<b>bu sadece bir örnektir: dosyanızda başka bir şey kullanın!</b> Bu " +"ifadeleri phpMyAdmin SQL Sorgu penceresinden ya da mysql komut–satırı " +"istemcisinden girin." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:417 @@ -1086,6 +1120,8 @@ msgid "" "Of course you have to replace <tt>localhost</tt> with the webserver's host " "if it's not the same as the MySQL server's one." msgstr "" +"Elbette <tt>localhost</tt>'u web sunucunuzun anamakinesiyle " +"değiştirmelisiniz, eğer MySQL sunucusuda aynı değilse." #. type: Content of: <html><body><div><ul><li><pre> #: orig-docs/Documentation.html:421 @@ -1104,17 +1140,30 @@ msgid "" "GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)\n" " ON mysql.tables_priv TO 'pma'@'localhost';" msgstr "" +"GRANT USAGE ON mysql.* TO 'pma'@'localhost' IDENTIFIED BY 'pmapass';\n" +"GRANT SELECT (\n" +" Host, User, Select_priv, Insert_priv, Update_priv, Delete_priv,\n" +" Create_priv, Drop_priv, Reload_priv, Shutdown_priv, Process_priv,\n" +" File_priv, Grant_priv, References_priv, Index_priv, Alter_priv,\n" +" Show_db_priv, Super_priv, Create_tmp_table_priv, Lock_tables_priv,\n" +" Execute_priv, Repl_slave_priv, Repl_client_priv\n" +" ) ON mysql.user TO 'pma'@'localhost';\n" +"GRANT SELECT ON mysql.db TO 'pma'@'localhost';\n" +"GRANT SELECT ON mysql.host TO 'pma'@'localhost';\n" +"GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)\n" +" ON mysql.tables_priv TO 'pma'@'localhost';" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:434 msgid "If you want to use the many new relation and bookmark features:" -msgstr "" +msgstr "Eğer bir çok yeni bağlantı ve yer imi özellikleri kullanmak isterseniz:" #. type: Content of: <html><body><div><ul><li><pre> #: orig-docs/Documentation.html:437 #, no-wrap msgid "GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';\n" -msgstr "" +msgstr "GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO " +"'pma'@'localhost';\n" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:440 @@ -1122,6 +1171,8 @@ msgid "" "(this of course requires that your <a href=\"#linked-tables\">phpMyAdmin " "configuration storage</a> be set up)." msgstr "" +"(bu elbette <a href=\"#linked-tables\">phpMyAdmin yapılandırma " +"depolamanızın</a> ayarlı olmasını gerektirir)." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:444 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-304-g9adcdc0
by Marc Delisle 16 Jan '11

16 Jan '11

The branch, master has been updated via 9adcdc08d96f991cb05ffd65ac3cba396e80f158 (commit) from d7854c2dacb7d000eb2d722594490149fcf27017 (commit) - Log ----------------------------------------------------------------- commit 9adcdc08d96f991cb05ffd65ac3cba396e80f158 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 16 11:36:29 2011 -0500 Replace inline Javascript by a function that attaches a date/time picker to the elements which need it ----------------------------------------------------------------------- Summary of changes: js/functions.js | 48 +++++++++++++++++++++++++++++++++++++++++++----- js/messages.php | 1 + tbl_change.php | 33 +++++++-------------------------- tbl_select.php | 33 ++++++++------------------------- 4 files changed, 59 insertions(+), 56 deletions(-) diff --git a/js/functions.js b/js/functions.js index 5498f93..6559b34 100644 --- a/js/functions.js +++ b/js/functions.js @@ -55,6 +55,37 @@ function displayPasswordGenerateButton() { $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>'); } +/* + * Adds a date/time picker to an element + * + * @param object $this_element a jQuery object pointing to the element + */ +function PMA_addDatepicker($this_element) { + var showTimeOption = false; + if ($this_element.is('.datetimefield')) { + showTimeOption = true; + } + + $this_element + .datepicker({ + showOn: 'button', + buttonImage: themeCalendarImage, // defined in js/messages.php + buttonImageOnly: true, + duration: '', + time24h: true, + stepMinutes: 1, + stepHours: 1, + showTime: showTimeOption, + dateFormat: 'yy-mm-dd', // yy means year with four digits + altTimeField: '', + beforeShow: function(input, inst) { + // Remember that we came from the datepicker; this is used + // in tbl_change.js by verificationsAfterFieldChange() + $this_element.data('comes_from', 'datepicker'); + }, + constrainInput: false + }); +} /** * selects the content of a given object, f.e. a textarea @@ -845,17 +876,24 @@ function checkTransmitDump(theForm, theAction) return true; } // end of the 'checkTransmitDump()' function -/** - * Row marking in horizontal mode (use "live" so that it works also for - * next pages reached via AJAX); a tr may have the class noclick to remove - * this behavior. - */ $(document).ready(function() { + /** + * Row marking in horizontal mode (use "live" so that it works also for + * 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'); }); + + /** + * Add a date/time picker to each element that needs it + */ + $('.datefield, .datetimefield').each(function() { + PMA_addDatepicker($(this)); + }); }) /** diff --git a/js/messages.php b/js/messages.php index c8ff9f9..f9f764e 100644 --- a/js/messages.php +++ b/js/messages.php @@ -115,6 +115,7 @@ foreach ($js_messages as $name => $js_message) { } /* Calendar */ +echo "var themeCalendarImage = '" . $GLOBALS['pmaThemeImage'] . 'b_calendar.png' . "';\n"; echo "if ($.datepicker) {\n"; /* l10n: Display text for calendar close link */ PMA_printJsValue("$.datepicker.regional['']['closeText']", __('Done')); diff --git a/tbl_change.php b/tbl_change.php index 4ba5144..2ce434d 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -942,10 +942,16 @@ foreach ($rows as $row_id => $vrow) { ><?php echo $special_chars_encoded; ?></textarea> <?php } else { + $the_class = 'textfield'; + if ($field['pma_type'] == 'date') { + $the_class .= ' datefield'; + } elseif ($field['pma_type'] == 'datetime' || substr($field['pma_type'], 0, 9) == 'timestamp') { + $the_class .= ' datetimefield'; + } ?> <input type="text" name="fields<?php echo $field_name_appendix; ?>" value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>" - class="textfield" <?php echo $unnullify_trigger; ?> + class="<?php echo $the_class; ?>" <?php echo $unnullify_trigger; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" /> <?php @@ -973,31 +979,6 @@ foreach ($rows as $row_id => $vrow) { // the _3 suffix points to the date field // the _2 suffix points to the corresponding NULL checkbox // in dateFormat, 'yy' means the year with 4 digits - ?> -<script type="text/javascript"> -//<![CDATA[ -$(function() { - $('#field_<?php echo ($idindex); ?>_3').datepicker({ - showOn: 'button', - buttonImage: '<?php echo $GLOBALS['pmaThemeImage'] . 'b_calendar.png'; ?>', - buttonImageOnly: true, - duration: '', - time24h: true, - stepMinutes: 1, - stepHours: 1, - <?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?> - dateFormat: 'yy-mm-dd', // yy means year with four digits - altTimeField: '', - beforeShow: function(input, inst) { - // Remember that we came from the datepicker - $(input).data('comes_from', 'datepicker'); - }, - constrainInput: false - }); -}); -//]]> -</script> - <?php } } } diff --git a/tbl_select.php b/tbl_select.php index dacf59c..08bc546 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -201,33 +201,16 @@ if (!isset($param) || $param[0] == '') { echo ' </select>' . "\n"; } else { // o t h e r c a s e s + $the_class = 'textfield'; + $type = $fields_type[$i]; + if ($type == 'date') { + $the_class .= ' datefield'; + } elseif ($type == 'datetime' || substr($type, 0, 9) == 'timestamp') { + $the_class .= ' datetimefield'; + } echo ' <input type="text" name="fields[' . $i . ']"' - .' size="40" class="textfield" id="field_' . $i . '" />' . "\n"; + .' size="40" class="' . $the_class . '" id="field_' . $i . '" />' . "\n"; }; - $type = $fields_type[$i]; - if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') { - ?> -<script type="text/javascript"> -//<![CDATA[ -$(function() { - $('#field_<?php echo $i; ?>').datepicker({ - showOn: 'button', - buttonImage: '<?php echo $GLOBALS['pmaThemeImage'] . 'b_calendar.png'; ?>', - buttonImageOnly: true, - duration: '', - time24h: true, - stepMinutes: 1, - stepHours: 1, - <?php echo ($type == 'date' ? "showTime: false,":"showTime: true,"); ?> - dateFormat: 'yy-mm-dd', // yy means year with four digits - altTimeField: '', - constrainInput: false - }); -}); -//]]> -</script> - <?php - } ?> <input type="hidden" name="names[<?php echo $i; ?>]" value="<?php echo htmlspecialchars($fields_list[$i]); ?>" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-303-gd7854c2
by Marc Delisle 16 Jan '11

16 Jan '11

The branch, master has been updated via d7854c2dacb7d000eb2d722594490149fcf27017 (commit) from 46c412c99730967d12373c40b2cca0db7130e368 (commit) - Log ----------------------------------------------------------------- commit d7854c2dacb7d000eb2d722594490149fcf27017 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 16 10:07:08 2011 -0500 A height of 600 is better ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index e85e2cc..01ffac4 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -211,7 +211,7 @@ $(document).ready(function() { width: 800, // height is a workaround for this Chrome problem: // http://bugs.jqueryui.com/ticket/4671 - height: 700, + height: 600, modal: true, buttons: button_options }); //dialog options end hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-302-g46c412c
by Marc Delisle 15 Jan '11

15 Jan '11

The branch, master has been updated via 46c412c99730967d12373c40b2cca0db7130e368 (commit) from e7d9457431c6249334724958ef28832626aa4913 (commit) - Log ----------------------------------------------------------------- commit 46c412c99730967d12373c40b2cca0db7130e368 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 15 10:31:11 2011 -0500 Bug #3156485 Unable to add a new user using Google Chrome ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 1cf87ce..e85e2cc 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -209,6 +209,9 @@ $(document).ready(function() { .dialog({ title: PMA_messages['strAddNewUser'], width: 800, + // height is a workaround for this Chrome problem: + // http://bugs.jqueryui.com/ticket/4671 + height: 700, modal: true, buttons: button_options }); //dialog options end hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-301-ge7d9457
by Marc Delisle 15 Jan '11

15 Jan '11

The branch, master has been updated via e7d9457431c6249334724958ef28832626aa4913 (commit) from 2817ebe8e9b69c3ad7d29cfdb5a7ba8c7a949e13 (commit) - Log ----------------------------------------------------------------- commit e7d9457431c6249334724958ef28832626aa4913 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 15 09:23:57 2011 -0500 rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/server_privileges.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60985a1..3a7d64f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,7 @@ table even when phpMyAdmin configuration storage is not active - bug #3141327 [relation] Foreign key input options - [export] Better handling of export to PHP array. +- rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user 3.3.10.0 (not yet released) - patch #3147400 [structure] Aria table size printed as unknown, diff --git a/js/server_privileges.js b/js/server_privileges.js index f2458f7..1cf87ce 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -440,6 +440,20 @@ $(document).ready(function() { }) // end $.get })// end of the paginate users table + /* + * Additional confirmation dialog after clicking + * 'Drop the databases...' + */ + $('#checkbox_drop_users_db').click(function() { + $this_checkbox = $(this); + if ($this_checkbox.is(':checked')) { + var is_confirmed = confirm(PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\nDROP DATABASE'); + if (! is_confirmed) { + $this_checkbox.attr('checked', false); + } + } + }); + }, 'top.frame_content'); //end $(document).ready() /**#@- */ hooks/post-receive -- phpMyAdmin

1 0