The branch, master has been updated via e69bbb4ec119c507ac737b1047d9acaccf0ee41a (commit) via 2ca1d9ff465ad46b5a6bfd74d1fd38fb3727e2b9 (commit) via 08701a59ce243af329f4e9cec041643733e94213 (commit) from af33ed507185e32cf7ff9ceed301a0423259232b (commit)

- Log ----------------------------------------------------------------- commit e69bbb4ec119c507ac737b1047d9acaccf0ee41a Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: Wed Dec 8 20:21:51 2010 +0100

Use less noisy message and remove disable link on database statistics

commit 2ca1d9ff465ad46b5a6bfd74d1fd38fb3727e2b9 Merge: 08701a59ce243af329f4e9cec041643733e94213 af33ed507185e32cf7ff9ceed301a0423259232b Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: Wed Dec 8 20:00:46 2010 +0100

Merge branch 'master' into chart_notice

commit 08701a59ce243af329f4e9cec041643733e94213 Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: Mon Dec 6 21:21:24 2010 +0100

query chart : improve message layout and remove disable link

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + server_databases.php | 13 ++++--------- server_status.php | 12 +++++------- 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 9e4dd19..9d4692b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ - bug #3123433 [interface] Avoid double escaping of MySQL errors. - bug #3119874 [interface] Show integers without decimals on status page. - bug #3119882 [interface] Display query chart on demand. +- [interface] Use less noisy message and remove disable link on server charts and database statistics.

3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/server_databases.php b/server_databases.php index a0b5705..af4b3cf 100644 --- a/server_databases.php +++ b/server_databases.php @@ -251,20 +251,15 @@ if ($databases_count > 0) { PMA_buttonOrImage('drop_selected_dbs', 'mult_submit', 'drop_selected_dbs', __('Drop'), 'b_deltbl.png'); }

- echo '<ul><li id="li_switch_dbstats"><strong>' . "\n"; if (empty($dbstats)) { + echo '<ul><li id="li_switch_dbstats"><strong>' . "\n"; echo ' <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1"' .' title="' . __('Enable Statistics') . '">' . "\n" .' ' . __('Enable Statistics'); - } else { - echo ' <a href="./server_databases.php?' . $url_query . '"' - .' title="' . __('Disable Statistics') . '">' . "\n" - .' ' . __('Disable Statistics'); + echo '</a></strong><br />' . "\n"; + PMA_Message::notice(__('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'))->display(); + echo '</li>' . "\n" . '</ul>' . "\n"; } - echo '</a></strong><br />' . "\n"; - PMA_Message::warning(__('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'))->display(); - echo '</li>' . "\n" - .'</ul>' . "\n"; echo '</form>'; } else { echo __('No databases'); diff --git a/server_status.php b/server_status.php index 47649ac..bd5dafc 100644 --- a/server_status.php +++ b/server_status.php @@ -705,16 +705,14 @@ foreach ($used_queries as $name => $value) { <div id="serverstatusquerieschart"> <?php if (empty($_REQUEST["query_chart"])) { - echo '<a href="' . $PMA_PHP_SELF . '?' . $url_query . '&amp;query_chart=1#serverstatusqueries"' - .'title="' . __('Show query chart') . '">' - . __('Show query chart') . '</a>'; + echo '<a href="' . $PMA_PHP_SELF . '?' . $url_query + . '&amp;query_chart=1#serverstatusqueries"' + . 'title="' . __('Show query chart') . '">[' + . __('Show query chart') . ']</a>'; + PMA_Message::notice( __('Note: Generating the query chart can take a long time.'))->display(); } else { echo PMA_chart_status($used_queries); - echo '<a href="' . $PMA_PHP_SELF . '?' . $url_query . '#serverstatusqueries"' - .'title="' . __('Hide query chart') . '">' - . __('Hide query chart') . '</a>'; } - PMA_Message::warning(__('Note: Generating the query chart can take a long time.'))->display(); ?> </div>

hooks/post-receive