- Git - lists.phpmyadmin.net

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

17 Jun '11

The branch, master has been updated via d108ed6dab411e6ea6f0c329a610c7b55cc01ba9 (commit) via bbd815ad09a3612512f93fdf86e53b4f6c87ec46 (commit) via 77997946abbe72a37b123a70562829cd8f2a6b1a (commit) via 0e5a0659392d138d648bc394496fc213201bf282 (commit) via 11eb97869ab68321c3a49b13d5af6ed0b200ac0c (commit) via e751944c912712b1229f96e2182cb62fb435a2b2 (commit) via c02aa1ffbcf8252ac1f8adae115e5d0bb29c578e (commit) via 740bc5a99effebc0c20acc66d824dbd6ec6be7c4 (commit) via e26beaa2407d69196a8923e7dbec57754ba5d63a (commit) via 29d02320d7a22fea9fb6fa3dd0ecd0a6ffe166ab (commit) via e312a137364283aeb405444a357e3abffe128056 (commit) via 13b978b6b6934179b18305e0dcc633a233396e84 (commit) via 227fbd0dfa31abb65beec00d489bb72825115c72 (commit) via 91b4155d0e28c24e37d93b2fa849fb411039ba0c (commit) via 47420d08197c8413a55406c04225a1d862f6545c (commit) via cb27263db3714c974c12eeb24f366f5909a841d1 (commit) via 02d4d334796ff10ef5081961b249b84aa9c23e75 (commit) from c2726464132da46289b9a2fb8567122fc613750f (commit) - Log ----------------------------------------------------------------- commit d108ed6dab411e6ea6f0c329a610c7b55cc01ba9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 21:04:30 2011 +0200 Translation update done using Pootle. commit bbd815ad09a3612512f93fdf86e53b4f6c87ec46 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:49:50 2011 +0200 Translation update done using Pootle. commit 77997946abbe72a37b123a70562829cd8f2a6b1a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:49:25 2011 +0200 Translation update done using Pootle. commit 0e5a0659392d138d648bc394496fc213201bf282 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:54:31 2011 +0200 Translation update done using Pootle. commit 11eb97869ab68321c3a49b13d5af6ed0b200ac0c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:53:23 2011 +0200 Translation update done using Pootle. commit e751944c912712b1229f96e2182cb62fb435a2b2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:53:06 2011 +0200 Translation update done using Pootle. commit c02aa1ffbcf8252ac1f8adae115e5d0bb29c578e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:52:30 2011 +0200 Translation update done using Pootle. commit 740bc5a99effebc0c20acc66d824dbd6ec6be7c4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:52:04 2011 +0200 Translation update done using Pootle. commit e26beaa2407d69196a8923e7dbec57754ba5d63a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:51:37 2011 +0200 Translation update done using Pootle. commit 29d02320d7a22fea9fb6fa3dd0ecd0a6ffe166ab Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:51:01 2011 +0200 Translation update done using Pootle. commit e312a137364283aeb405444a357e3abffe128056 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:49:42 2011 +0200 Translation update done using Pootle. commit 13b978b6b6934179b18305e0dcc633a233396e84 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:49:29 2011 +0200 Translation update done using Pootle. commit 227fbd0dfa31abb65beec00d489bb72825115c72 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:49:18 2011 +0200 Translation update done using Pootle. commit 91b4155d0e28c24e37d93b2fa849fb411039ba0c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:49:09 2011 +0200 Translation update done using Pootle. commit 47420d08197c8413a55406c04225a1d862f6545c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:48:59 2011 +0200 Translation update done using Pootle. commit cb27263db3714c974c12eeb24f366f5909a841d1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:48:50 2011 +0200 Translation update done using Pootle. commit 02d4d334796ff10ef5081961b249b84aa9c23e75 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:47:31 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 15 +++++------ po/ja.po | 79 ++++++++++++++++++++++++++++++++----------------------------- po/tr.po | 9 +++---- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/po/es.po b/po/es.po index 8abc651..f8d8337 100644 --- a/po/es.po +++ b/po/es.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-06-13 11:22+0300\n" -"PO-Revision-Date: 2011-06-09 17:30+0200\n" +"PO-Revision-Date: 2011-06-15 22:49+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -3517,7 +3517,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1328 -#, fuzzy msgid "" "Name of PHP script to be sourced and executed to obtain login credentials. " "This is alternative approach to session based single signon. The script " @@ -3528,10 +3527,11 @@ msgid "" msgstr "" "Nombre del script PHP a ser cargado y ejecutado para obtener credenciales de " "inicio de sesión. Este es un enfoque alternativo para un inicio de sesión " -"único. El script necesita proveer una función <code>get_login_credentials</" -"code> que devuelva una lista de nombres de usuarios y contraseñas, aceptando " -"un sólo parámetro: el nombre de usuario actual (puede estar vacío). Revisa " -"<code>scripts/signon-script.php</code> para ver un ejemplo." +"único basado en sesiones. El script necesita proveer una función " +"<code>get_login_credentials</code> que devuelva una lista de nombres de " +"usuarios y contraseñas, aceptando un sólo parámetro: el nombre de usuario " +"actual (puede estar vacío). Revisa <code>scripts/signon-script.php</code> " +"para ver un ejemplo." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1335 @@ -9889,13 +9889,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3536 -#, fuzzy msgid "" "There is no reliable way to differentiate tables in CSV format. For the time " "being, you will have to break apart CSV files containing multiple tables." msgstr "" "No hay una forma confiable de diferenciar tablas en el formato CSV. Por el " -"momento necesitarás dividir los archivos CSV que contengan mas de una tabla." +"momento necesitarás dividir los archivos CSV que contengan más de una tabla." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3543 diff --git a/po/ja.po b/po/ja.po index 768b1e0..c597f42 100644 --- a/po/ja.po +++ b/po/ja.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-06-13 11:21+0300\n" -"PO-Revision-Date: 2011-06-14 12:02+0200\n" +"PO-Revision-Date: 2011-06-15 11:54+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: Japan <jp(a)li.org>\n" "Language: ja\n" @@ -301,15 +301,14 @@ msgid "" "abbr>, <abbr title=\"Microsoft Excel 97-2003 and Excel 2007\">Excel</abbr> " "and L<sup>A</sup>T<sub><big>E</big></sub>X formats" msgstr "" -"さまざまなフォーマットでデータをエクスポート<a href=\"#footnote_1\"><sup>1</" -"sup></a>：<abbr title=\"Comma Separated Values\">CSV</abbr>、<abbr title=" -"\"Extensible Markup Language\">XML</abbr>、<abbr title=\"ポータブル・ドキュメ" -"ント・フォーマット\">PDF</abbr>、<abbr title=\"International Standards " -"Organisation\">ISO</abbr>/<abbr title=\"International Electrotechnical " -"Commission\">IEC</abbr> 26300 (OpenDocument テキストおよびスプレッドシート)、" -"<abbr title=\"Microsoft Word 2000\">Word</abbr>、<abbr title=\"Microsoft " -"Excel 97-2003 および Excel 2007\">Excel</abbr>、L<sup>A</sup>T<sub><big>E</" -"big></sub>X" +"さまざまなフォーマットでデータをエクスポート<a href=\"#footnote_1\"><sup>1</sup></a>：<abbr " +"title=\"カンマ区切り\">CSV</abbr>、<abbr title=\"Extensible Markup " +"Language\">XML</abbr>、<abbr title=\"ポータブル・ドキュメント・フォーマット\">PDF</abbr>、<abbr " +"title=\"International Standards Organisation\">ISO</abbr>/<abbr " +"title=\"International Electrotechnical Commission\">IEC</abbr> 26300 " +"(OpenDocument テキストおよびスプレッドシート)、<abbr title=\"Microsoft Word " +"2000\">Word</abbr>、<abbr title=\"Microsoft Excel 97-2003 および Excel " +"2007\">Excel</abbr>、L<sup>A</sup>T<sub><big>E</big></sub>X" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:123 @@ -320,11 +319,11 @@ msgid "" "\"Comma Separated Values\">CSV</abbr>, and <abbr title=\"Server Query " "Language\">SQL</abbr> files" msgstr "" -"さまざまファイルよりデータおよび構造のインポートが行えます。<abbr title=" -"\"Microsoft Excel 97-2003 および Excel 2007\">Microsoft Excel</abbr>、" -"OpenDocument スプレッドシートにとどまらず、<abbr title=\"Extensible Markup " -"Language\">XML</abbr>、<abbr title=\"Comma Separated Values\">CSV</abbr>、も" -"ちろん <abbr title=\"Server Query Language\">SQL</abbr> ファイルも。" +"さまざまファイルよりデータおよび構造のインポートが行えます。<abbr title=\"Microsoft Excel 97-2003 および Excel " +"2007\">Microsoft Excel</abbr>、OpenDocument スプレッドシートにとどまらず、<abbr " +"title=\"Extensible Markup Language\">XML</abbr>、<abbr " +"title=\"カンマ区切り\">CSV</abbr>、もちろん <abbr title=\"Server Query " +"Language\">SQL</abbr> ファイルも。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:124 @@ -447,10 +446,9 @@ msgid "" "<tt>php.ini</tt>." msgstr "" "<sup>1)</sup> phpMyAdmin は、Zlib (<tt>--with-zlib</tt>)／Bzip2 (<tt>--with-" -"bz2</tt>) をサポートした PHP を利用すると、ダンプや <abbr title=\"comma " -"separated values\">CSV</abbr> エクスポートを（Zip、GZip -RFC 1952-、Bzip2 形" -"式で）圧縮できます。これらを適切に使用するには、<tt>php.ini</tt> の変更が必要" -"な場合もあります。" +"bz2</tt>) をサポートした PHP を利用すると、ダンプや <abbr title=\"カンマ区切り\">CSV</abbr> " +"エクスポートを（Zip、GZip -RFC 1952-、Bzip2 形式で）圧縮できます。これらを適切に使用するには、<tt>php.ini</tt> " +"の変更が必要な場合もあります。" #. type: Content of: <html><body><div><h2> #: orig-docs/Documentation.html:164 @@ -3387,6 +3385,9 @@ msgid "" "<tt>SHOW</tt> commands instead), because of speed issues when many databases " "are present. Currently used in some parts of the code, more to come." msgstr "" +"情報を取得するための <tt>INFORMATION_SCHEMA</tt> の使用を無効にします（代わりに <tt>SHOW</tt> " +"コマンドを使用します）。多くのデータベースが存在している場合に、<tt>INFORMATION_SCHEMA</tt> " +"は速度的な問題があります。現在は、コードの一部でしか使われていませんが、今後増えていきます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1318 @@ -3700,8 +3701,8 @@ msgid "" "Path for storing session data (<a href=\"http://php.net/session_save_path" "\">session_save_path PHP parameter</a>)." msgstr "" -"セッションデータを保存のためのパス（<a href=\"http://php.net/" -"session_save_path\">session_save_path PHP パラメータ</a>）" +"セッションデータを保存のためのパス（<a href=\"http://php.net/session_save_path\">PHP パラメータの " +"session_save_path</a>）" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1408 @@ -7467,9 +7468,8 @@ msgid "" "<a href=\"#faq1_7\">1.7 How can I GZip or Bzip a dump or a <abbr title=" "\"comma separated values\">CSV</abbr> export? It does not seem to work.</a>" msgstr "" -"<a href=\"#faq1_7\">1.7 どうすればダンプや <abbr title=\"comma separated " -"values\">CSV</abbr> エクスポートを GZip ないし Bzip 圧縮できるのでしょうか？ " -"動いていないようなんですが。</a>" +"<a href=\"#faq1_7\">1.7 どうすればダンプや <abbr title=\"カンマ区切り\">CSV</abbr> エクスポートを GZip " +"ないし Bzip 圧縮できるのでしょうか？動いていないようなんですが。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2711 @@ -10198,9 +10198,8 @@ msgid "" "row of data in a <abbr title=\"comma separated values\">CSV</abbr> exported " "file. </a>" msgstr "" -"<a href=\"#faq5_10\">5.10 Netscape 4.75 では <abbr title=\"comma separated " -"values\">CSV</abbr> エクスポートファイルの各データ行の間に空行が入ってしまい" -"ます。</a>" +"<a href=\"#faq5_10\">5.10 Netscape 4.75 では <abbr title=\"カンマ区切り\">CSV</abbr> " +"エクスポートファイルの各データ行の間に空行が入ってしまいます。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3774 @@ -10923,9 +10922,8 @@ msgid "" "No, it's MySQL that is doing <a href=\"http://dev.mysql.com/doc/en/silent-" "column-changes.html\">silent column type changing</a>." msgstr "" -"phpMyAdmin ではありません。MySQL が <a href=\"http://dev.mysql.com/doc/" -"refman/5.1/ja/silent-column-changes.html\">カラムの暗黙的な変更</a>を行ってい" -"るのです。" +"phpMyAdmin ではありません。MySQL が<a href=\"http://dev.mysql.com/doc/refman/5.1/ja" +"/silent-column-changes.html\">カラムの暗黙的な変更</a>を行っているのです。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4044 @@ -11542,12 +11540,11 @@ msgid "" "href=\"#cfg_TempDir\" class=\"configrule\">$cfg['TempDir']</a> to a place " "where the web server user can write (for example <tt>'./tmp'</tt>)." msgstr "" -"MS Excel では <abbr title=\"comma separated values\">CSV</abbr> 形式を使用す" -"ることができます。これなら特に設定もなく簡単に利用できますが、MS Excel のバー" -"ジョン 97 以降の形式での直接エクスポートも phpMyAdmin はサポートしています。" -"直接エクスポートを行うためには、ウェブサーバユーザで書き込みができる場所を " -"<a href=\"#cfg_TempDir\" class=\"configrule\">$cfg['TempDir']</a> に設定する" -"必要があります (例えば <tt>'./tmp'</tt>)。" +"MS Excel では <abbr title=\"カンマ区切り\">CSV</abbr> " +"形式を使用することができます。これなら特に設定もなく簡単に利用できますが、MS Excel のバージョン 97 以降の形式での直接エクスポートも " +"phpMyAdmin はサポートしています。直接エクスポートを行うためには、ウェブサーバユーザで書き込みができる場所を <a " +"href=\"#cfg_TempDir\" class=\"configrule\">$cfg['TempDir']</a> に設定する必要があります (例えば " +"<tt>'./tmp'</tt>)。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4290 @@ -11589,7 +11586,7 @@ msgstr "" #: orig-docs/Documentation.html:4306 msgid "" "<a href=\"#faq6_25\">6.25 How does BLOB streaming work in phpMyAdmin?</a>" -msgstr "<a href=\"#faq6_25\">6.25 どうしたら phpMyAdmin で BLOB ストリームを機能させられますか？</a" +msgstr "<a href=\"#faq6_25\">6.25 どうしたら phpMyAdmin で BLOB ストリームを機能させられますか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4308 @@ -12703,7 +12700,7 @@ msgstr "Korakot Chaovavanich <korakot_at_iname.com>" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4727 msgid ""insert as new row" feature" -msgstr "" +msgstr "「新しい行として挿入する」機能" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4730 @@ -12832,6 +12829,8 @@ msgid "" "Christophe Gesché from the "MySQL Form Generator for " "PHPMyAdmin" (http://sf.net/projects/phpmysqlformgen/)" msgstr "" +"Christophe Gesché "MySQL Form Generator for PHPMyAdmin" " +"(http://sf.net/projects/phpmysqlformgen/) から" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4778 @@ -13753,6 +13752,8 @@ msgid "" "<a href=\"http://www.wikipedia.org/wiki/MIME\">MIME (Multipurpose Internet " "Mail Extensions)</a> - an Internet Standard for the format of e-mail." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/MIME\">MIME (Multipurpose Internet Mail " +"Extensions)</a> - 多目的インターネットメール拡張のことで、電子メールフォーマット（書式）におけるインターネット標準。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5108 @@ -13874,6 +13875,8 @@ msgid "" "new research, innovations, and methodologies applicable to Internet " "technologies." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Request_for_Comments\">RFC (Request for " +"Comments)</a> - インターネット技術に適用される新しい研究、技術革新、方法論を書き連ねた文章。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5141 diff --git a/po/tr.po b/po/tr.po index 8d6f989..ceb64b4 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-06-13 11:22+0300\n" -"PO-Revision-Date: 2011-06-12 18:26+0200\n" +"PO-Revision-Date: 2011-06-16 21:04+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -3492,7 +3492,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1328 -#, fuzzy msgid "" "Name of PHP script to be sourced and executed to obtain login credentials. " "This is alternative approach to session based single signon. The script " @@ -3504,9 +3503,9 @@ msgstr "" "Kaynak olan ve oturum açma referansları sağlamak için çalıştırılan PHP " "betiğin adıdır. Bu alternatif, oturum tabanlı tek oturumu açma yaklaşımıdır. " "Betiğin, kullanıcı adı ve parola listesini döndüren, mevcut kulanıcı adının " -"(boş olabilir) tek parametresini kabul eden <code>get_login_credentials</" -"code> işlevini sağlaması gerekir. Örnek için <code>scripts/signon-script." -"php</code>'ye bakın." +"(boş olabilir) tek parametresini kabul eden " +"<code>get_login_credentials</code> işlevini sağlaması gerekir. Örnek için " +"<code>scripts/signon-script.php</code>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1335 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3867-g75f916f
by Michal Čihař 17 Jun '11

