Git February 2011

git@phpmyadmin.net

5 participants
230 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1618-gd296a52
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via d296a5222bff9913eedfb7a66efb7ac2809fe204 (commit) via d2991f71bd0d9dfebe5068e981d9e18c3f85699e (commit) via 83ce2fee572c734360fda99230b946d3fca14116 (commit) from 7148a7a38046ba91595ff1d9e4f49569fd84c2a9 (commit) - Log ----------------------------------------------------------------- commit d296a5222bff9913eedfb7a66efb7ac2809fe204 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Feb 2 22:55:10 2011 +0100 Avoid new lines between elements as this can lead to spaces commit d2991f71bd0d9dfebe5068e981d9e18c3f85699e Author: Michal Čihař <michal(a)cihar.com> Date: Wed Feb 2 22:54:40 2011 +0100 Tabs to spaces. commit 83ce2fee572c734360fda99230b946d3fca14116 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Feb 2 22:54:11 2011 +0100 Should use only inner width here ----------------------------------------------------------------------- Summary of changes: js/functions.js | 28 ++++++++++++++-------------- libraries/common.lib.php | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/js/functions.js b/js/functions.js index 6b291fe..9446485 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1846,13 +1846,13 @@ $(document).ready(function() { //User wants to add more fields to the table $.post($form.attr('action'), $form.serialize() + "&submit_num_fields=" + $(this).val(), function(data) { // if 'create_table_dialog' exists - if ($("#create_table_dialog").length > 0) { - $("#create_table_dialog").html(data); + if ($("#create_table_dialog").length > 0) { + $("#create_table_dialog").html(data); + } + // if 'create_table_div' exists + if ($("#create_table_div").length > 0) { + $("#create_table_div").html(data); } - // if 'create_table_div' exists - if ($("#create_table_div").length > 0) { - $("#create_table_div").html(data); - } }) //end $.post() }) // end create table form (add fields) @@ -2167,7 +2167,7 @@ $(document).ready(function() { // Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers) // if the table is not a view or information_schema (otherwise there is only one action to hide and there's no point) if($("input[type='hidden'][name='table_type']").val() == "table") { - var $table = $("table[id='tablestructure']"); + var $table = $("table[id='tablestructure']"); $table.find("td[class='browse']").remove(); $table.find("td[class='primary']").remove(); $table.find("td[class='unique']").remove(); @@ -2192,8 +2192,8 @@ $(document).ready(function() { // A hack for IE6 to prevent the after_field select element from being displayed on top of the dropdown by // positioning an iframe directly on top of it var $after_field = $("select[name='after_field']"); - $("iframe[class='IE_hack']") - .width($after_field.width()) + $("iframe[class='IE_hack']") + .width($after_field.width()) .height($after_field.height()) .offset({ top: $after_field.offset().top, @@ -2202,10 +2202,10 @@ $(document).ready(function() { // When "more" is hovered over, show the hidden actions $table.find("td[class='more_opts']") - .mouseenter(function() { + .mouseenter(function() { if($.browser.msie && $.browser.version == "6.0") { $("iframe[class='IE_hack']") - .show() + .show() .width($after_field.width()+4) .height($after_field.height()+4) .offset({ @@ -2220,8 +2220,8 @@ $(document).ready(function() { var left_offset_IE = $(this).offset().left + $(this).innerWidth() - $(this).children(".structure_actions_dropdown").innerWidth(); var top_offset_IE = $(this).offset().top + $(this).innerHeight(); $(this).children(".structure_actions_dropdown").offset({ - top: top_offset_IE, - left: left_offset_IE }); + top: top_offset_IE, + left: left_offset_IE }); } }) .mouseleave(function() { @@ -2265,7 +2265,7 @@ $(document).ready(function() { function menuResize() { var cnt = $('#topmenu'); - var wmax = cnt.width() - 5; // 5 px margin for jumping menu in Chrome + var wmax = cnt.innerWidth() - 5; // 5 px margin for jumping menu in Chrome var submenu = cnt.find('.submenu'); var submenu_w = submenu.outerWidth(true); var submenu_ul = submenu.find('ul'); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ac79a12..ca39131 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1723,7 +1723,7 @@ function PMA_generate_html_tabs($tabs, $url_params) .'<ul id="' . htmlentities($tag_id) . '">' . "\n"; foreach ($tabs as $tab) { - $tab_navigation .= PMA_generate_html_tab($tab, $url_params) . "\n"; + $tab_navigation .= PMA_generate_html_tab($tab, $url_params); } $tab_navigation .= hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1615-g7148a7a
by Madhura Jayaratne 02 Feb '11

02 Feb '11

The branch, master has been updated via 7148a7a38046ba91595ff1d9e4f49569fd84c2a9 (commit) via 3e4e3fb4d62e111a43b9830a1150e27ff62a3f78 (commit) from 7b73bd180cceb9f304ed742f925b3ace4277047f (commit) - Log ----------------------------------------------------------------- commit 7148a7a38046ba91595ff1d9e4f49569fd84c2a9 Merge: 3e4e3fb4d62e111a43b9830a1150e27ff62a3f78 7b73bd180cceb9f304ed742f925b3ace4277047f Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Feb 3 00:57:10 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 3e4e3fb4d62e111a43b9830a1150e27ff62a3f78 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Feb 3 00:51:58 2011 +0530 Bug # 3170585 [AJAX] Adding more fields fails. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 9 ++++++++- tbl_create.php | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index 164e98d..6b291fe 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1845,7 +1845,14 @@ $(document).ready(function() { //User wants to add more fields to the table $.post($form.attr('action'), $form.serialize() + "&submit_num_fields=" + $(this).val(), function(data) { - $("#create_table_dialog").html(data); + // if 'create_table_dialog' exists + if ($("#create_table_dialog").length > 0) { + $("#create_table_dialog").html(data); + } + // if 'create_table_div' exists + if ($("#create_table_div").length > 0) { + $("#create_table_div").html(data); + } }) //end $.post() }) // end create table form (add fields) diff --git a/tbl_create.php b/tbl_create.php index 4ba641e..6d569b5 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -288,7 +288,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= '<th>'; $new_table_string .= '<a href="sql.php' . PMA_generate_common_url($tbl_url_params) . '">'. $table . '</a>'; - + if (PMA_Tracker::isActive()) { $truename = str_replace(' ', ' ', htmlspecialchars($table)); if (PMA_Tracker::isTracked($db, $truename)) { @@ -313,7 +313,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= '<td><a class="drop_table_anchor" href="sql.php' . PMA_generate_common_url($tbl_url_params) . '&sql_query='; $new_table_string .= urlencode('DROP TABLE ' . PMA_backquote($table)); $new_table_string .= '">'; - $new_table_string .= $titles['Drop']; + $new_table_string .= $titles['Drop']; $new_table_string .= '</a></td>' . "\n"; $new_table_string .= '<td class="value">' . $tbl_stats['Rows'] . '</td>' . "\n"; @@ -362,7 +362,17 @@ if (isset($_REQUEST['do_save_data'])) { /** * Displays the form used to define the structure of the table */ + +// This div is used to show the content(eg: create table form with more columns) fetched with AJAX subsequently. +if($GLOBALS['is_ajax_request'] != true) { + echo('<div id="create_table_div">'); +} + require './libraries/tbl_properties.inc.php'; // Displays the footer require './libraries/footer.inc.php'; + +if($GLOBALS['is_ajax_request'] != true) { + echo('</div>'); +} ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 1737085b73354d9674851a4dc5d19c4a404122ee
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via 1737085b73354d9674851a4dc5d19c4a404122ee (commit) from d14870c950db799ee8835f74b703adf9c1388688 (commit) - Log ----------------------------------------------------------------- commit 1737085b73354d9674851a4dc5d19c4a404122ee Author: Michal Čihař <michal(a)cihar.com> Date: Wed Feb 2 20:16:04 2011 +0100 Add new file ----------------------------------------------------------------------- Summary of changes: {orig-docs => output/pt_BR}/INSTALL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) copy {orig-docs => output/pt_BR}/INSTALL (79%) diff --git a/orig-docs/INSTALL b/output/pt_BR/INSTALL similarity index 79% copy from orig-docs/INSTALL copy to output/pt_BR/INSTALL index bcc4965..376a241 100644 --- a/orig-docs/INSTALL +++ b/output/pt_BR/INSTALL @@ -1,4 +1,4 @@ -phpMyAdmin - Installation +phpMyAdmin - Instalação ========================= Please have a look to the Documentation.txt or Documentation.html files. hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. d208358d2d18deb1fd5b998ed8cd3a9ed3d519a7
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via d208358d2d18deb1fd5b998ed8cd3a9ed3d519a7 (commit) via d53cdc479d5a68c96f378586663f730785c992d7 (commit) via 1d2c6168a20ed5da62478ebd9831b3da53b61c0d (commit) via a9fd4a64ad26992b6ac6801ae5a6f60f6867a42e (commit) via e9faef42a2303a4cf54b13b47f9c23d558188268 (commit) via eb7a958d78724cf61cdd0e04df9ea720fe6277b7 (commit) via c7f144cc6d51f21102f9ae4c812ce0e3b4c5eabf (commit) via 97c1d32f8741a36abe232c540ae702f42dea96f8 (commit) via b173f245b6fadc831ec8430d9343a807941959a9 (commit) via d30561e8153b4cdb1536e5a202842efed2c57d05 (commit) via 68443da2f9f708b4174ad762f27f2a21da0b49a4 (commit) via e2047e0bd052976254e9d5b52a1f116fb1081c76 (commit) via c4b6316d43bb2e1bc81f9b532cf1a3ad5a215d0d (commit) via 450d521ace96dcc1b0f5e092c77ff75743ef9e21 (commit) via b3349c8f4eb7f15e331d3cf9015ffd78032f1c77 (commit) via b9cb67b67db4f358c4880919d82608626b2720dd (commit) via 1f33580f26dc8c6c60c6226fe2f976ef8099105e (commit) via d24ae31f8bc58b3a7a5baa7f7f326cee77caf31d (commit) via 55af01c80b399b06b770b237b815aa8b7c4d2404 (commit) via 0dda5516f8598e2f2758b185ead58c3dc74829d0 (commit) via 701b2c0be7512eb69a7f2723f4c70218fe761ccb (commit) via 52799ed1b163b71c6450c45740727c600b83ea05 (commit) via c88f5d868241f5eb02ae4f880b65a37ebe6fd9ed (commit) via 4c789845da3658b9251d0e32bce23f4471f80568 (commit) via 7b25c2c827e0edba2af1b32b2f958f2fbfe393f3 (commit) via bbfe451352389424f694952f4067f62f47067462 (commit) via 42a21320e4104ddd0b52b3285989b78502797e36 (commit) via 6f49fb39b68734fad36480de2c7ac42caf6226d9 (commit) via 3abc14a8cde76beb4081c8302b0f2aa95a9a262d (commit) via b19fd7313f3501701e915f35178402375467e0b3 (commit) via 832f6ba09bd0795b3a79006da419b76ee670257b (commit) via d7c76e38ac0e05a431c061aa89b8ab8038e7c1a1 (commit) via 488ef32a6762cc2b4e72c3cf6f6b845fc6a99560 (commit) via 1b5b8d35ca1863186bdf97fef3d8325e0026c03b (commit) via 26d112845dd999b03cd73403f4ab64a8fc324d6d (commit) via 564271a4b6c5721e6bce722e808564737aa3eb4f (commit) from 789b8199c92fb884123bf2ec89e9f16a51892261 (commit) - Log ----------------------------------------------------------------- commit d208358d2d18deb1fd5b998ed8cd3a9ed3d519a7 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:17:53 2011 +0200 Translation update done using Pootle. commit d53cdc479d5a68c96f378586663f730785c992d7 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:17:36 2011 +0200 Translation update done using Pootle. commit 1d2c6168a20ed5da62478ebd9831b3da53b61c0d Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:16:57 2011 +0200 Translation update done using Pootle. commit a9fd4a64ad26992b6ac6801ae5a6f60f6867a42e Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:16:25 2011 +0200 Translation update done using Pootle. commit e9faef42a2303a4cf54b13b47f9c23d558188268 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:16:05 2011 +0200 Translation update done using Pootle. commit eb7a958d78724cf61cdd0e04df9ea720fe6277b7 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:15:31 2011 +0200 Translation update done using Pootle. commit c7f144cc6d51f21102f9ae4c812ce0e3b4c5eabf Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:14:38 2011 +0200 Translation update done using Pootle. commit 97c1d32f8741a36abe232c540ae702f42dea96f8 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:14:15 2011 +0200 Translation update done using Pootle. commit b173f245b6fadc831ec8430d9343a807941959a9 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:14:03 2011 +0200 Translation update done using Pootle. commit d30561e8153b4cdb1536e5a202842efed2c57d05 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:13:52 2011 +0200 Translation update done using Pootle. commit 68443da2f9f708b4174ad762f27f2a21da0b49a4 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:12:55 2011 +0200 Translation update done using Pootle. commit e2047e0bd052976254e9d5b52a1f116fb1081c76 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:12:38 2011 +0200 Translation update done using Pootle. commit c4b6316d43bb2e1bc81f9b532cf1a3ad5a215d0d Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:12:23 2011 +0200 Translation update done using Pootle. commit 450d521ace96dcc1b0f5e092c77ff75743ef9e21 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:11:52 2011 +0200 Translation update done using Pootle. commit b3349c8f4eb7f15e331d3cf9015ffd78032f1c77 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:10:43 2011 +0200 Translation update done using Pootle. commit b9cb67b67db4f358c4880919d82608626b2720dd Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:09:51 2011 +0200 Translation update done using Pootle. commit 1f33580f26dc8c6c60c6226fe2f976ef8099105e Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:08:59 2011 +0200 Translation update done using Pootle. commit d24ae31f8bc58b3a7a5baa7f7f326cee77caf31d Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:08:37 2011 +0200 Translation update done using Pootle. commit 55af01c80b399b06b770b237b815aa8b7c4d2404 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:07:35 2011 +0200 Translation update done using Pootle. commit 0dda5516f8598e2f2758b185ead58c3dc74829d0 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:07:15 2011 +0200 Translation update done using Pootle. commit 701b2c0be7512eb69a7f2723f4c70218fe761ccb Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:06:47 2011 +0200 Translation update done using Pootle. commit 52799ed1b163b71c6450c45740727c600b83ea05 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:06:04 2011 +0200 Translation update done using Pootle. commit c88f5d868241f5eb02ae4f880b65a37ebe6fd9ed Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:05:24 2011 +0200 Translation update done using Pootle. commit 4c789845da3658b9251d0e32bce23f4471f80568 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:04:01 2011 +0200 Translation update done using Pootle. commit 7b25c2c827e0edba2af1b32b2f958f2fbfe393f3 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:03:05 2011 +0200 Translation update done using Pootle. commit bbfe451352389424f694952f4067f62f47067462 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:02:39 2011 +0200 Translation update done using Pootle. commit 42a21320e4104ddd0b52b3285989b78502797e36 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 20:01:27 2011 +0200 Translation update done using Pootle. commit 6f49fb39b68734fad36480de2c7ac42caf6226d9 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:59:12 2011 +0200 Translation update done using Pootle. commit 3abc14a8cde76beb4081c8302b0f2aa95a9a262d Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:58:35 2011 +0200 Translation update done using Pootle. commit b19fd7313f3501701e915f35178402375467e0b3 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:57:43 2011 +0200 Translation update done using Pootle. commit 832f6ba09bd0795b3a79006da419b76ee670257b Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:56:53 2011 +0200 Translation update done using Pootle. commit d7c76e38ac0e05a431c061aa89b8ab8038e7c1a1 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:55:35 2011 +0200 Translation update done using Pootle. commit 488ef32a6762cc2b4e72c3cf6f6b845fc6a99560 Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:53:52 2011 +0200 Translation update done using Pootle. commit 1b5b8d35ca1863186bdf97fef3d8325e0026c03b Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:48:00 2011 +0200 Translation update done using Pootle. commit 26d112845dd999b03cd73403f4ab64a8fc324d6d Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:45:54 2011 +0200 Translation update done using Pootle. commit 564271a4b6c5721e6bce722e808564737aa3eb4f Author: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Wed Feb 2 19:44:27 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 142 ++++++++++++++++++++++++---------------------------------- 1 files changed, 59 insertions(+), 83 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index c2527bf..ed1a95c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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-28 19:52+0100\n" -"PO-Revision-Date: 2010-08-22 22:13+0200\n" +"PO-Revision-Date: 2011-02-02 20:17+0200\n" "Last-Translator: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com>\n" "Language-Team: none\n" "Language: pt_BR\n" @@ -20,19 +20,17 @@ msgstr "" #. type: Content of: <html><head><title> #: orig-docs/Documentation.html:12 -#, fuzzy msgid "phpMyAdmin @@VER@@ - Documentation" -msgstr "Documentação do phpMyAdmin " +msgstr "phpMyAdmin @@VER@@ - Documentação" #. type: Content of: <html><body><div><h1> #: orig-docs/Documentation.html:19 -#, fuzzy msgid "" "<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</" "span></a> @@VER@@ Documentation" msgstr "" -"Documentação do <a href=\"http://www.phpmyadmin.net/\">php<span class=" -"\"myadmin\">MyAdmin</span></a> 3.4.0-dev" +"Documentação do <a href=\"http://www.phpmyadmin.net/\">php<span " +"class=\"myadmin\">MyAdmin</span></a> @@VER@@" #. type: Content of: <html><body><ul><li> #: orig-docs/Documentation.html:27 @@ -168,13 +166,12 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:66 -#, fuzzy msgid "" "For proper support of multibyte strings (eg. UTF-8, which is currently the " "default), you should install the mbstring and ctype extensions." msgstr "" -"Para obter suporte adequado a strings multibyte (por exemplo, UTF-8, que é o " -"padrão atual), instale as extensões mbstring e ctype." +"Para obter suporte adequado à strings multibyte (por exemplo, UTF-8, que é o " +"padrão atual), você deve instalar as extensões mbstring e ctype." #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:70 @@ -406,12 +403,13 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:140 -#, fuzzy msgid "" "communicate in <a href=\"http://www.phpmyadmin.net/home_page/translations.php" "\">62 different languages</a>" msgstr "" -"comunicar-se em <a href=\"./translators.html\">58 idiomas diferentes</a>;" +"comunicar-se em <a " +"href=\"http://www.phpmyadmin.net/home_page/translations.php\">62 idiomas " +"diferentes</a>;" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:142 @@ -1990,9 +1988,9 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:848 -#, fuzzy, no-wrap +#, no-wrap msgid "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';" -msgstr "$cfg['Servers'][$i]['hide_db'] = '(db1|db2)';" +msgstr "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:849 @@ -2575,12 +2573,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1139 -#, fuzzy msgid "" "<span id=\"cfg_Servers_userconfig\">$cfg['Servers'][$i]['userconfig']</span> " "string" msgstr "" -"<span id=\"cfg_Servers_user\">$cfg['Servers'][$i]['user']</span> string" +"<span id=\"cfg_Servers_userconfig\">$cfg['Servers'][$i]['userconfig']</span> " +"string" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1142 @@ -2984,9 +2982,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1298 -#, fuzzy msgid "$cfg['AjaxEnable'] boolean" -msgstr "$cfg['BrowseMarkerEnable'] booleano" +msgstr "$cfg['AjaxEnable'] booleano" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1299 @@ -3100,9 +3097,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1341 -#, fuzzy msgid "$cfg['MemoryLimit'] string [number of bytes]" -msgstr "$cfg['MemoryLimit'] inteiro [número de bytes]" +msgstr "$cfg['MemoryLimit'] string [número de bytes]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1342 @@ -3476,9 +3472,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1494 -#, fuzzy msgid "$cfg['LeftDisplayTableFilterMinimum'] integer" -msgstr "$cfg['LeftDisplayServers'] booleano" +msgstr "$cfg['LeftDisplayTableFilterMinimum'] inteiro" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1496 @@ -4297,9 +4292,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1806 -#, fuzzy msgid "$cfg['NaviDatabaseNameColor'] string [CSS color]" -msgstr "$cfg['NaviDatabaseNameColor'] string [código CSS válido]" +msgstr "$cfg['NaviDatabaseNameColor'] string [cor CSS]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1808 @@ -4339,10 +4333,8 @@ msgstr "$cfg['ThBackground'] string [código CSS válido para o fundo]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1820 -#, fuzzy msgid "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [CSS color]" -msgstr "" -"<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [cor CSS válida]" +msgstr "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [cor CSS]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1821 @@ -4353,9 +4345,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1824 -#, fuzzy msgid "$cfg['BgOne'] string [CSS color]" -msgstr "$cfg['BgOne'] string [cor HTML]" +msgstr "$cfg['BgOne'] string [cor CSS]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1825 @@ -4366,9 +4357,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1828 -#, fuzzy msgid "$cfg['BgTwo'] string [CSS color]" -msgstr "$cfg['BgTwo'] string [cor HTML]" +msgstr "$cfg['BgTwo'] string [cor CSS]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1829 @@ -4379,43 +4369,39 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1832 -#, fuzzy msgid "" "<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" "span>string [CSS color]" msgstr "" -"<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" -"span>string [cor HTML]" +"<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] " +"</span>string [cor CSS]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1833 -#, fuzzy msgid "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " "[CSS color]" msgstr "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " -"[cor HTML]" +"[cor CSS]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1834 -#, fuzzy msgid "" "<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" "span>string [CSS color]" msgstr "" -"<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" -"span>string [cor HTML]" +"<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] " +"</span>string [cor CSS]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1835 -#, fuzzy msgid "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " "[CSS color]" msgstr "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " -"[cor HTML]" +"[cor CSS]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1837 @@ -4877,9 +4863,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2050 -#, fuzzy msgid "$cfg['Export']['method'] string" -msgstr "$cfg['ThemePath'] string" +msgstr "$cfg['Export']['method'] string" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2052 @@ -5112,9 +5097,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2158 -#, fuzzy msgid "$cfg['UserprefsDisallow'] array" -msgstr "$cfg['Servers'] matriz" +msgstr "$cfg['UserprefsDisallow'] matriz" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2159 @@ -6079,9 +6063,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2548 -#, fuzzy msgid "<code>info</code>" -msgstr "<code>userID</code>" +msgstr "<code>info</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2549 @@ -9548,9 +9531,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4276 -#, fuzzy msgid "<code>@FIELDS@</code>" -msgstr "<code>@VERBOSE@</code>" +msgstr "<code>@FIELDS@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4277 @@ -9652,13 +9634,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4326 -#, fuzzy msgid "" "<a href=\"https://sourceforge.net/projects/phpmyadmin/forums\"> https://" "sourceforge.net/projects/phpmyadmin/forums</a>." msgstr "" -"<a href=\"https://sourceforge.net/projects/phpmyadmin/\">Página do projeto " -"phpMyAdmin no SourceForge</a>" +"<a href=\"https://sourceforge.net/projects/phpmyadmin/forums\"> " +"https://sourceforge.net/projects/phpmyadmin/forums</a>." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4331 @@ -10080,7 +10061,7 @@ msgstr "Direitos autorais" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:4551 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n" "Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n" @@ -10096,13 +10077,16 @@ msgstr "" "Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n" "Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n" " Olivier Müller <om_at_omnis.ch>\n" -" Robin Johnson <robbat2_at_users.sourceforge.net>\n" +" Robin Johnson " +"<robbat2_at_users.sourceforge.net>\n" " Alexander M. Turek <me_at_derrabus.de>\n" -" Michal Čihař <michal_at_cihar.com>\n" +" Michal Čihař <michal_at_cihar.com>\n" " Garvin Hicking <me_at_supergarv.de>\n" " Michael Keck <mkkeck_at_users.sourceforge.net>\n" -" Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" -" [veja os <a href=\"#credits\">créditos</a> para mais detalhes]\n" +" Sebastian Mendel " +"<cybot_tm_at_users.sourceforge.net>\n" +" [veja os <a href=\"#credits\">créditos</a> para mais " +"detalhes]\n" #. #-#-#-#-# pt_BR-html.pot (phpMyAdmin documentation VERSION) #-#-#-#-# #. type: Content of: <html><body><div><p> @@ -10686,9 +10670,8 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4792 -#, fuzzy msgid "Piotr Przybylski (Google Summer of Code 2008 and 2010)" -msgstr "Piotr Przybylski (Google Summer of Code 2008)" +msgstr "Piotr Przybylski (Google Summer of Code 2008 e 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4794 @@ -10742,9 +10725,8 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4818 -#, fuzzy msgid "Muhammad Adnan (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Muhammad Adnan (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4820 @@ -10753,15 +10735,13 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4823 -#, fuzzy msgid "Lori Lee (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Lori Lee (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4825 -#, fuzzy msgid "User interface improvements" -msgstr "melhorias na interface" +msgstr "Melhorias na interface de usuário" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4826 @@ -10775,9 +10755,8 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4830 -#, fuzzy msgid "Ninad Pundalik (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Ninad Pundalik (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4832 @@ -10786,9 +10765,8 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4835 -#, fuzzy msgid "Martynas Mickevičius (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Martynas Mickevičius (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4837 @@ -10808,9 +10786,8 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4845 -#, fuzzy msgid "Ankit Gupta (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Ankit Gupta (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4847 @@ -11581,9 +11558,9 @@ msgstr "-->" #. type: Title = #: orig-docs/INSTALL:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Installation" -msgstr "Documentação do phpMyAdmin " +msgstr "phpMyAdmin - Instalação" #. type: Plain text #: orig-docs/INSTALL:5 @@ -11596,11 +11573,9 @@ msgstr "" #. type: Title = #: orig-docs/TODO:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Todo" -msgstr "" -"phpMyAdmin - Tarefas\n" -"====================\n" +msgstr "phpMyAdmin - Tarefas" #. type: Plain text #: orig-docs/TODO:5 @@ -11621,15 +11596,14 @@ msgstr "-- swix/20010704" #. type: Title = #: orig-docs/README:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Readme" -msgstr "Documentação do phpMyAdmin " +msgstr "phpMyAdmin - Leia-me" #. type: Plain text #: orig-docs/README:5 -#, fuzzy msgid "Version @@VER@@" -msgstr "Pérsa" +msgstr "Versão @@VER@@" #. type: Plain text #: orig-docs/README:7 @@ -11640,15 +11614,17 @@ msgstr " Um conjunto de scripts PHP para gerenciar o MySQL pela web.\n" #. type: Plain text #: orig-docs/README:9 msgid "http://www.phpmyadmin.net/" -msgstr "" +msgstr "http://www.phpmyadmin.net/" #. type: Plain text #: orig-docs/README:15 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 1998-2000\n" " Tobias Ratschiller <tobias_at_ratschiller.com>\n" -msgstr "Tobias Ratschiller <tobias_at_ratschiller.com>" +msgstr "" +"Copyright (C) 1998-2000\n" +" Tobias Ratschiller <tobias_at_ratschiller.com>\n" #. type: Plain text #: orig-docs/README:26 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1613-g7b73bd1
by Marc Delisle 02 Feb '11

02 Feb '11

The branch, master has been updated via 7b73bd180cceb9f304ed742f925b3ace4277047f (commit) from f80b603a5499ce2d2ba219525cccce17cfdcdf8c (commit) - Log ----------------------------------------------------------------- commit 7b73bd180cceb9f304ed742f925b3ace4277047f Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 2 12:59:02 2011 -0500 Conditional Ajax for change password form ----------------------------------------------------------------------- Summary of changes: js/functions.js | 3 ++- libraries/display_change_password.lib.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index 12831a1..164e98d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2007,8 +2007,9 @@ $(document).ready(function() { * Attach Ajax event handler for Change Password form submission * * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ - $("#change_password_form").find('input[name=change_pw]').live('click', function(event) { + $("#change_password_form.ajax").find('input[name=change_pw]').live('click', function(event) { event.preventDefault(); /** diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index e7bdad2..4dcb2c9 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -19,7 +19,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) // Displays the form ?> -<form method="post" id="change_password_form" action="<?php echo $GLOBALS['PMA_PHP_SELF']; ?>" name="chgPassword" onsubmit="return checkPassword(this)"> + <form method="post" id="change_password_form" action="<?php echo $GLOBALS['PMA_PHP_SELF']; ?>" name="chgPassword" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="ajax" ' : ''); ?> onsubmit="return checkPassword(this)"> <?php echo PMA_generate_common_hidden_inputs(); if (strpos($GLOBALS['PMA_PHP_SELF'], 'server_privileges') !== false) { echo '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1612-gf80b603
by Marc Delisle 02 Feb '11

02 Feb '11

The branch, master has been updated via f80b603a5499ce2d2ba219525cccce17cfdcdf8c (commit) via a3e0bc02239f029a30822906a3b15a601213405c (commit) via 215fe10af1cfa2f8d4af59e114d7b806443a7ad4 (commit) from 3a3f6d5141c58a31924d915c43b1b7968792303b (commit) - Log ----------------------------------------------------------------- commit f80b603a5499ce2d2ba219525cccce17cfdcdf8c Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 2 12:53:20 2011 -0500 Conditional Ajax for password change commit a3e0bc02239f029a30822906a3b15a601213405c Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 2 12:42:46 2011 -0500 Conditional Ajax for create db commit 215fe10af1cfa2f8d4af59e114d7b806443a7ad4 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 2 12:35:06 2011 -0500 Add comment about conditional Ajax ----------------------------------------------------------------------- Summary of changes: js/db_search.js | 1 + js/functions.js | 7 +++++-- libraries/display_create_database.lib.php | 2 +- main.php | 14 ++++++++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/js/db_search.js b/js/db_search.js index 41ea5e6..0a82a8f 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -51,6 +51,7 @@ $(document).ready(function() { * (see $GLOBALS['cfg']['AjaxEnable']) * * @uses PMA_ajaxShowMessage() + * @see $GLOBALS['cfg']['AjaxEnable'] */ $("#db_search_form.ajax").live('submit', function(event) { event.preventDefault(); diff --git a/js/functions.js b/js/functions.js index 24dc0a3..12831a1 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1900,6 +1900,7 @@ $(document).ready(function() { * @uses PMA_ajaxShowMessage() * @uses window.parent.refreshNavigation() * @uses window.parent.refreshMain() + * @see $cfg['AjaxEnable'] */ $(document).ready(function() { $("#drop_db_anchor").live('click', function(event) { @@ -1928,10 +1929,11 @@ $(document).ready(function() { * display_create_database.lib.php is used, ie main.php and server_databases.php * * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $(document).ready(function() { - $('#create_database_form').live('submit', function(event) { + $('#create_database_form.ajax').live('submit', function(event) { event.preventDefault(); $form = $(this); @@ -1977,8 +1979,9 @@ $(document).ready(function() { /** * Attach Ajax event handler on the change password anchor + * @see $cfg['AjaxEnable'] */ - $('#change_password_anchor').live('click', function(event) { + $('#change_password_anchor.ajax').live('click', function(event) { event.preventDefault(); /** diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index 17ebfae..07db1f7 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -17,7 +17,7 @@ require_once './libraries/check_user_privileges.lib.php'; if ($is_create_db_priv) { // The user is allowed to create a db ?> - <form method="post" action="db_create.php" id="create_database_form" ><strong> + <form method="post" action="db_create.php" id="create_database_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="ajax" ' : ''); ?>><strong> <?php echo '<label for="text_create_db">' . __('Create new database') . '</label> ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br /> <?php echo PMA_generate_common_hidden_inputs('', '', 5); ?> <input type="hidden" name="reload" value="1" /> diff --git a/main.php b/main.php index 62fbc04..8818033 100644 --- a/main.php +++ b/main.php @@ -88,8 +88,13 @@ if ($server > 0 // Logout for advanced authentication if ($cfg['Server']['auth_type'] != 'config') { if ($cfg['ShowChgPassword']) { + if ($GLOBALS['cfg']['AjaxEnable']) { + $conditional_class = 'ajax'; + } else { + $conditional_class = null; + } PMA_printListItem(__('Change password'), 'li_change_password', - './user_password.php?' . $common_url_query, null, null, 'change_password_anchor'); + './user_password.php?' . $common_url_query, null, null, 'change_password_anchor', null, $conditional_class); } } // end if if (PMA_MYSQL_MAJOR_VERSION < 2009) { @@ -360,8 +365,10 @@ if ($cfg['SuhosinDisableWarning'] == false && @ini_get('suhosin.request.max_valu * @param string $mysql_help_page display a link to MySQL's manual * @param string $target special target for $url * @param string $a_id id for the anchor, used for jQuery to hook in functions + * @param string $class class for the li element + * @param string $a_class class for the anchor element */ -function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null, $class = null) +function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null, $class = null, $a_class = null) { echo '<li id="' . $id . '"'; if (null !== $class) { @@ -376,6 +383,9 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu if (null != $a_id) { echo ' id="' . $a_id .'"'; } + if (null != $a_class) { + echo ' class="' . $a_class .'"'; + } echo '>'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1609-g3a3f6d5
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via 3a3f6d5141c58a31924d915c43b1b7968792303b (commit) from b4995e3b5b49f1cd18553c32935e32787ac5f3cc (commit) - Log ----------------------------------------------------------------- commit 3a3f6d5141c58a31924d915c43b1b7968792303b Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 16:59:19 2011 +0100 Show SQL query on binlog page ----------------------------------------------------------------------- Summary of changes: server_binlog.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server_binlog.php b/server_binlog.php index 4e84b69..a499dab 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -130,7 +130,7 @@ if (count($binary_logs) > 1) { echo '</form>'; } -PMA_Message::success()->display(); +PMA_showMessage(PMA_Message::success()); /** * Displays the page hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1608-gb4995e3
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via b4995e3b5b49f1cd18553c32935e32787ac5f3cc (commit) from fc86057b861abd478689d929c123c2e78a1bb45f (commit) - Log ----------------------------------------------------------------- commit b4995e3b5b49f1cd18553c32935e32787ac5f3cc Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 16:49:25 2011 +0100 Also here exclude size of image ----------------------------------------------------------------------- Summary of changes: server_binlog.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/server_binlog.php b/server_binlog.php index 2126bc8..4e84b69 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -168,7 +168,6 @@ if ($dontlimitchars) { <a href="./server_binlog.php<?php echo PMA_generate_common_url($this_url_params); ?>" title="<?php __('Truncate Shown Queries'); ?>"> <img src="<?php echo $pmaThemeImage; ?>s_partialtext.png" - width="50" height="20" border="0" alt="<?php echo __('Truncate Shown Queries'); ?>" /></a> <?php } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1607-gfc86057
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via fc86057b861abd478689d929c123c2e78a1bb45f (commit) via a0e72168efcda25c38b54e9c559562fb308d6ffb (commit) via 38b4d8fd184008969b7324f13176260068878eba (commit) from c7c774f7b8f2bb8028f56e1fd2ae59a8d42a6e2f (commit) - Log ----------------------------------------------------------------- commit fc86057b861abd478689d929c123c2e78a1bb45f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 16:46:34 2011 +0100 Also here exclude size of image commit a0e72168efcda25c38b54e9c559562fb308d6ffb Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 16:40:52 2011 +0100 Whitespace cleanup commit 38b4d8fd184008969b7324f13176260068878eba Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 16:40:48 2011 +0100 Use caption instead of tr/th for table caption ----------------------------------------------------------------------- Summary of changes: db_operations.php | 2 +- server_binlog.php | 1 - server_synchronize.php | 8 +++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/db_operations.php b/db_operations.php index 3e674cb..46591bc 100644 --- a/db_operations.php +++ b/db_operations.php @@ -297,7 +297,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { } /** - * Database has been successfully renamed/moved. If in an Ajax request, + * Database has been successfully renamed/moved. If in an Ajax request, * generate the output with {@link PMA_ajaxResponse} and exit */ if( $GLOBALS['is_ajax_request'] == true) { diff --git a/server_binlog.php b/server_binlog.php index 60a5b57..2126bc8 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -177,7 +177,6 @@ if ($dontlimitchars) { <a href="./server_binlog.php<?php echo PMA_generate_common_url($this_url_params); ?>" title="<?php __('Show Full Queries'); ?>"> <img src="<?php echo $pmaThemeImage; ?>s_fulltext.png" - width="50" height="20" border="0" alt="<?php echo __('Show Full Queries'); ?>" /></a> <?php } diff --git a/server_synchronize.php b/server_synchronize.php index 32a6cb5..b49aa9e 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1021,8 +1021,8 @@ if (isset($_REQUEST['synchronize_db'])) { if (isset($alter_str_array[$p])) { PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $p, true); - unset($alter_str_array[$p]); - } + unset($alter_str_array[$p]); + } if (! empty($add_column_array[$p])) { PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); @@ -1111,9 +1111,7 @@ if (isset($_REQUEST['synchronize_db'])) { } ?> <table id="serverconnection_<?php echo $type; ?>_remote" class="data"> - <tr> - <th colspan="2"><?php echo $database_header; ?></th> - </tr> + <caption class="tblHeaders"><?php echo $database_header; ?></caption> <tr class="odd"> <td colspan="2" style="text-align: center"> <select name="<?php echo $type; ?>_type" id="<?php echo $type; ?>_type" class="server_selector"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1604-gc7c774f
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via c7c774f7b8f2bb8028f56e1fd2ae59a8d42a6e2f (commit) from a0d08a33214dd14e407a4eefe587f3b618bc17c7 (commit) - Log ----------------------------------------------------------------- commit c7c774f7b8f2bb8028f56e1fd2ae59a8d42a6e2f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 16:19:10 2011 +0100 Fix Czech translation ----------------------------------------------------------------------- Summary of changes: po/cs.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/cs.po b/po/cs.po index 8d2888c..c81c796 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8769,7 +8769,7 @@ msgstr "Zobrazit graf dotazu" #: server_status.php:723 msgid "Note: Generating the query chart can take a long time." -msgstr "Poznámka: Generování dotazu může trvat dlouho." +msgstr "Poznámka: Generování grafu dotazu může trvat dlouho." #: server_status.php:867 msgid "Replication status" hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git February 2011