17 Jun '11

The branch, master has been updated via 75f916fd3c13333b655a72427d8158ce17c3995e (commit) via 14f8664272af543a16bb78a3c72e5cd64fae64b9 (commit) via bc19b678305a6ef1d9677122f56e389ceed5cd38 (commit) via f771e68a73dfca6199030c1598b23e92de50f64c (commit) via ab5d9b278a2360fcce78dd8a5b0142a46a14fa18 (commit) via 6f4b0f88d2e4bc85980a8650b395ba3083b288b0 (commit) from 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 (commit) - Log ----------------------------------------------------------------- commit 75f916fd3c13333b655a72427d8158ce17c3995e Merge: 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 14f8664272af543a16bb78a3c72e5cd64fae64b9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jun 17 09:11:36 2011 +0200 Merge remote-tracking branch 'tyron/master' Conflicts: server_status.php commit 14f8664272af543a16bb78a3c72e5cd64fae64b9 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jun 16 15:18:24 2011 +0200 some more code formatting commit bc19b678305a6ef1d9677122f56e389ceed5cd38 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jun 16 15:10:41 2011 +0200 forgot some css changes in original theme commit f771e68a73dfca6199030c1598b23e92de50f64c Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jun 16 15:05:08 2011 +0200 - Fix for: If the moseout event on the row highlighting fails to get called (e.g. when having html code in the row), the toggle class will wrongly assign the hover class next time the element is being hovered over - Better formatted PMA_createChart() commit ab5d9b278a2360fcce78dd8a5b0142a46a14fa18 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jun 16 15:03:04 2011 +0200 Cleaned up code commit 6f4b0f88d2e4bc85980a8650b395ba3083b288b0 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Wed Jun 15 20:36:58 2011 +0200 - Server variables that represent bytes are convert to a byte format (e.g. 16 EiB instead of 18,446,744,073,709,551,616) - A javascript code snippet that cuts off long strings (such as the optimizer_switch variable) so the whole table stays in view without scrolling. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 63 ++++++----- js/messages.php | 13 ++ js/server_status.js | 191 ++++++++++++++++++------------- js/server_variables.js | 132 +++++++++++++++------- libraries/server_variables_doc.php | 63 +++++----- server_status.php | 152 ++++++++++--------------- server_variables.php | 6 +- themes/original/css/theme_right.css.php | 19 +++ themes/pmahomme/css/theme_right.css.php | 33 +++++- 9 files changed, 401 insertions(+), 271 deletions(-) diff --git a/js/functions.js b/js/functions.js index 3418e51..e552b1a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -30,7 +30,6 @@ var codemirror_editor = false; var chart_activeTimeouts = new Object(); - /** * Add a hidden field to the form to indicate that this will be an * Ajax request (only if this hidden field does not exist) @@ -658,10 +657,10 @@ $(document).ready(function() { * so that it works also for pages reached via AJAX) */ $(document).ready(function() { - $('tr.odd, tr.even').live('hover',function() { + $('tr.odd, tr.even').live('hover',function(event) { var $tr = $(this); - $tr.toggleClass('hover'); - $tr.children().toggleClass('hover'); + $tr.toggleClass('hover',event.type=='mouseover'); + $tr.children().toggleClass('hover',event.type=='mouseover'); }); }) @@ -1391,31 +1390,41 @@ function PMA_createChart(passedSettings) { events: { load: function() { var thisChart = this; - var lastValue=null, curValue=null; - var numLoadedPoints=0, otherSum=0; + var lastValue = null, curValue = null; + var numLoadedPoints = 0, otherSum = 0; var diff; // No realtime updates for graphs that are being exported, and disabled when no callback is set - if(thisChart.options.chart.forExport==true || !passedSettings.realtime || !passedSettings.realtime.callback) return; + if(thisChart.options.chart.forExport == true || + ! passedSettings.realtime || + ! passedSettings.realtime.callback) return; thisChart.options.realtime.timeoutCallBack = function() { - $.get(passedSettings.realtime.url,{ajax_request:1, chart_data:1, type:passedSettings.realtime.type},function(data) { - curValue = jQuery.parseJSON(data); - //if(lastValue==null) lastValue = curValue; - - if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max; - else diff = parseInt(curValue.x - lastValue.x); - - thisChart.xAxis[0].setExtremes(thisChart.xAxis[0].getExtremes().min+diff, thisChart.xAxis[0].getExtremes().max+diff, false); - - passedSettings.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints); - - lastValue = curValue; - numLoadedPoints++; - - // Timeout has been cleared => don't start a new timeout - if(chart_activeTimeouts[container]==null) return; - chart_activeTimeouts[container] = setTimeout(thisChart.options.realtime.timeoutCallBack, thisChart.options.realtime.refreshRate); - + $.post(passedSettings.realtime.url, + { ajax_request: true, chart_data: 1, type: passedSettings.realtime.type }, + function(data) { + curValue = jQuery.parseJSON(data); + + if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max; + else diff = parseInt(curValue.x - lastValue.x); + + thisChart.xAxis[0].setExtremes( + thisChart.xAxis[0].getExtremes().min+diff, + thisChart.xAxis[0].getExtremes().max+diff, + false + ); + + passedSettings.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints); + + lastValue = curValue; + numLoadedPoints++; + + // Timeout has been cleared => don't start a new timeout + if(chart_activeTimeouts[container]==null) return; + + chart_activeTimeouts[container] = setTimeout( + thisChart.options.realtime.timeoutCallBack, + thisChart.options.realtime.refreshRate + ); }); } @@ -1449,8 +1458,8 @@ function PMA_createChart(passedSettings) { }, tooltip: { formatter: function() { - return '<b>'+ this.series.name +'</b><br/>'+ - Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) +'<br/>'+ + return '<b>' + this.series.name +'</b><br/>' + + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) + '<br/>' + Highcharts.numberFormat(this.y, 2); } }, diff --git a/js/messages.php b/js/messages.php index 01aede4..7ec366f 100644 --- a/js/messages.php +++ b/js/messages.php @@ -61,6 +61,8 @@ $js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users'); $js_messages['strClose'] = __('Close'); /* for server_status.js */ +$js_messages['strEdit'] = __('Edit'); + $js_messages['strLiveTrafficChart'] = __('Live traffic chart'); $js_messages['strLiveConnChart'] = __('Live conn./process chart'); $js_messages['strLiveQueryChart'] = __('Live query chart'); @@ -75,6 +77,17 @@ $js_messages['strThousandsSeperator'] = __(','); /* l10n: Decimal separator */ $js_messages['strDecimalSeperator'] = __('.'); +$js_messages['strChartKBSent'] = __('kB sent since last refresh'); +$js_messages['strChartKBReceived'] = __('kB received since last refresh'); +$js_messages['strChartServerTraffic'] = __('Server traffic (in kB)'); +$js_messages['strChartConnections'] = __('Connections since last refresh'); +$js_messages['strChartProcesses'] = __('Processes'); +$js_messages['strChartConnectionsTitle'] = __('Connections / Processes'); +$js_messages['strChartIssuedQueries'] = __('Issued queries since last refresh'); +$js_messages['strChartIssuedQueriesTitle'] = __('Issued queries'); + +$js_messages['strChartQueryPie'] = __('Query statistics'); + /* For inline query editing */ $js_messages['strGo'] = __('Go'); $js_messages['strCancel'] = __('Cancel'); diff --git a/js/server_status.js b/js/server_status.js index 4413c80..08b2b43 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -21,9 +21,13 @@ $(function() { return /^[0-9]?[0-9,\.]*\s?(k|M|G|T|%)?$/.test(s); }, format: function(s) { - var num = jQuery.tablesorter.formatFloat( s.replace(PMA_messages['strThousandsSeperator'],'').replace(PMA_messages['strDecimalSeperator'],'.') ); + var num = jQuery.tablesorter.formatFloat( + s.replace(PMA_messages['strThousandsSeperator'],'') + .replace(PMA_messages['strDecimalSeperator'],'.') + ); + var factor = 1; - switch (s.charAt(s.length-1)) { + switch (s.charAt(s.length - 1)) { case '%': factor = -2; break; // Todo: Complete this list (as well as in the regexp a few lines up) case 'k': factor = 3; break; @@ -31,7 +35,8 @@ $(function() { case 'G': factor = 9; break; case 'T': factor = 12; break; } - return num*Math.pow(10,factor); + + return num * Math.pow(10,factor); }, type: "numeric" }); @@ -45,12 +50,16 @@ $(function() { var odd_row=false; var text=''; // Holds filter text var queryPieChart = null; - /* Chart configuration */ + /* Chart configuration */ // Defines what the tabs are currently displaying (realtime or data) var tabStatus = new Object(); // Holds the current chart instances for each tab var tabChart = new Object(); + + $.ajaxSetup({ + cache:false + }); // Add tabs $('#serverStatusTabs').tabs({ @@ -69,12 +78,23 @@ $(function() { tabStatus[$(this).attr('id')] = 'static'; }); + // Handles refresh rate changing $('.statuslinks select').change(function() { var chart=tabChart[$(this).parents('div.ui-tabs-panel').attr('id')]; chart.options.realtime.refreshRate = 1000*parseInt(this.value); - chart.xAxis[0].setExtremes(new Date().getTime() - chart.options.realtime.numMaxPoints * chart.options.realtime.refreshRate, chart.xAxis[0].getExtremes().max, true); + + chart.xAxis[0].setExtremes( + new Date().getTime() - chart.options.realtime.numMaxPoints * chart.options.realtime.refreshRate, + chart.xAxis[0].getExtremes().max, + true + ); + + // Clear current timeout and set timeout with the new refresh rate clearTimeout(chart_activeTimeouts[chart.options.chart.renderTo]); - chart_activeTimeouts[chart.options.chart.renderTo] = setTimeout(chart.options.realtime.timeoutCallBack, chart.options.realtime.refreshRate); + chart_activeTimeouts[chart.options.chart.renderTo] = setTimeout( + chart.options.realtime.timeoutCallBack, + chart.options.realtime.refreshRate + ); }); // Ajax refresh of variables (always the first element in each tab) @@ -107,26 +127,32 @@ $(function() { if(tabstat=='static' || tabstat=='liveconnections') { var settings = { - series: [{name:'kB sent since last refresh',data:[]},{name:'kB received since last refresh',data:[]}], - title: {text:'Server traffic (in kB)'}, - realtime:{ url:'server_status.php?'+url_query, + series: [ + { name: PMA_messages['strChartKBSent'], data: [] }, + { name: PMA_messages['strChartKBReceived'], data: [] } + ], + title: { text: PMA_messages['strChartServerTraffic'] }, + realtime: { url:'server_status.php?' + url_query, type: 'traffic', - callback: function(chartObj, curVal, lastVal,numLoadedPoints) { + callback: function(chartObj, curVal, lastVal, numLoadedPoints) { if(lastVal==null) return; chartObj.series[0].addPoint( - { x:curVal.x, y:(curVal.y_sent-lastVal.y_sent)/1024}, - false, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: (curVal.y_sent - lastVal.y_sent) / 1024 }, + false, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); chartObj.series[1].addPoint( - { x:curVal.x, y:(curVal.y_received-lastVal.y_received)/1024}, - true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: (curVal.y_received - lastVal.y_received) / 1024 }, + true, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); } - } + } } setupLiveChart($tab,this,settings); - if(tabstat=='liveconnections') $tab.find('.statuslinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']); + if(tabstat == 'liveconnections') + $tab.find('.statuslinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']); tabStatus[$tab.attr('id')]='livetraffic'; } else { $(this).html(PMA_messages['strLiveTrafficChart']); @@ -141,28 +167,34 @@ $(function() { var $tab=$(this).parents('div.ui-tabs-panel'); var tabstat = tabStatus[$tab.attr('id')]; - if(tabstat=='static' || tabstat=='livetraffic') { + if(tabstat == 'static' || tabstat == 'livetraffic') { var settings = { - series: [{name:'Connections since last refresh', data:[]},{name:'Processes', data:[]}], - title: {text:'Connections / Processes'}, - realtime:{ url:'server_status.php?'+url_query, + series: [ + { name: PMA_messages['strChartConnections'], data: [] }, + { name: PMA_messages['strChartProcesses'], data: [] } + ], + title: { text: PMA_messages['strChartConnectionsTitle'] }, + realtime: { url:'server_status.php?'+url_query, type: 'proc', callback: function(chartObj, curVal, lastVal,numLoadedPoints) { if(lastVal==null) return; chartObj.series[0].addPoint( - { x:curVal.x, y:curVal.y_conn-lastVal.y_conn }, - false, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: curVal.y_conn - lastVal.y_conn }, + false, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); chartObj.series[1].addPoint( - { x:curVal.x, y:curVal.y_proc }, - true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: curVal.y_proc }, + true, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); } - } + } }; setupLiveChart($tab,this,settings); - if(tabstat=='livetraffic') $tab.find('.statuslinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']); + if(tabstat == 'livetraffic') + $tab.find('.statuslinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']); tabStatus[$tab.attr('id')]='liveconnections'; } else { $(this).html(PMA_messages['strLiveConnChart']); @@ -172,62 +204,63 @@ $(function() { return false; }); - // Live query charting + // Live query statistics $('.statuslinks a.livequeriesLink').click(function() { - var $tab=$(this).parents('div.ui-tabs-panel'); - var settings=null; + var $tab = $(this).parents('div.ui-tabs-panel'); + var settings = null; - if(tabStatus[$tab.attr('id')]=='static') { + if(tabStatus[$tab.attr('id')] == 'static') { settings = { - series: [{name:'Issued queries since last refresh', data:[]}], - title: {text:'Issued queries'}, + series: [ { name: PMA_messages['strChartIssuedQueries'], data: [] } ], + title: { text: PMA_messages['strChartIssuedQueriesTitle'] }, tooltip: { formatter:function() { return this.point.name; } }, - realtime:{ url:'server_status.php?'+url_query, + realtime: { url:'server_status.php?'+url_query, type: 'queries', callback: function(chartObj, curVal, lastVal,numLoadedPoints) { - if(lastVal==null) return; + if(lastVal == null) return; chartObj.series[0].addPoint( - { x:curVal.x, y:curVal.y-lastVal.y, name:sortedQueriesPointInfo(curVal,lastVal) }, - true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: curVal.y - lastVal.y, name: sortedQueriesPointInfo(curVal,lastVal) }, + true, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); } - } + } }; } else { $(this).html(PMA_messages['strLiveQueryChart']); } setupLiveChart($tab,this,settings); - tabStatus[$tab.attr('id')]='livequeries'; + tabStatus[$tab.attr('id')] = 'livequeries'; return false; }); function setupLiveChart($tab,link,settings) { - if(settings!=null) { + if(settings != null) { // Loading a chart with existing chart => remove old chart first - if(tabStatus[$tab.attr('id')]!='static') { - clearTimeout(chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]); - chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]=null; + if(tabStatus[$tab.attr('id')] != 'static') { + clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]); + chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"] = null; tabChart[$tab.attr('id')].destroy(); // Also reset the select list - $tab.find('.statuslinks select').get(0).selectedIndex=0; + $tab.find('.statuslinks select').get(0).selectedIndex = 0; } - if(!settings.chart) settings.chart = {}; - settings.chart.renderTo=$tab.attr('id')+"_chart_cnt"; + if(! settings.chart) settings.chart = {}; + settings.chart.renderTo = $tab.attr('id') + "_chart_cnt"; $tab.find('.tabInnerContent') .hide() - .after('<div style="clear:both; min-width:500px; height:400px; padding-bottom:80px;" id="'+$tab.attr('id')+'_chart_cnt"></div>'); - tabChart[$tab.attr('id')]=PMA_createChart(settings); + .after('<div class="liveChart" id="' + $tab.attr('id') + '_chart_cnt"></div>'); + tabChart[$tab.attr('id')] = PMA_createChart(settings); $(link).html(PMA_messages['strStaticData']); $tab.find('.statuslinks a.tabRefresh').hide(); $tab.find('.statuslinks select').show(); } else { - clearTimeout(chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]); - chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]=null; + clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]); + chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]=null; $tab.find('.tabInnerContent').show(); - $tab.find('div#'+$tab.attr('id')+'_chart_cnt').remove(); + $tab.find('div#'+$tab.attr('id') + '_chart_cnt').remove(); tabStatus[$tab.attr('id')]='static'; tabChart[$tab.attr('id')].destroy(); $tab.find('.statuslinks a.tabRefresh').show(); @@ -243,9 +276,10 @@ $(function() { }); $('#filterText').keyup(function(e) { - if($(this).val().length==0) textFilter=null; - else textFilter = new RegExp("(^|_)"+$(this).val(),'i'); - text=$(this).val(); + if($(this).val().length == 0) textFilter = null; + else textFilter = new RegExp("(^|_)" + $(this).val(),'i'); + + text = $(this).val(); filterVariables(); }); @@ -258,11 +292,11 @@ $(function() { function initTab(tab,data) { switch(tab.attr('id')) { case 'statustabs_traffic': - if(data!=null) tab.find('.tabInnerContent').html(data); + if(data != null) tab.find('.tabInnerContent').html(data); initTooltips(); break; case 'statustabs_queries': - if(data!=null) { + if(data != null) { queryPieChart.destroy(); tab.find('.tabInnerContent').html(data); } @@ -273,10 +307,9 @@ $(function() { cdata.push([key,parseInt(value)]); }); - queryPieChart=PMA_createChart({ + queryPieChart = PMA_createChart({ chart: { renderTo: 'serverstatusquerieschart' - }, title: { text:'', @@ -284,7 +317,7 @@ $(function() { }, series: [{ type:'pie', - name: 'Query statistics', + name: PMA_messages['strChartQueryPie'], data: cdata }], plotOptions: { @@ -293,20 +326,22 @@ $(function() { cursor: 'pointer', dataLabels: { enabled: true, - formatter: function() { - return '<b>'+ this.point.name +'</b><br> '+ Highcharts.numberFormat(this.percentage, 2) +' %'; + formatter: function() { + return '<b>'+ this.point.name +'</b><br/> ' + Highcharts.numberFormat(this.percentage, 2) + ' %'; } } } }, tooltip: { - formatter: function() { return '<b>'+ this.point.name +'</b><br/>'+Highcharts.numberFormat(this.y, 2)+'<br/>('+Highcharts.numberFormat(this.percentage, 2) +' %)'; } + formatter: function() { + return '<b>' + this.point.name + '</b><br/>' + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)'; + } } }); break; case 'statustabs_allvars': - if(data!=null) { + if(data != null) { tab.find('.tabInnerContent').html(data); filterVariables(); } @@ -329,7 +364,7 @@ $(function() { }); $('#serverstatusqueriesdetails tr:first th') - .append('<img class="sortableIcon" src="'+pma_theme_image+'cleardot.gif" alt="">'); + .append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">'); break; @@ -343,7 +378,7 @@ $(function() { }); $('#serverstatusvariables tr:first th') - .append('<img class="sortableIcon" src="'+pma_theme_image+'cleardot.gif" alt="">'); + .append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">'); break; } @@ -351,14 +386,14 @@ $(function() { /* Filters the status variables by name/category/alert in the variables tab */ function filterVariables() { - var useful_links=0; + var useful_links = 0; var section = text; - if(categoryFilter.length>0) section = categoryFilter; + if(categoryFilter.length > 0) section = categoryFilter; - if(section.length>1) { + if(section.length > 1) { $('#linkSuggestions span').each(function() { - if($(this).attr('class').indexOf('status_'+section)!=-1) { + if($(this).attr('class').indexOf('status_'+section) != -1) { useful_links++; $(this).css('display',''); } else { @@ -369,16 +404,16 @@ $(function() { }); } - if(useful_links>0) + if(useful_links > 0) $('#linkSuggestions').css('display',''); else $('#linkSuggestions').css('display','none'); odd_row=false; $('#serverstatusvariables th.name').each(function() { - if((textFilter==null || textFilter.exec($(this).text())) - && (!alertFilter || $(this).next().find('span.attention').length>0) - && (categoryFilter.length==0 || $(this).parent().hasClass('s_'+categoryFilter))) { - odd_row = !odd_row; + if((textFilter == null || textFilter.exec($(this).text())) + && (! alertFilter || $(this).next().find('span.attention').length>0) + && (categoryFilter.length == 0 || $(this).parent().hasClass('s_'+categoryFilter))) { + odd_row = ! odd_row; $(this).parent().css('display',''); if(odd_row) { $(this).parent().addClass('odd'); @@ -406,22 +441,22 @@ $(function() { if(value-lastQueries.pointInfo[key] > 0) { queryKeys.push(key); queryValues.push(value-lastQueries.pointInfo[key]); - sumTotal+=value-lastQueries.pointInfo[key]; + sumTotal += value-lastQueries.pointInfo[key]; } }); var numQueries = queryKeys.length; var pointInfo = '<b>' + PMA_messages['strTotal'] + ': ' + sumTotal + '</b><br>'; while(queryKeys.length > 0) { - max=0; - for(var i=0; i<queryKeys.length; i++) { + max = 0; + for(var i=0; i < queryKeys.length; i++) { if(queryValues[i] > max) { max = queryValues[i]; maxIdx = i; } } - if(numQueries > 8 && num>=6) - sumOther+=queryValues[maxIdx]; + if(numQueries > 8 && num >= 6) + sumOther += queryValues[maxIdx]; else pointInfo += queryKeys[maxIdx].substr(4).replace('_',' ') + ': ' + queryValues[maxIdx] + '<br>'; queryKeys.splice(maxIdx,1); diff --git a/js/server_variables.js b/js/server_variables.js index 1877ce7..11be3de 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -1,42 +1,92 @@ -$(function() { - var textFilter=null; - var odd_row=false; - - // Filter options are invisible for disabled js users - $('fieldset#tableFilter').css('display',''); - - $('#filterText').keyup(function(e) { - if($(this).val().length==0) textFilter=null; - else textFilter = new RegExp("(^| )"+$(this).val(),'i'); - filterVariables(); - }); - - function filterVariables() { - odd_row=false; - var mark_next=false; - var firstCell; - - $('table.filteredData tbody tr').each(function() { - firstCell = $(this).children(':first'); - - if(mark_next || textFilter==null || textFilter.exec(firstCell.text())) { - // If current row is 'marked', also display next row - if($(this).hasClass('marked') && !mark_next) - mark_next=true; - else mark_next=false; - - odd_row = !odd_row; - $(this).css('display',''); - if(odd_row) { - $(this).addClass('odd'); - $(this).removeClass('even'); - } else { - $(this).addClass('even'); - $(this).removeClass('odd'); - } - } else { - $(this).css('display','none'); - } - }); - } +$(function() { + var textFilter=null; + var odd_row=false; + var testString = 'abcdefghijklmnopqrstuvwxyz0123456789,ABCEFGHIJKLMOPQRSTUVWXYZ'; + var $tmpDiv; + var charWidth; + + /*** This code snippet takes care that the table stays readable. It cuts off long strings when the window is resized ***/ + $('table.data').after($tmpDiv=$('<span>'+testString+'</span>')); + charWidth = $tmpDiv.width() / testString.length; + $tmpDiv.remove(); + + $(window).resize(limitTableWidth); + limitTableWidth(); + + function limitTableWidth() { + var fulltext; + var charDiff; + var maxTableWidth; + var $tmpTable; + + $('table.data').after($tmpTable=$('<table id="testTable" style="width:100%;"><tr><td>'+testString+'</td></tr></table>')); + maxTableWidth = $('#testTable').width(); + $tmpTable.remove(); + charDiff = ($('table.data').width()-maxTableWidth) / charWidth; + + if($('body').innerWidth() < $('table.data').width()+10 || $('body').innerWidth() > $('table.data').width()+20) { + var maxChars=0; + + $('table.data tbody tr td:nth-child(2)').each(function() { + maxChars=Math.max($(this).text().length,maxChars); + }); + + // Do not resize smaller if there's only 50 chars displayed already + if(charDiff > 0 && maxChars < 50) return; + + $('table.data tbody tr td:nth-child(2)').each(function() { + if((charDiff>0 && $(this).text().length > maxChars-charDiff) || (charDiff<0 && $(this).find('abbr.cutoff').length>0)) { + if($(this).find('abbr.cutoff').length > 0) + fulltext = $(this).find('abbr.cutoff').attr('title'); + else { + fulltext = $(this).text(); + // Do not cut off elements with html in it and hope they are not too long + if(fulltext.length != $(this).html().length) return 0; + } + + if(fulltext.length < maxChars-charDiff) + $(this).html(fulltext); + else $(this).html('<abbr class="cutoff" title="'+fulltext+'">'+fulltext.substr(0,maxChars-charDiff-3)+'...</abbr>'); + } + }); + } + } + + // Filter options are invisible for disabled js users + $('fieldset#tableFilter').css('display',''); + + $('#filterText').keyup(function(e) { + if($(this).val().length==0) textFilter=null; + else textFilter = new RegExp("(^| )"+$(this).val(),'i'); + filterVariables(); + }); + + function filterVariables() { + odd_row=false; + var mark_next=false; + var firstCell; + + $('table.filteredData tbody tr').each(function() { + firstCell = $(this).children(':first'); + + if(mark_next || textFilter==null || textFilter.exec(firstCell.text())) { + // If current row is 'marked', also display next row + if($(this).hasClass('marked') && !mark_next) + mark_next=true; + else mark_next=false; + + odd_row = !odd_row; + $(this).css('display',''); + if(odd_row) { + $(this).addClass('odd'); + $(this).removeClass('even'); + } else { + $(this).addClass('even'); + $(this).removeClass('odd'); + } + } else { + $(this).css('display','none'); + } + }); + } }); \ No newline at end of file diff --git a/libraries/server_variables_doc.php b/libraries/server_variables_doc.php index 3e8faa8..ce81e89 100644 --- a/libraries/server_variables_doc.php +++ b/libraries/server_variables_doc.php @@ -6,6 +6,7 @@ * string $anchor: anchor to the documentation page * string $chapter: chapter of "HTML, one page per chapter" documentation * string $type: type of system variable + * string $format: if set to 'byte' it will format the variable with PMA_formatByteDown() */ $VARIABLE_DOC_LINKS = array(); $VARIABLE_DOC_LINKS['auto_increment_increment'] = array('auto_increment_increment','replication-options-master','sysvar'); @@ -16,11 +17,11 @@ $VARIABLE_DOC_LINKS['back_log'] = array('back_log','server-system-variables','sy $VARIABLE_DOC_LINKS['basedir'] = array('basedir','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['big_tables'] = array('big-tables','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['bind_address'] = array('bind-address','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['binlog_cache_size'] = array('binlog_cache_size','replication-options-binary-log','sysvar'); +$VARIABLE_DOC_LINKS['binlog_cache_size'] = array('binlog_cache_size','replication-options-binary-log','sysvar','byte'); $VARIABLE_DOC_LINKS['binlog_direct_non_transactional_updates'] = array('binlog_direct_non_transactional_updates','replication-options-binary-log','sysvar'); $VARIABLE_DOC_LINKS['binlog_format'] = array('binlog-format','server-options','sysvar'); -$VARIABLE_DOC_LINKS['binlog_stmt_cache_size'] = array('binlog_stmt_cache_size','replication-options-binary-log','sysvar'); -$VARIABLE_DOC_LINKS['bulk_insert_buffer_size'] = array('bulk_insert_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['binlog_stmt_cache_size'] = array('binlog_stmt_cache_size','replication-options-binary-log','sysvar','byte'); +$VARIABLE_DOC_LINKS['bulk_insert_buffer_size'] = array('bulk_insert_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['character_set_client'] = array('character_set_client','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['character_set_connection'] = array('character_set_connection','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['character_set_database'] = array('character_set_database','server-system-variables','sysvar'); @@ -84,11 +85,11 @@ $VARIABLE_DOC_LINKS['init_file'] = array('init-file','server-options','option_my $VARIABLE_DOC_LINKS['init_slave'] = array('init_slave','replication-options-slave','sysvar'); $VARIABLE_DOC_LINKS['innodb_adaptive_flushing'] = array('innodb_adaptive_flushing','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_adaptive_hash_index'] = array('innodb_adaptive_hash_index','innodb-parameters','sysvar'); -$VARIABLE_DOC_LINKS['innodb_additional_mem_pool_size'] = array('innodb_additional_mem_pool_size','innodb-parameters','sysvar'); +$VARIABLE_DOC_LINKS['innodb_additional_mem_pool_size'] = array('innodb_additional_mem_pool_size','innodb-parameters','sysvar','byte'); $VARIABLE_DOC_LINKS['innodb_autoextend_increment'] = array('innodb_autoextend_increment','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_autoinc_lock_mode'] = array('innodb_autoinc_lock_mode','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_buffer_pool_instances'] = array('innodb_buffer_pool_instances','innodb-parameters','sysvar'); -$VARIABLE_DOC_LINKS['innodb_buffer_pool_size'] = array('innodb_buffer_pool_size','innodb-parameters','sysvar'); +$VARIABLE_DOC_LINKS['innodb_buffer_pool_size'] = array('innodb_buffer_pool_size','innodb-parameters','sysvar','byte'); $VARIABLE_DOC_LINKS['innodb_change_buffering'] = array('innodb_change_buffering','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_checksums'] = array('innodb_checksums','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_commit_concurrency'] = array('innodb_commit_concurrency','innodb-parameters','sysvar'); @@ -107,8 +108,8 @@ $VARIABLE_DOC_LINKS['innodb_force_recovery'] = array('innodb_force_recovery','in $VARIABLE_DOC_LINKS['innodb_io_capacity'] = array('innodb_io_capacity','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_lock_wait_timeout'] = array('innodb_lock_wait_timeout','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_locks_unsafe_for_binlog'] = array('innodb_locks_unsafe_for_binlog','innodb-parameters','sysvar'); -$VARIABLE_DOC_LINKS['innodb_log_buffer_size'] = array('innodb_log_buffer_size','innodb-parameters','sysvar'); -$VARIABLE_DOC_LINKS['innodb_log_file_size'] = array('innodb_log_file_size','innodb-parameters','sysvar'); +$VARIABLE_DOC_LINKS['innodb_log_buffer_size'] = array('innodb_log_buffer_size','innodb-parameters','sysvar','byte'); +$VARIABLE_DOC_LINKS['innodb_log_file_size'] = array('innodb_log_file_size','innodb-parameters','sysvar','byte'); $VARIABLE_DOC_LINKS['innodb_log_files_in_group'] = array('innodb_log_files_in_group','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_log_group_home_dir'] = array('innodb_log_group_home_dir','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_max_dirty_pages_pct'] = array('innodb_max_dirty_pages_pct','innodb-parameters','sysvar'); @@ -138,15 +139,15 @@ $VARIABLE_DOC_LINKS['innodb_version'] = array('innodb_version','innodb-parameter $VARIABLE_DOC_LINKS['innodb_write_io_threads'] = array('innodb_write_io_threads','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['insert_id'] = array('insert_id','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['interactive_timeout'] = array('interactive_timeout','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['join_buffer_size'] = array('join_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['join_buffer_size'] = array('join_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['keep_files_on_create'] = array('keep_files_on_create','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['key_buffer_size'] = array('key_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['key_buffer_size'] = array('key_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['key_cache_age_threshold'] = array('key_cache_age_threshold','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['key_cache_block_size'] = array('key_cache_block_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['key_cache_block_size'] = array('key_cache_block_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['key_cache_division_limit'] = array('key_cache_division_limit','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['language'] = array('language','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['large_files_support'] = array('large_files_support','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['large_page_size'] = array('large_page_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['large_page_size'] = array('large_page_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['large_pages'] = array('large-pages','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['last_insert_id'] = array('last_insert_id','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['lc_messages'] = array('lc-messages','server-options','option_mysqld'); @@ -172,19 +173,19 @@ $VARIABLE_DOC_LINKS['lower_case_file_system'] = array('lower_case_file_system',' $VARIABLE_DOC_LINKS['lower_case_table_names'] = array('lower_case_table_names','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['master-bind'] = array('','replication-options',0); $VARIABLE_DOC_LINKS['max_allowed_packet'] = array('max_allowed_packet','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['max_binlog_cache_size'] = array('max_binlog_cache_size','replication-options-binary-log','sysvar'); -$VARIABLE_DOC_LINKS['max_binlog_size'] = array('max_binlog_size','replication-options-binary-log','sysvar'); -$VARIABLE_DOC_LINKS['max_binlog_stmt_cache_size'] = array('max_binlog_stmt_cache_size','replication-options-binary-log','sysvar'); +$VARIABLE_DOC_LINKS['max_binlog_cache_size'] = array('max_binlog_cache_size','replication-options-binary-log','sysvar','byte'); +$VARIABLE_DOC_LINKS['max_binlog_size'] = array('max_binlog_size','replication-options-binary-log','sysvar','byte'); +$VARIABLE_DOC_LINKS['max_binlog_stmt_cache_size'] = array('max_binlog_stmt_cache_size','replication-options-binary-log','sysvar','byte'); $VARIABLE_DOC_LINKS['max_connect_errors'] = array('max_connect_errors','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_connections'] = array('max_connections','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_delayed_threads'] = array('max_delayed_threads','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_error_count'] = array('max_error_count','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['max_heap_table_size'] = array('max_heap_table_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['max_heap_table_size'] = array('max_heap_table_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['max_insert_delayed_threads'] = array('max_insert_delayed_threads','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_join_size'] = array('max_join_size','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_length_for_sort_data'] = array('max_length_for_sort_data','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_prepared_stmt_count'] = array('max_prepared_stmt_count','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['max_relay_log_size'] = array('max_relay_log_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['max_relay_log_size'] = array('max_relay_log_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['max_seeks_for_key'] = array('max_seeks_for_key','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_sort_length'] = array('max_sort_length','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_sp_recursion_depth'] = array('max_sp_recursion_depth','server-system-variables','sysvar'); @@ -193,12 +194,12 @@ $VARIABLE_DOC_LINKS['max_user_connections'] = array('max_user_connections','serv $VARIABLE_DOC_LINKS['max_write_lock_count'] = array('max_write_lock_count','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['memlock'] = array('memlock','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['min_examined_row_limit'] = array('min-examined-row-limit','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['myisam_data_pointer_size'] = array('myisam_data_pointer_size','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['myisam_max_sort_file_size'] = array('myisam_max_sort_file_size','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['myisam_mmap_size'] = array('myisam_mmap_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['myisam_data_pointer_size'] = array('myisam_data_pointer_size','server-system-variables','sysvar','byte'); +$VARIABLE_DOC_LINKS['myisam_max_sort_file_size'] = array('myisam_max_sort_file_size','server-system-variables','sysvar','byte'); +$VARIABLE_DOC_LINKS['myisam_mmap_size'] = array('myisam_mmap_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['myisam_recover_options'] = array('myisam_recover_options','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['myisam_repair_threads'] = array('myisam_repair_threads','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['myisam_sort_buffer_size'] = array('myisam_sort_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['myisam_sort_buffer_size'] = array('myisam_sort_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['myisam_stats_method'] = array('myisam_stats_method','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['myisam_use_mmap'] = array('myisam_use_mmap','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['named_pipe'] = array('named_pipe','server-system-variables','sysvar'); @@ -234,25 +235,25 @@ $VARIABLE_DOC_LINKS['performance_schema_max_thread_instances'] = array('performa $VARIABLE_DOC_LINKS['pid_file'] = array('pid-file','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['plugin_dir'] = array('plugin_dir','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['port'] = array('port','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['preload_buffer_size'] = array('preload_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['preload_buffer_size'] = array('preload_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['profiling'] = array('profiling','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['profiling_history_size'] = array('profiling_history_size','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['protocol_version'] = array('protocol_version','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['proxy_user'] = array('proxy_user','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['pseudo_thread_id'] = array('pseudo_thread_id','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['query_alloc_block_size'] = array('query_alloc_block_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['query_alloc_block_size'] = array('query_alloc_block_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['query_cache_limit'] = array('query_cache_limit','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['query_cache_min_res_unit'] = array('query_cache_min_res_unit','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['query_cache_size'] = array('query_cache_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['query_cache_size'] = array('query_cache_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['query_cache_type'] = array('query_cache_type','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['query_cache_wlock_invalidate'] = array('query_cache_wlock_invalidate','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['query_prealloc_size'] = array('query_prealloc_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['query_prealloc_size'] = array('query_prealloc_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['rand_seed1'] = array('rand_seed1','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['rand_seed2'] = array('rand_seed2','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['range_alloc_block_size'] = array('range_alloc_block_size','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['read_buffer_size'] = array('read_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['range_alloc_block_size'] = array('range_alloc_block_size','server-system-variables','sysvar','byte'); +$VARIABLE_DOC_LINKS['read_buffer_size'] = array('read_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['read_only'] = array('read_only','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['read_rnd_buffer_size'] = array('read_rnd_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['read_rnd_buffer_size'] = array('read_rnd_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['relay-log-index'] = array('relay-log-index','replication-options-slave','option_mysqld'); $VARIABLE_DOC_LINKS['relay_log_index'] = array('relay_log_index','replication-options-slave','sysvar'); $VARIABLE_DOC_LINKS['relay_log_info_file'] = array('relay_log_info_file','replication-options-slave','sysvar'); @@ -291,7 +292,7 @@ $VARIABLE_DOC_LINKS['slow_launch_time'] = array('slow_launch_time','server-syste $VARIABLE_DOC_LINKS['slow_query_log'] = array('slow-query-log','server-options','server-system-variables'); $VARIABLE_DOC_LINKS['slow_query_log_file'] = array('slow_query_log_file','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['socket'] = array('socket','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['sort_buffer_size'] = array('sort_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['sort_buffer_size'] = array('sort_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['sql_auto_is_null'] = array('sql_auto_is_null','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['sql_big_selects'] = array('sql_big_selects','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['sql_big_tables'] = array('big-tables','server-options','server-system-variables'); @@ -332,10 +333,10 @@ $VARIABLE_DOC_LINKS['time_format'] = array('time_format','server-system-variable $VARIABLE_DOC_LINKS['time_zone'] = array('time_zone','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['timed_mutexes'] = array('timed_mutexes','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['timestamp'] = array('timestamp','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['tmp_table_size'] = array('tmp_table_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['tmp_table_size'] = array('tmp_table_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['tmpdir'] = array('tmpdir','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['transaction_alloc_block_size'] = array('transaction_alloc_block_size','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['transaction_prealloc_size'] = array('transaction_prealloc_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['transaction_alloc_block_size'] = array('transaction_alloc_block_size','server-system-variables','sysvar','byte'); +$VARIABLE_DOC_LINKS['transaction_prealloc_size'] = array('transaction_prealloc_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['tx_isolation'] = array('tx_isolation','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['unique_checks'] = array('unique_checks','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['updatable_views_with_limit'] = array('updatable_views_with_limit','server-system-variables','sysvar'); diff --git a/server_status.php b/server_status.php index 2c4739f..0811558 100644 --- a/server_status.php +++ b/server_status.php @@ -15,17 +15,17 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { define('PMA_NO_VARIABLES_IMPORT', true); } +if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) + $GLOBALS['is_header_sent'] = true; + require_once './libraries/common.inc.php'; /** * Ajax request */ -if (isset($_REQUEST['ajax_request'])) { - // Prevent ajax requests from being cached - header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 - header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past - // Send correct charset +if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { + // Send with correct charset header('Content-Type: text/html; charset=UTF-8'); // real-time charting data @@ -36,7 +36,12 @@ if (isset($_REQUEST['ajax_request'])) { $result = PMA_DBI_query('SHOW PROCESSLIST'); $num_procs = PMA_DBI_num_rows($result); - $ret = Array('x'=>(microtime(true)*1000),'y_proc'=>$num_procs,'y_conn'=>$c['Connections']); + $ret = array( + 'x' => microtime(true)*1000, + 'y_proc' => $num_procs, + 'y_conn' => $c['Connections'] + ); + exit(json_encode($ret)); case 'queries': $queries = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name LIKE "Com_%" AND Value>0', 0, 1); @@ -45,12 +50,22 @@ if (isset($_REQUEST['ajax_request'])) { unset($queries['Com_admin_commands']); $sum=array_sum($queries); - $ret = Array('x'=>(microtime(true)*1000),'y'=>$sum,'pointInfo'=>$queries); + $ret = array( + 'x' => microtime(true)*1000, + 'y' => $sum, + 'pointInfo' => $queries + ); + exit(json_encode($ret)); case 'traffic': $traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1); - $ret = Array('x'=>(microtime(true)*1000),'y_sent'=>$traffic['Bytes_sent'],'y_received'=>$traffic['Bytes_received']); + $ret = array( + 'x' => microtime(true)*1000, + 'y_sent' => $traffic['Bytes_sent'], + 'y_received' => $traffic['Bytes_received'] + ); + exit(json_encode($ret)); } @@ -294,17 +309,17 @@ $links['innodb']['doc'] = 'innodb'; // Variable to contain all com_ variables -$used_queries = Array(); +$used_queries = array(); // Variable to map variable names to their respective section name (used for js category filtering) -$allocationMap = Array(); +$allocationMap = array(); // sort vars into arrays foreach ($server_status as $name => $value) { foreach ($allocations as $filter => $section) { if (strpos($name, $filter) !== FALSE) { $allocationMap[$name] = $section; - if($section=='com' && $value>0) $used_queries[$name] = $value; + if($section == 'com' && $value > 0) $used_queries[$name] = $value; break; // Only exits inner loop } } @@ -453,7 +468,7 @@ echo __('Runtime Information'); <select id="filterCategory" name="filterCategory"> <option value=''><?php echo __('Filter by category...'); ?></option> <?php - foreach($sections as $section_id=>$section_name) { + foreach($sections as $section_id => $section_name) { ?> <option value='<?php echo $section_id; ?>'><?php echo $section_name; ?></option> <?php @@ -470,7 +485,7 @@ echo __('Runtime Information'); echo '<span class="status_'.$section_name.'"> '; $i=0; foreach ($section_links as $link_name => $link_url) { - if($i>0) echo ', '; + if($i > 0) echo ', '; if ('doc' == $link_name) { echo PMA_showMySQLDocu($link_url, $link_url); } else { @@ -496,30 +511,32 @@ echo __('Runtime Information'); function printQueryStatistics() { global $server_status, $used_queries, $url_query, $PMA_PHP_SELF; - $hour_factor = 3600 / $server_status['Uptime']; + $hour_factor = 3600 / $server_status['Uptime']; $total_queries = array_sum($used_queries); ?> - <h3 id="serverstatusqueries"><?php echo - //sprintf(__('<b>Query statistics</b>: Since its startup, %s queries have been sent to the server.'), - //PMA_formatNumber($server_status['Questions'], 0)); - sprintf('Queries since startup: %s',PMA_formatNumber($total_queries, 0)); - //echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions'); + <h3 id="serverstatusqueries"> + <?php + echo sprintf('Queries since startup: %s',PMA_formatNumber($total_queries, 0)); ?> - <br> - <span style="font-size:60%; display:inline;"> - ø <?php echo __('per hour'); ?>: - <?php echo PMA_formatNumber($total_queries * $hour_factor, 0); ?><br> - - ø <?php echo __('per minute'); ?>: - <?php echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); ?><br> + <br> + <span> + <?php + echo 'ø'.__('per hour').':'; + echo PMA_formatNumber($total_queries * $hour_factor, 0); + echo '<br>'; - <?php if($total_queries / $server_status['Uptime'] >= 1) { - ?> - ø <?php echo __('per second'); ?>: - <?php echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); ?><br> + echo 'ø'.__('per minute').':'; + echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); + echo '<br>'; + if($total_queries / $server_status['Uptime'] >= 1) { + echo 'ø'.__('per second').':'; + echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); + ?> + </span><br> + </h3> <?php } @@ -527,11 +544,11 @@ function printQueryStatistics() { arsort($used_queries); $odd_row = true; - $count_displayed_rows = 0; - $perc_factor = 100 / $total_queries //(- $server_status['Connections']); + $count_displayed_rows = 0; + $perc_factor = 100 / $total_queries; //(- $server_status['Connections']); ?> - </h3> + <table id="serverstatusqueriesdetails" class="data sortable"> <col class="namecol" /> <col class="valuecol" span="3" /> @@ -548,7 +565,7 @@ function printQueryStatistics() { <tbody> <?php - $chart_json = Array(); + $chart_json = array(); $query_sum = array_sum($used_queries); $other_sum = 0; foreach ($used_queries as $name => $value) { @@ -557,7 +574,7 @@ function printQueryStatistics() { // For the percentage column, use Questions - Connections, because // the number of connections is not an item of the Query types // but is included in Questions. Then the total of the percentages is 100. - $name = str_replace(Array('Com_','_'), Array('',' '), $name); + $name = str_replace(Array('Com_', '_'), Array('', ' '), $name); if($value < $query_sum * 0.02) $other_sum += $value; @@ -577,21 +594,12 @@ function printQueryStatistics() { </tbody> </table> - <div id="serverstatusquerieschart" style="width:500px; height:350px; "> + <div id="serverstatusquerieschart"> <?php - /*// Generate the graph if this is an ajax request - if(isset($_REQUEST['ajax_request'])) { - echo createQueryChart(); - } else { - echo '<a href="'.$PMA_PHP_SELF.'?'.$url_query.'&query_chart=1#serverstatusqueries"' - .'title="' . __('Show query chart') . '">['.__('Show query chart').']</a>'; - }*/ - - if($other_sum>0) + if($other_sum > 0) $chart_json[__('Other')] = $other_sum; echo json_encode($chart_json); - ?> </div> <?php @@ -610,10 +618,11 @@ function printServerTraffic() { 'SELECT UNIX_TIMESTAMP() - ' . $server_status['Uptime']); ?> - <h3><?php /* echo __('<b>Server traffic</b>: These tables show the network traffic statistics of this MySQL server since its startup.');*/ - echo sprintf(__('Network traffic since startup: %s'), - implode(' ', PMA_formatByteDown( $server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1)) - ); + <h3><?php + echo sprintf( + __('Network traffic since startup: %s'), + implode(' ', PMA_formatByteDown( $server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1)) + ); ?> </h3> @@ -790,7 +799,7 @@ function printServerTraffic() { <th><?php echo __('Status'); ?></th> <th><?php echo __('SQL query'); - if (!PMA_DRIZZLE) { ?> + if (! PMA_DRIZZLE) { ?> <a href="<?php echo $full_text_link; ?>" title="<?php echo empty($full) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>"> <img src="<?php echo $GLOBALS['pmaThemeImage'] . 's_' . (empty($_REQUEST['full']) ? 'full' : 'partial'); ?>text.png" @@ -841,7 +850,7 @@ function printVariablesTable() { /** * Messages are built using the message name */ - $strShowStatus = Array( + $strShowStatus = array( 'Aborted_connects' => __('The number of failed attempts to connect to the MySQL server.'), 'Binlog_cache_disk_use' => __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.'), 'Binlog_cache_use' => __('The number of transactions that used the temporary binary log cache.'), @@ -1019,19 +1028,12 @@ function printVariablesTable() { <th><?php echo __('Description'); ?></th> </tr> </thead> -  <tbody> <?php $odd_row = false; foreach ($server_status as $name => $value) { $odd_row = !$odd_row; - // $allocations ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>"> <th class="name"><?php echo htmlspecialchars($name) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?> @@ -1087,38 +1089,6 @@ function printVariablesTable() { <?php } -function createQueryChart($com_vars=FALSE) { - /** - * Chart generation - */ - require_once './libraries/chart.lib.php'; - - if(!$com_vars) - $com_vars = PMA_DBI_fetch_result("SHOW GLOBAL STATUS LIKE 'Com\_%'", 0, 1); - - // admin commands are not queries (e.g. they include COM_PING, which is excluded from $server_status['Questions']) - unset($com_vars['Com_admin_commands']); - - arsort($com_vars); - - $merge_minimum = array_sum($com_vars) * 0.005; - $merged_value = 0; - - // remove zero values from the end, as well as merge together every value that is below 0.5% - // variable empty for Drizzle - if ($com_vars) { - while (($last_element=end($com_vars)) <= $merge_minimum) { - array_pop($com_vars); - $merged_value += $last_element; - } - - $com_vars['Other'] = $merged_value; - return PMA_chart_status($com_vars); - } - - return ''; -} - /** * cleanup of some deprecated values */ diff --git a/server_variables.php b/server_variables.php index 00c8a85..e538c91 100644 --- a/server_variables.php +++ b/server_variables.php @@ -86,8 +86,10 @@ foreach ($serverVars as $name => $value) { <th nowrap="nowrap"> <?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th> <td class="value"><?php - if (strlen($value) < 16 && is_numeric($value)) { - echo PMA_formatNumber($value, 0); + if (is_numeric($value)) { + if(isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte') + echo '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ',PMA_formatByteDown($value,3,3)).'</abbr>'; + else echo PMA_formatNumber($value, 0); $is_numeric = true; } else { echo htmlspecialchars($value); diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 72dec00..8f03feb 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -258,6 +258,10 @@ td.null { text-align: <?php echo $right; ?>; } +table .valueHeader { + text-align: <?php echo $right; ?>; + white-space: normal; +} table .value { text-align: <?php echo $right; ?>; white-space: normal; @@ -960,6 +964,11 @@ img.sortableIcon { background-repeat:no-repeat; } +h3#serverstatusqueries span { + font-size:60%; + display:inline; +} + table#serverstatusqueriesdetails th img.sortableIcon, table#serverstatusvariables th img.sortableIcon { background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_sortable.png); } @@ -990,6 +999,8 @@ div#serverstatus table caption a.top { div#serverstatusquerieschart { float:<?php echo $right; ?>; + width:500px; + height:350px; } div#serverstatus table#serverstatusqueriesdetails { @@ -1035,6 +1046,14 @@ div#serverstatus table tbody td.descr a:after, div#serverstatus table .tblFooters a:after { content: ']'; } + +div.liveChart { + clear:both; + min-width:500px; + height:400px; + padding-bottom:80px; +} + /* end serverstatus */ /* querywindow */ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 3c9d951..e55caad 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -432,6 +432,10 @@ td.null { text-align: <?php echo $right; ?>; } +table .valueHeader { + text-align: <?php echo $right; ?>; + white-space: normal; +} table .value { text-align: <?php echo $right; ?>; white-space: normal; @@ -1166,6 +1170,11 @@ img.sortableIcon { background-repeat:no-repeat; } +h3#serverstatusqueries span { + font-size:60%; + display:inline; +} + table#serverstatusqueriesdetails th.headerSortUp img.sortableIcon, table#serverstatusvariables th.headerSortUp img.sortableIcon { background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png); } @@ -1175,7 +1184,7 @@ table#serverstatusqueriesdetails th.headerSortDown img.sortableIcon, table#serve .statuslinks { float: <?php echo $right; ?>; - white-space: nowrap; + white-space: nowrap; } /* Also used for the variables page */ @@ -1193,6 +1202,8 @@ div#serverstatus table caption a.top { div#serverstatusquerieschart { float:<?php echo $right; ?>; + width:500px; + height:350px; } div#serverstatus table#serverstatusqueriesdetails { @@ -1225,8 +1236,28 @@ div#serverstatus table tbody td.descr a, div#serverstatus table .tblFooters a { white-space: nowrap; } + +div.liveChart { + clear:both; + min-width:500px; + height:400px; + padding-bottom:80px; +} /* end serverstatus */ +/* server variables */ + +a.editIcon { + float: <?php echo $left; ?>; + font-family:sans-serif; +} + +table#serverVariables td { + height:18px; +} + +/* end server variables */ + /* querywindow */ body#bodyquerywindow { margin: 0; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3861-g79f28d8
by Marc Delisle 16 Jun '11

16 Jun '11

The branch, master has been updated via 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 (commit) via d90bad9a8b324e4a9ae8cc0c6f401a74a488604b (commit) from 4338b70d9fdec523d93af791ba34817431e20154 (commit) - Log ----------------------------------------------------------------- commit 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 16 16:16:09 2011 -0400 ChangeLog entry for patch commit d90bad9a8b324e4a9ae8cc0c6f401a74a488604b Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jun 16 16:15:12 2011 -0400 Patch #3316969 PMA_ajaxShowMessage() does not respect timeout ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 96 ++++++++++++++++++++++--------------------------------- 2 files changed, 39 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index b69dd20..edbb3ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog + rfe #939233 [interface] Flexible column width + [interface] Mouse-based column reordering in query results + AJAX for Insert to a table from database Structure page +- Patch #3316969 PMA_ajaxShowMessage() does not respect timeout 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/js/functions.js b/js/functions.js index 1b09f63..3418e51 100644 --- a/js/functions.js +++ b/js/functions.js @@ -15,10 +15,9 @@ var sql_box_locked = false; var only_once_elements = new Array(); /** - * @var ajax_message_init boolean boolean that stores status of - * notification for PMA_ajaxShowNotification + * @var int ajax_message_count Number of AJAX messages shown since page load */ -var ajax_message_init = false; +var ajax_message_count = 0; /** * @var codemirror_editor object containing CodeMirror editor @@ -1244,83 +1243,64 @@ $(document).ready(function(){ * optional, defaults to 'Loading...' * @param var timeout number of milliseconds for the message to be visible * optional, defaults to 5000 - * @return jQuery object jQuery Element that holds the message div + * @return jQuery object jQuery Element that holds the message div */ - function PMA_ajaxShowMessage(message, timeout) { - //Handle the case when a empty data.message is passed. We don't want the empty message - if(message == '') { + //Handle the case when a empty data.message is passed. We don't want the empty message + if (message == '') { return true; + } else if (! message) { + // If the message is undefined, show the default + message = PMA_messages['strLoading']; } /** - * @var msg String containing the message that has to be displayed - * @default PMA_messages['strLoading'] + * @var timeout Number of milliseconds for which the message will be visible + * @default 5000 ms */ - if(!message) { - var msg = PMA_messages['strLoading']; + if (! timeout) { + timeout = 5000; } - else { - var msg = message; + + // Create a parent element for the AJAX messages, if necessary + if ($('#loading_parent').length == 0) { + $('<div id="loading_parent"></div>') + .insertBefore("#serverinfo"); } + // Update message count to create distinct message elements every time + ajax_message_count++; + + // Remove all old messages, if any + $(".ajax_notification[id^=ajax_message_num]").remove(); + /** - * @var timeout Number of milliseconds for which {@link msg} will be visible - * @default 5000 ms + * @var $retval a jQuery object containing the reference + * to the created AJAX message */ - if(!timeout) { - var to = 5000; - } - else { - var to = timeout; - } - - if( !ajax_message_init) { - //For the first time this function is called, append a new div - $(function(){ - $('<div id="loading_parent"></div>') - .insertBefore("#serverinfo"); - - $('<span id="loading" class="ajax_notification"></span>') - .appendTo("#loading_parent") - .html(msg) - .fadeIn('medium') - .delay(to) - .fadeOut('medium', function(){ - $(this) - .html("") //Clear the message - .hide(); - }); - }, 'top.frame_content'); - ajax_message_init = true; - } - else { - //Otherwise, just show the div again after inserting the message - $("#loading") - .stop(true, true) - .html(msg) + var $retval = $('<span class="ajax_notification" id="ajax_message_num_' + ajax_message_count + '"></span>') + .hide() + .appendTo("#loading_parent") + .html(message) .fadeIn('medium') - .delay(to) + .delay(timeout) .fadeOut('medium', function() { - $(this) - .html("") - .hide(); - }) - } + $(this).remove(); + }); - return $("#loading"); + return $retval; } /** * Removes the message shown for an Ajax operation when it's completed */ function PMA_ajaxRemoveMessage($this_msgbox) { - $this_msgbox - .stop(true, true) - .fadeOut('medium', function() { - $this_msgbox.hide(); - }); + if ($this_msgbox != 'undefined' && $this_msgbox instanceof jQuery) { + $this_msgbox + .stop(true, true) + .fadeOut('medium'); + } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3859-g4338b70
by Madhura Jayaratne 16 Jun '11

16 Jun '11

The branch, master has been updated via 4338b70d9fdec523d93af791ba34817431e20154 (commit) via 9d2269d297cdc04dfe19d29025afb28b87a83f66 (commit) from 51af35ee1409256c70ed2ea226dd984582ed830f (commit) - Log ----------------------------------------------------------------- commit 4338b70d9fdec523d93af791ba34817431e20154 Merge: 51af35ee1409256c70ed2ea226dd984582ed830f 9d2269d297cdc04dfe19d29025afb28b87a83f66 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jun 16 21:23:12 2011 +0530 Merge branch 'QA_3_4' Conflicts: js/sql.js ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 042bf04..b69dd20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog - bug #3315720 [search] Fix search in non unicode tables - bug #3315741 [display] Inline query edit broken - patch #3317206 [privileges] Generate password option missing on new accounts +- bug #3317293 [edit] Inline edit places HTML line breaks in edit area 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index dfe05da..bc252a5 100644 --- a/js/sql.js +++ b/js/sql.js @@ -712,8 +712,10 @@ $(document).ready(function() { // and store the current value in a hidden span if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .set, .null)')) { // handle non-truncated, non-transformed, non-relation values + + value = data_value.replace("<br>", "\n"); // We don't need to get any more data, just wrap the value - $this_field_span.append('<textarea>'+data_value+'</textarea>'); + $this_field_span.append('<textarea>' + value + '</textarea>'); $this_field.data('original_data', data_value); } else if($this_field.is('.truncated, .transformed')) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-24-g9d2269d
by Madhura Jayaratne 16 Jun '11

16 Jun '11

The branch, QA_3_4 has been updated via 9d2269d297cdc04dfe19d29025afb28b87a83f66 (commit) from 99bae4acb9a94c93ca31c8d49eb9a771f34aad54 (commit) - Log ----------------------------------------------------------------- commit 9d2269d297cdc04dfe19d29025afb28b87a83f66 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jun 16 21:05:54 2011 +0530 bug #3317293 [edit] Inline edit places HTML line breaks in edit area ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ae3c2e..cc6ce50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - bug #3315720 [search] Fix search in non unicode tables - bug #3315741 [display] Inline query edit broken - patch #3317206 [privileges] Generate password option missing on new accounts +- bug #3317293 [edit] Inline edit places HTML line breaks in edit area 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index 26075d4..e871c74 100644 --- a/js/sql.js +++ b/js/sql.js @@ -678,8 +678,10 @@ $(document).ready(function() { // and store the current value in a hidden span if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .set, .null)')) { // handle non-truncated, non-transformed, non-relation values + + value = data_value.replace("<br>", "\n"); // We don't need to get any more data, just wrap the value - $this_field.append('<textarea>'+data_value+'</textarea>'); + $this_field.append('<textarea>' + value + '</textarea>'); $this_field.data('original_data', data_value); } else if($this_field.is('.truncated, .transformed')) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3857-g51af35e
by Marc Delisle 16 Jun '11

16 Jun '11

The branch, master has been updated via 51af35ee1409256c70ed2ea226dd984582ed830f (commit) via 99bae4acb9a94c93ca31c8d49eb9a771f34aad54 (commit) from 6f305d40814a5383e739f86a8f68ae19118c03bf (commit) - Log ----------------------------------------------------------------- commit 51af35ee1409256c70ed2ea226dd984582ed830f Merge: 6f305d40814a5383e739f86a8f68ae19118c03bf 99bae4acb9a94c93ca31c8d49eb9a771f34aad54 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 16 07:57:54 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f30beea..042bf04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog - patch #3313326 [interface] Some tooltips do not disappear - bug #3315720 [search] Fix search in non unicode tables - bug #3315741 [display] Inline query edit broken +- patch #3317206 [privileges] Generate password option missing on new accounts 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/server_privileges.php b/server_privileges.php index b5f7031..cedbcef 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1698,7 +1698,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs unset ($row); 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 user') . '</a>' . "\n" . ' </fieldset>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-23-g99bae4a
by Marc Delisle 16 Jun '11

16 Jun '11

The branch, QA_3_4 has been updated via 99bae4acb9a94c93ca31c8d49eb9a771f34aad54 (commit) from 396e4e99799c91a8c39f2bbe156e6795cdef6ee5 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e40b2e..0ae3c2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - patch #3313326 [interface] Some tooltips do not disappear - bug #3315720 [search] Fix search in non unicode tables - bug #3315741 [display] Inline query edit broken +- patch #3317206 [privileges] Generate password option missing on new accounts 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/server_privileges.php b/server_privileges.php index 7e60f09..81de01f 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1698,7 +1698,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs unset ($row); 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"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3855-g6f305d4
by Michal Čihař 16 Jun '11

16 Jun '11

The branch, master has been updated via 6f305d40814a5383e739f86a8f68ae19118c03bf (commit) via 9bfa22c1fff9524107a8e60344e473629661058c (commit) via 351ef09b9065e7fb41e384555e76e5fa54f2e770 (commit) via 032d3ea6583c2feee1ace19e6181defa2d7fb9e4 (commit) via f82d2beb09c5211f981a351b3949bcf2513068e0 (commit) via e20532c0c4bba65904aabd3c8ee0ae470b4792d5 (commit) via df476a1b939c21264ab7b8a99cd62393db59b73a (commit) via 9e7e3b39af1939e5299fd7711ebb2c73ea8296db (commit) via b90bf046182fe02943a13c8ddcfbeee43c845702 (commit) via aaead6b53c744f4b11efdeb8440257bdad527c7f (commit) via fa7a286e59593b7386de938eb86065027fc752ca (commit) via 0d8f486a7b797a0377a5228780de87b4d468b05b (commit) via 3c5979e104fab5b1b0873e817f9c831a937b52f6 (commit) via ac1acdb727bf1ac81c6ee3cdd0261f29a1b4c57c (commit) via 2eb9a08b0506bb9eb57f01660162988a1944acf1 (commit) via 49d8d4aa62b4607374b8f8a28dbd3ae2449fd4f8 (commit) via 991548f00de162355934f4da08c4419de4871ec1 (commit) via 920d9a01df7de7417fc4dbf27bac28a9960599a9 (commit) via 0df42cb61f0bccb6ce4bf7e4a4eafd9edf499173 (commit) via 4d21881b6eedcbe521456867e8151bbb30233a25 (commit) via bfadd8098cb7eb793d6792e0ec3b736c6e7ee1c8 (commit) via 2819f6cb2a58050619504aad6d1c24a0096824a0 (commit) via 374166e7e112ce62d1dbf974ebd9edf4c0e839cb (commit) via 6ea13531b498bdb9b76ee11cf38813b44825679e (commit) via 3669d3f7696e57a77b5cf1a0b2dddd9e1091e26a (commit) via d13b6b054ee6e147ff0044eb64fa6017679e6182 (commit) via f5e5614400543b98f7eab95e5e3bb5cdd378bab2 (commit) via 6b65eebebe2b51fa7205ed564136980751c24b40 (commit) via 849911e099f1191c33ecb222848ce1c73f90f249 (commit) via cd682d897a95fb854be7059390b7803e5eedb83c (commit) via c640f5463524b6dbcc8f481954388e6648272091 (commit) via f6a0ff9c2f90fce15c2660e08cbfa928a776e7de (commit) via fbb21572247b9e34eba8a75c83ac4acd5e9d2a49 (commit) via 2a1268b95ebfca31eeceb964b1c3354ca74e9ab8 (commit) via abac8ccae7b44d639d4bbfc36bd725d6223b14c9 (commit) via 8b3cc87892364acec3cea86a9099fe4d97adafe3 (commit) via fa4fec50a447b10f3c4147acc4492c6b5db311dc (commit) via ab8b9cfd6101bc36832429d20dc207e2945efa53 (commit) via 5b44f491933d04578beba485ea0f70babaafb2e6 (commit) via 1c472f1dff8e82cd3f00e47035b8d26c9ae14bae (commit) via d2d349febd902ceded9bf5a664fdecd3e8c7e035 (commit) via 48f3aec978e57a935e449001070989a754e86b1c (commit) via e4e256526bcc9af3201669aaa9599c5b28533dbd (commit) via 236f10845c25f4b41176ed1786c81c58490f45df (commit) via 93d98491b72b94fb1d33ac958e908a520e22cadd (commit) via fd02aecdaf29688e77d814da35055a9ef32449bd (commit) via 22dd70468361071957039936ba19113ef4183bbc (commit) via 1951a01e9560c2124493ad7dc1cfd074483abcac (commit) via b58cc407ca95d52b53f0dfbc505fbfad68df3275 (commit) via c7af7b18c9977407c3080e91c033d1bf1d60b059 (commit) via 6431e545ecb2c7e26735296ac291144bc6fa7de8 (commit) via 15794bd631f4f5dbf7637a23d278f93511920dd1 (commit) via c82a5d770e5b2cb141d0108f46c3d742efefe5b9 (commit) via 894e801f387ac04051ae58f2a15df2c905ce1594 (commit) via edd755be9667632dbe3e692e5bb52ded93f0e019 (commit) via 4c87c00cba05f6d6c7aec90fa77082d0265fba52 (commit) via 97d698874fa0640c29907596a1d7538da4dfbe17 (commit) via 760dbf203cfe31a3848591a3a49bf447ee2e139f (commit) via 10197017df45eece1ec63fe17fc22e3f4591838a (commit) via d9d86d763b2d544d7fa42de2ffc448b507b529b4 (commit) via 95340fa7af9badd5ab19f57fb116e60664b1da53 (commit) via 88b0b7e36e4291601029f4374ade52b49b404386 (commit) via 14eeaa0c19df65281122e7aa81e334fb9b7cce12 (commit) via 9dc913431dabbce28eec0f93a58c401050dc23df (commit) via 2112e660c0fe873b6b58200dcd2efe9cb844cc4c (commit) via 6d670b571f433e3fd6677865efaf9a5f54fdcebc (commit) via 1959dcf9171ed54c5b3625fde8f90f77d3e18345 (commit) via 79b7cde68dc78a0d079d1b904928177746c91a64 (commit) via c865b6929d2ecdee1d48892026aa54d4105a30e4 (commit) via abbbb838a48ce71f2c1c48a3e67c319ae4b3e4c6 (commit) via e9404a518d93c90baf1f5ea00cc21497f9661f0f (commit) via fd002021aac1fc7534e14567cada23898ffc3078 (commit) via f7291745f6635d544431c67e05c10296ffebc6f6 (commit) from 163d929abb3ea91c7b8fe8e58f64d3da7fa91a4e (commit) - Log ----------------------------------------------------------------- commit 6f305d40814a5383e739f86a8f68ae19118c03bf Merge: 9bfa22c1fff9524107a8e60344e473629661058c 163d929abb3ea91c7b8fe8e58f64d3da7fa91a4e Author: Pootle server <pootle(a)cihar.com> Date: Thu Jun 16 00:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit 9bfa22c1fff9524107a8e60344e473629661058c Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:11:07 2011 +0200 Translation update done using Pootle. commit 351ef09b9065e7fb41e384555e76e5fa54f2e770 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:10:58 2011 +0200 Translation update done using Pootle. commit 032d3ea6583c2feee1ace19e6181defa2d7fb9e4 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:10:49 2011 +0200 Translation update done using Pootle. commit f82d2beb09c5211f981a351b3949bcf2513068e0 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:10:17 2011 +0200 Translation update done using Pootle. commit e20532c0c4bba65904aabd3c8ee0ae470b4792d5 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:10:03 2011 +0200 Translation update done using Pootle. commit df476a1b939c21264ab7b8a99cd62393db59b73a Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:09:44 2011 +0200 Translation update done using Pootle. commit 9e7e3b39af1939e5299fd7711ebb2c73ea8296db Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:09:31 2011 +0200 Translation update done using Pootle. commit b90bf046182fe02943a13c8ddcfbeee43c845702 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:07:17 2011 +0200 Translation update done using Pootle. commit aaead6b53c744f4b11efdeb8440257bdad527c7f Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:06:46 2011 +0200 Translation update done using Pootle. commit fa7a286e59593b7386de938eb86065027fc752ca Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:06:30 2011 +0200 Translation update done using Pootle. commit 0d8f486a7b797a0377a5228780de87b4d468b05b Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:05:55 2011 +0200 Translation update done using Pootle. commit 3c5979e104fab5b1b0873e817f9c831a937b52f6 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 16 00:04:05 2011 +0200 Translation update done using Pootle. commit ac1acdb727bf1ac81c6ee3cdd0261f29a1b4c57c Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:59:55 2011 +0200 Translation update done using Pootle. commit 2eb9a08b0506bb9eb57f01660162988a1944acf1 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:57:02 2011 +0200 Translation update done using Pootle. commit 49d8d4aa62b4607374b8f8a28dbd3ae2449fd4f8 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:55:56 2011 +0200 Translation update done using Pootle. commit 991548f00de162355934f4da08c4419de4871ec1 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:55:16 2011 +0200 Translation update done using Pootle. commit 920d9a01df7de7417fc4dbf27bac28a9960599a9 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:54:09 2011 +0200 Translation update done using Pootle. commit 0df42cb61f0bccb6ce4bf7e4a4eafd9edf499173 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:53:55 2011 +0200 Translation update done using Pootle. commit 4d21881b6eedcbe521456867e8151bbb30233a25 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:53:34 2011 +0200 Translation update done using Pootle. commit bfadd8098cb7eb793d6792e0ec3b736c6e7ee1c8 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:52:52 2011 +0200 Translation update done using Pootle. commit 2819f6cb2a58050619504aad6d1c24a0096824a0 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:51:32 2011 +0200 Translation update done using Pootle. commit 374166e7e112ce62d1dbf974ebd9edf4c0e839cb Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:51:10 2011 +0200 Translation update done using Pootle. commit 6ea13531b498bdb9b76ee11cf38813b44825679e Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:50:52 2011 +0200 Translation update done using Pootle. commit 3669d3f7696e57a77b5cf1a0b2dddd9e1091e26a Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:50:31 2011 +0200 Translation update done using Pootle. commit d13b6b054ee6e147ff0044eb64fa6017679e6182 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:50:14 2011 +0200 Translation update done using Pootle. commit f5e5614400543b98f7eab95e5e3bb5cdd378bab2 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:49:51 2011 +0200 Translation update done using Pootle. commit 6b65eebebe2b51fa7205ed564136980751c24b40 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:48:44 2011 +0200 Translation update done using Pootle. commit 849911e099f1191c33ecb222848ce1c73f90f249 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:46:54 2011 +0200 Translation update done using Pootle. commit cd682d897a95fb854be7059390b7803e5eedb83c Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:46:18 2011 +0200 Translation update done using Pootle. commit c640f5463524b6dbcc8f481954388e6648272091 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:46:01 2011 +0200 Translation update done using Pootle. commit f6a0ff9c2f90fce15c2660e08cbfa928a776e7de Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:45:16 2011 +0200 Translation update done using Pootle. commit fbb21572247b9e34eba8a75c83ac4acd5e9d2a49 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:44:36 2011 +0200 Translation update done using Pootle. commit 2a1268b95ebfca31eeceb964b1c3354ca74e9ab8 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:44:01 2011 +0200 Translation update done using Pootle. commit abac8ccae7b44d639d4bbfc36bd725d6223b14c9 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:43:45 2011 +0200 Translation update done using Pootle. commit 8b3cc87892364acec3cea86a9099fe4d97adafe3 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:42:32 2011 +0200 Translation update done using Pootle. commit fa4fec50a447b10f3c4147acc4492c6b5db311dc Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:41:34 2011 +0200 Translation update done using Pootle. commit ab8b9cfd6101bc36832429d20dc207e2945efa53 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Jun 15 23:39:39 2011 +0200 Translation update done using Pootle. commit 5b44f491933d04578beba485ea0f70babaafb2e6 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:05:14 2011 +0200 Translation update done using Pootle. commit 1c472f1dff8e82cd3f00e47035b8d26c9ae14bae Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:05:06 2011 +0200 Translation update done using Pootle. commit d2d349febd902ceded9bf5a664fdecd3e8c7e035 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:04:58 2011 +0200 Translation update done using Pootle. commit 48f3aec978e57a935e449001070989a754e86b1c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:04:51 2011 +0200 Translation update done using Pootle. commit e4e256526bcc9af3201669aaa9599c5b28533dbd Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:04:41 2011 +0200 Translation update done using Pootle. commit 236f10845c25f4b41176ed1786c81c58490f45df Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:04:13 2011 +0200 Translation update done using Pootle. commit 93d98491b72b94fb1d33ac958e908a520e22cadd Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:04:01 2011 +0200 Translation update done using Pootle. commit fd02aecdaf29688e77d814da35055a9ef32449bd Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:03:53 2011 +0200 Translation update done using Pootle. commit 22dd70468361071957039936ba19113ef4183bbc Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:03:25 2011 +0200 Translation update done using Pootle. commit 1951a01e9560c2124493ad7dc1cfd074483abcac Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:02:58 2011 +0200 Translation update done using Pootle. commit b58cc407ca95d52b53f0dfbc505fbfad68df3275 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 23:00:38 2011 +0200 Translation update done using Pootle. commit c7af7b18c9977407c3080e91c033d1bf1d60b059 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:59:32 2011 +0200 Translation update done using Pootle. commit 6431e545ecb2c7e26735296ac291144bc6fa7de8 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:59:10 2011 +0200 Translation update done using Pootle. commit 15794bd631f4f5dbf7637a23d278f93511920dd1 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:57:20 2011 +0200 Translation update done using Pootle. commit c82a5d770e5b2cb141d0108f46c3d742efefe5b9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:57:03 2011 +0200 Translation update done using Pootle. commit 894e801f387ac04051ae58f2a15df2c905ce1594 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:56:51 2011 +0200 Translation update done using Pootle. commit edd755be9667632dbe3e692e5bb52ded93f0e019 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:56:35 2011 +0200 Translation update done using Pootle. commit 4c87c00cba05f6d6c7aec90fa77082d0265fba52 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:56:24 2011 +0200 Translation update done using Pootle. commit 97d698874fa0640c29907596a1d7538da4dfbe17 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:56:07 2011 +0200 Translation update done using Pootle. commit 760dbf203cfe31a3848591a3a49bf447ee2e139f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:55:54 2011 +0200 Translation update done using Pootle. commit 10197017df45eece1ec63fe17fc22e3f4591838a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:55:48 2011 +0200 Translation update done using Pootle. commit d9d86d763b2d544d7fa42de2ffc448b507b529b4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:55:42 2011 +0200 Translation update done using Pootle. commit 95340fa7af9badd5ab19f57fb116e60664b1da53 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:55:25 2011 +0200 Translation update done using Pootle. commit 88b0b7e36e4291601029f4374ade52b49b404386 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:55:10 2011 +0200 Translation update done using Pootle. commit 14eeaa0c19df65281122e7aa81e334fb9b7cce12 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:54:55 2011 +0200 Translation update done using Pootle. commit 9dc913431dabbce28eec0f93a58c401050dc23df Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:54:47 2011 +0200 Translation update done using Pootle. commit 2112e660c0fe873b6b58200dcd2efe9cb844cc4c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:54:38 2011 +0200 Translation update done using Pootle. commit 6d670b571f433e3fd6677865efaf9a5f54fdcebc Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:54:25 2011 +0200 Translation update done using Pootle. commit 1959dcf9171ed54c5b3625fde8f90f77d3e18345 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:54:12 2011 +0200 Translation update done using Pootle. commit 79b7cde68dc78a0d079d1b904928177746c91a64 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:53:59 2011 +0200 Translation update done using Pootle. commit c865b6929d2ecdee1d48892026aa54d4105a30e4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:53:49 2011 +0200 Translation update done using Pootle. commit abbbb838a48ce71f2c1c48a3e67c319ae4b3e4c6 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:53:41 2011 +0200 Translation update done using Pootle. commit e9404a518d93c90baf1f5ea00cc21497f9661f0f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:53:33 2011 +0200 Translation update done using Pootle. commit fd002021aac1fc7534e14567cada23898ffc3078 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:53:21 2011 +0200 Translation update done using Pootle. commit f7291745f6635d544431c67e05c10296ffebc6f6 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:53:08 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 97 +++++++++++++++++++++++++------------------------------------ po/sv.po | 93 +++++++++++++++++++++++----------------------------------- 2 files changed, 77 insertions(+), 113 deletions(-) diff --git a/po/es.po b/po/es.po index 2dbdf72..4d2b8d3 100644 --- a/po/es.po +++ b/po/es.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-09 17:25+0200\n" +"PO-Revision-Date: 2011-06-15 23:05+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1018,10 +1018,9 @@ msgstr "¡Ésto no es un número!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Cantidad de archivos de registro" +msgstr "Cantidad total" #: js/messages.php:54 msgid "The host name is empty!" @@ -1058,24 +1057,22 @@ msgid "Close" msgstr "Cerrar" #: js/messages.php:64 server_status.php:397 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Elección del servidor" +msgstr "Gráfico de tráfico en vivo" #: js/messages.php:65 server_status.php:400 msgid "Live conn./process chart" -msgstr "" +msgstr "Gráfico de procesos/conexiones en vivo" #: js/messages.php:66 server_status.php:429 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Mostrar gráfico de consultas" +msgstr "Gráfico de consultas en vivo" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Datos estáticos" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 @@ -1088,7 +1085,7 @@ msgstr "Total" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:592 msgid "Other" -msgstr "" +msgstr "Otro" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1375 @@ -5007,24 +5004,22 @@ msgid "Language" msgstr "Idioma" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Columnas para las áreas de texto" +msgstr "Restaurar orden de las columnas" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Arrastrar para reordenar" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Clic para seleccionar" +msgstr "Pulsar para ordenar" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Pulsar para marcar/desmarcar" #: libraries/display_tbl.lib.php:425 #, php-format @@ -8422,71 +8417,62 @@ msgid "Runtime Information" msgstr "Información acerca del tiempo de ejecución del proceso principal" #: server_status.php:371 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Elección del servidor" +msgstr "Tráfico del servidor" #: server_status.php:372 msgid "Query statistics" msgstr "Estadísticas de Consulta" #: server_status.php:373 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Ver la tabla de estado del esclavo" +msgstr "Todas las variables de estado" #: server_status.php:383 server_status.php:416 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Actualizar" +msgstr "Velocidad de actualización" #: server_status.php:384 server_status.php:417 -#, fuzzy #| msgid "Second" msgid "second" -msgstr "Segundo" +msgstr "segundo" #: server_status.php:385 server_status.php:386 server_status.php:387 #: server_status.php:388 server_status.php:389 server_status.php:418 #: server_status.php:419 server_status.php:420 server_status.php:421 #: server_status.php:422 -#, fuzzy #| msgid "Second" msgid "seconds" -msgstr "Segundo" +msgstr "segundos" #: server_status.php:390 server_status.php:391 server_status.php:392 #: server_status.php:393 server_status.php:423 server_status.php:424 #: server_status.php:425 server_status.php:426 -#, fuzzy #| msgid "Minute" msgid "minutes" -msgstr "Minuto" +msgstr "minutos" #: server_status.php:446 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "No cambiar la contraseña" +msgstr "Que contengan la palabra:" #: server_status.php:451 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Mostrar las tablas que están abiertas" +msgstr "Mostrar sólo valores de alerta" #: server_status.php:455 msgid "Filter by category..." -msgstr "" +msgstr "Filtrar por categoría..." #: server_status.php:468 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "Enlaces relacionados" +msgstr "Enlaces relacionados:" #: server_status.php:513 server_status.php:545 server_status.php:666 #: server_status.php:711 @@ -8508,12 +8494,12 @@ msgstr "Tipo de consulta" #. l10n: # = Amount of queries #: server_status.php:543 msgid "#" -msgstr "" +msgstr "#" #: server_status.php:615 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Tráfico de red desde el inicio: %s" #: server_status.php:623 #, php-format @@ -8598,10 +8584,9 @@ msgid "ID" msgstr "Identificación" #: server_status.php:846 -#, fuzzy #| msgid "Whether to enable SSL for connection to MySQL server." msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Si habilitar SSL para la conexión al servidor MySQL o no." +msgstr "Cantidad de intentos de conexión al servidor MySQL fallidos." #: server_status.php:847 msgid "" @@ -8623,6 +8608,7 @@ msgstr "" msgid "" "The number of connection attempts (successful or not) to the MySQL server." msgstr "" +"Cantidad de intentos de conexión al servidor MySQL (fallidos o exitosos)." #: server_status.php:850 msgid "" @@ -9061,6 +9047,8 @@ msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." msgstr "" +"El máximo número de conexiones que han sido utilizadas simultáneamente desde " +"que inició el servidor." #: server_status.php:921 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -9094,6 +9082,9 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Cantidad de bloques de memoria libre en la cache de consultas. Cantidades " +"altas pueden indicar problemas de fragmentación que pueden ser solucionados " +"ejecutando la consulta FLUSH QUERY CACHE." #: server_status.php:927 msgid "The amount of free memory for query cache." @@ -9845,10 +9836,9 @@ msgid "Line" msgstr "Línea" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "En línea" +msgstr "Ranuras" #: tbl_chart.php:89 msgid "Pie" @@ -9859,50 +9849,43 @@ msgid "Stacked" msgstr "Apiladas" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Título del reporte:" +msgstr "Título del gráfico" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "Eje X:" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "Consultas SQL" +msgstr "Series:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Columnas para las áreas de texto" +msgstr "Columnas restantes" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "Etiqueta del eje X" +msgstr "Etiqueta del eje X:" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Valor" +msgstr "Valores X" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "Etiqueta del eje Y" +msgstr "Etiqueta del eje Y:" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Valor" +msgstr "Valores Y" #: tbl_create.php:56 #, php-format diff --git a/po/sv.po b/po/sv.po index d1dc75b..83846dc 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-09 23:29+0200\n" +"PO-Revision-Date: 2011-06-16 00:11+0200\n" "Last-Translator: <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1004,10 +1004,9 @@ msgstr "Detta är inte ett nummer!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Antal loggfiler" +msgstr "Totalt antal" #: js/messages.php:54 msgid "The host name is empty!" @@ -1044,24 +1043,22 @@ msgid "Close" msgstr "Stäng" #: js/messages.php:64 server_status.php:397 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Välj server" +msgstr "Live trafik diagram" #: js/messages.php:65 server_status.php:400 msgid "Live conn./process chart" -msgstr "" +msgstr "Live anslutning/process diagram" #: js/messages.php:66 server_status.php:429 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Visa fråge diagram" +msgstr "Live sökfrågediagram" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Statisk data" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 @@ -1074,7 +1071,7 @@ msgstr "Total" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:592 msgid "Other" -msgstr "" +msgstr "Annan" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1375 @@ -4910,24 +4907,22 @@ msgid "Language" msgstr "Språk" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Textarea kolumner" +msgstr "Återställ ordningen på kolumner" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Dra för att ändra ordning" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Klicka för att markera" +msgstr "Klicka för att sortera" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Klicka för att markera/avmarkera" #: libraries/display_tbl.lib.php:425 #, php-format @@ -8243,71 +8238,62 @@ msgid "Runtime Information" msgstr "Körningsinformation" #: server_status.php:371 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Välj server" +msgstr "Server trafik" #: server_status.php:372 msgid "Query statistics" msgstr "Visa statistik" #: server_status.php:373 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Se slavtabell status" +msgstr "Alla statusvariabler" #: server_status.php:383 server_status.php:416 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Uppdatera" +msgstr "Uppdateringsfrekvens" #: server_status.php:384 server_status.php:417 -#, fuzzy #| msgid "Second" msgid "second" -msgstr "Sekunder" +msgstr "Sekund" #: server_status.php:385 server_status.php:386 server_status.php:387 #: server_status.php:388 server_status.php:389 server_status.php:418 #: server_status.php:419 server_status.php:420 server_status.php:421 #: server_status.php:422 -#, fuzzy #| msgid "Second" msgid "seconds" -msgstr "Sekunder" +msgstr "sekunder" #: server_status.php:390 server_status.php:391 server_status.php:392 #: server_status.php:393 server_status.php:423 server_status.php:424 #: server_status.php:425 server_status.php:426 -#, fuzzy #| msgid "Minute" msgid "minutes" -msgstr "Minuter" +msgstr "minuter" #: server_status.php:446 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Ändra inte lösenordet" +msgstr "Innehåller ordet:" #: server_status.php:451 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Visa öppna tabeller" +msgstr "Visa endast varnings värden" #: server_status.php:455 msgid "Filter by category..." -msgstr "" +msgstr "Filtrera efter kategori ..." #: server_status.php:468 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "Liknande länkar" +msgstr "Liknande länkar:" #: server_status.php:513 server_status.php:545 server_status.php:666 #: server_status.php:711 @@ -8329,12 +8315,12 @@ msgstr "Fråge-typ" #. l10n: # = Amount of queries #: server_status.php:543 msgid "#" -msgstr "" +msgstr "#" #: server_status.php:615 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Nätverkstrafik sedan start:%s" #: server_status.php:623 #, php-format @@ -8416,10 +8402,9 @@ msgid "ID" msgstr "ID" #: server_status.php:846 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Kunde inte ansluta till MySQL-server" +msgstr "Antalet misslyckade försök att ansluta till MySQL-servern." #: server_status.php:847 msgid "" @@ -8438,7 +8423,7 @@ msgstr "Antalet transaktioner som använde den temporära binära loggcachen." #: server_status.php:849 msgid "" "The number of connection attempts (successful or not) to the MySQL server." -msgstr "" +msgstr "Antalet anslutningsförsök (lyckade eller inte) till MySQL-servern." #: server_status.php:850 msgid "" @@ -8858,6 +8843,8 @@ msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." msgstr "" +"Det maximala antalet anslutningar som har använts samtidigt sedan servern " +"startade." #: server_status.php:921 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -8889,6 +8876,8 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Antalet fria minnesblock i frågecache. Högt antal kan tyda på fragmentering, " +"vilket kan lösas genom att köra ett FLUSH QUERY CACHEN kommando." #: server_status.php:927 msgid "The amount of free memory for query cache." @@ -9624,10 +9613,9 @@ msgid "Line" msgstr "Linje" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "Infogad" +msgstr "ISpårning" #: tbl_chart.php:89 msgid "Pie" @@ -9638,50 +9626,43 @@ msgid "Stacked" msgstr "Staplade" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Rapport titel:" +msgstr "Diagramtitel" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "X-axel:" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "SQL-frågor" +msgstr "Serie:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Textarea kolumner" +msgstr "Återstående kolumner" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" msgstr "X-axel etikett" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Värde" +msgstr "X värde" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" msgstr "Y-axel etikett" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Värde" +msgstr "Y värden" #: tbl_create.php:56 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3782-g163d929
by Michal Čihař 15 Jun '11

15 Jun '11

The branch, master has been updated via 163d929abb3ea91c7b8fe8e58f64d3da7fa91a4e (commit) via 0aa13c5497949196c156c9984b70b8c70fe56709 (commit) via b7e0265f0ba1eaae64df80177e856d851811bd0a (commit) via 56a2e05ccd7c3dba725d00cdb7e18e7f32b94998 (commit) via bbc1ff47aed0e24b8f8774222e715f098cc2c4d8 (commit) via 1924fe1690d9625f36e5fb176381ecccc19d7abe (commit) via 1f7452532f257f09fbfe1be3ce01a20f825570b5 (commit) via dbc95a1114f3a8194dd72a5b664debd3cea7a9ad (commit) via 589272937f4458713a5cda41b19687113dc7b676 (commit) via 3bcdbd2b34f7d71383944364658a0684cadb7d2e (commit) via baa7ffb28fa89caf989f3b3494450d1b3b413f57 (commit) via 19845079c29f08de54044e7b12d0c21b59a79dbe (commit) via e65b1bec7aa9d6d158bcdc279086af822077806d (commit) via 63d4ddf9895e063f65aa573a0daeff2f58101e18 (commit) via a22921f7b576217d6fdcca28dfaf7134e6bd047b (commit) via 5d16747f00a6492e70e36a60fc0232fa3ec92fd0 (commit) via f347b564bee2e3ad90c90790ebb2e1cb11455d59 (commit) via 1c43a338610e023ce94f9484f73c2e8848b14a3f (commit) via 90c0dc425e350b091d73a55534f0d858e035e9a7 (commit) from 08861788590164bab28c8dbaa4f58eebd772a7bc (commit) - Log ----------------------------------------------------------------- commit 163d929abb3ea91c7b8fe8e58f64d3da7fa91a4e Merge: b7e0265f0ba1eaae64df80177e856d851811bd0a 0aa13c5497949196c156c9984b70b8c70fe56709 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 15 22:48:05 2011 +0200 Merge remote-tracking branch 'tyron/master' commit 0aa13c5497949196c156c9984b70b8c70fe56709 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Wed Jun 15 19:20:19 2011 +0200 No php5.3 dependency & fixes ajax requests broken commit b7e0265f0ba1eaae64df80177e856d851811bd0a Merge: 56a2e05ccd7c3dba725d00cdb7e18e7f32b94998 08861788590164bab28c8dbaa4f58eebd772a7bc Author: Pootle server <pootle(a)cihar.com> Date: Wed Jun 15 18:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit 56a2e05ccd7c3dba725d00cdb7e18e7f32b94998 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:03:18 2011 +0200 Translation update done using Pootle. commit bbc1ff47aed0e24b8f8774222e715f098cc2c4d8 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:03:12 2011 +0200 Translation update done using Pootle. commit 1924fe1690d9625f36e5fb176381ecccc19d7abe Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:03:06 2011 +0200 Translation update done using Pootle. commit 1f7452532f257f09fbfe1be3ce01a20f825570b5 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:02:57 2011 +0200 Translation update done using Pootle. commit dbc95a1114f3a8194dd72a5b664debd3cea7a9ad Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:02:47 2011 +0200 Translation update done using Pootle. commit 589272937f4458713a5cda41b19687113dc7b676 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:02:37 2011 +0200 Translation update done using Pootle. commit 3bcdbd2b34f7d71383944364658a0684cadb7d2e Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:02:08 2011 +0200 Translation update done using Pootle. commit baa7ffb28fa89caf989f3b3494450d1b3b413f57 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:01:34 2011 +0200 Translation update done using Pootle. commit 19845079c29f08de54044e7b12d0c21b59a79dbe Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:00:47 2011 +0200 Translation update done using Pootle. commit e65b1bec7aa9d6d158bcdc279086af822077806d Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:00:33 2011 +0200 Translation update done using Pootle. commit 63d4ddf9895e063f65aa573a0daeff2f58101e18 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 17:00:25 2011 +0200 Translation update done using Pootle. commit a22921f7b576217d6fdcca28dfaf7134e6bd047b Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 16:59:24 2011 +0200 Translation update done using Pootle. commit 5d16747f00a6492e70e36a60fc0232fa3ec92fd0 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 16:58:45 2011 +0200 Translation update done using Pootle. commit f347b564bee2e3ad90c90790ebb2e1cb11455d59 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 16:58:38 2011 +0200 Translation update done using Pootle. commit 1c43a338610e023ce94f9484f73c2e8848b14a3f Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 16:58:29 2011 +0200 Translation update done using Pootle. commit 90c0dc425e350b091d73a55534f0d858e035e9a7 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 15 16:58:22 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 14 ++++++-------- po/fr.po | 28 ++++++++++------------------ server_status.php | 5 +---- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index b5b3572..ce8c8c8 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-15 02:35+0200\n" +"PO-Revision-Date: 2011-06-15 16:58+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -4900,24 +4900,22 @@ msgid "Language" msgstr "Language" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Textarea columns" +msgstr "Restore column order" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Drag to reorder" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Click to select" +msgstr "Click to sort" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Click to mark/unmark" #: libraries/display_tbl.lib.php:425 #, php-format diff --git a/po/fr.po b/po/fr.po index 38c6b0e..9228b92 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-15 14:46+0200\n" +"PO-Revision-Date: 2011-06-15 17:03+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -4960,24 +4960,22 @@ msgid "Language" msgstr "Langue" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Taille horizontale pour une zone de texte" +msgstr "Restaurer l'ordre des colonnes" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Faire glisser pour réordonner" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Cliquer pour sélectionner" +msgstr "Cliquer pour trier" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Cliquer pour marquer/enlever les marques" #: libraries/display_tbl.lib.php:425 #, php-format @@ -9764,40 +9762,34 @@ msgid "X-Axis:" msgstr "Axe des X" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "Requêtes SQL" +msgstr "Séries:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Taille horizontale pour une zone de texte" +msgstr "Les colonnes restantes" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" msgstr "Étiquette pour l'axe des X" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Valeur" +msgstr "Valeurs en X" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" msgstr "Étiquette pour l'axe des Y" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Valeur" +msgstr "Valeurs en Y" #: tbl_create.php:56 #, php-format diff --git a/server_status.php b/server_status.php index 2f06abd..2c4739f 100644 --- a/server_status.php +++ b/server_status.php @@ -25,13 +25,10 @@ if (isset($_REQUEST['ajax_request'])) { // Prevent ajax requests from being cached header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past - header_remove('Last-Modified'); // Send correct charset header('Content-Type: text/html; charset=UTF-8'); - if (isset($_REQUEST["query_chart"])) { - exit(createQueryChart()); - } + // real-time charting data if(isset($_REQUEST['chart_data'])) { switch($_REQUEST['type']) { case 'proc': hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3763-g0886178
by Madhura Jayaratne 15 Jun '11

15 Jun '11

The branch, master has been updated via 08861788590164bab28c8dbaa4f58eebd772a7bc (commit) via 396e4e99799c91a8c39f2bbe156e6795cdef6ee5 (commit) from f05a988b86049fae9eadfa0c1f29cb020d332930 (commit) - Log ----------------------------------------------------------------- commit 08861788590164bab28c8dbaa4f58eebd772a7bc Merge: f05a988b86049fae9eadfa0c1f29cb020d332930 396e4e99799c91a8c39f2bbe156e6795cdef6ee5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Jun 15 20:10:54 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++- js/functions.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e648e2f..f30beea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -phpMyAdmin - ChangeLog +phpMyAdmin - ChangeLog ====================== 3.5.0.0 (not yet released) @@ -29,6 +29,7 @@ - bug #3313210 [interface] Columns class sometimes changed for nothing - patch #3313326 [interface] Some tooltips do not disappear - bug #3315720 [search] Fix search in non unicode tables +- bug #3315741 [display] Inline query edit broken 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/functions.js b/js/functions.js index 4ad7c77..1b09f63 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1151,7 +1151,7 @@ function changeMIMEType(db, table, reference, mime_type) * Jquery Coding for inline editing SQL_QUERY */ $(document).ready(function(){ - $(".inline_edit_sql").click( function(){ + $(".inline_edit_sql").live('click', function(){ var db = $(this).prev().find("input[name='db']").val(); var table = $(this).prev().find("input[name='table']").val(); var token = $(this).prev().find("input[name='token']").val(); hooks/post-receive -- phpMyAdmin

1 0