The branch, master has been updated via a0ee259418ca7e56bd61569fe0cf7bc321de0bad (commit) via 146d92281b908c21e454361dab58da2660397259 (commit) via e7f2afe8ce5356b295bc50373abc293602272f53 (commit) from d67f4574219d654e71b719e229c0b98f663a1091 (commit)

- Log ----------------------------------------------------------------- commit a0ee259418ca7e56bd61569fe0cf7bc321de0bad Merge: d67f4574219d654e71b719e229c0b98f663a1091 146d92281b908c21e454361dab58da2660397259 Author: Michal Čihař mcihar@suse.cz Date: Wed Jun 22 08:32:48 2011 +0200

Merge remote-tracking branch 'tyron/master'

Conflicts: server_status.php

commit 146d92281b908c21e454361dab58da2660397259 Author: Tyron Madlener tyronx@gmail.com Date: Mon Jun 20 21:15:42 2011 +0200

better alignment for query chart

commit e7f2afe8ce5356b295bc50373abc293602272f53 Author: Tyron Madlener tyronx@gmail.com Date: Mon Jun 20 21:15:23 2011 +0200

- Label for live chart refresh rate list - Better alignment for query pie chart - some variable escaping for variable editing

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

Summary of changes: js/server_status.js | 8 ++++---- server_status.php | 20 +++++++++++++------- server_variables.php | 2 +- themes/original/css/theme_right.css.php | 3 ++- themes/pmahomme/css/theme_right.css.php | 3 ++- 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/js/server_status.js b/js/server_status.js index 87c2fa9..af8f93c 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -243,7 +243,7 @@ $(function() { 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 = 2; }

if(! settings.chart) settings.chart = {}; @@ -255,7 +255,7 @@ $(function() { tabChart[$tab.attr('id')] = PMA_createChart(settings); $(link).html(PMA_messages['strStaticData']); $tab.find('.statuslinks a.tabRefresh').hide(); - $tab.find('.statuslinks select').show(); + $tab.find('.statuslinks .refreshList').show(); } else { clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]); chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]=null; @@ -264,8 +264,8 @@ $(function() { tabStatus[$tab.attr('id')]='static'; tabChart[$tab.attr('id')].destroy(); $tab.find('.statuslinks a.tabRefresh').show(); - $tab.find('.statuslinks select').get(0).selectedIndex=0; - $tab.find('.statuslinks select').hide(); + $tab.find('.statuslinks select').get(0).selectedIndex=2; + $tab.find('.statuslinks .refreshList').hide(); } }

diff --git a/server_status.php b/server_status.php index b47fda4..303a87b 100644 --- a/server_status.php +++ b/server_status.php @@ -16,7 +16,7 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { }

if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) - $GLOBALS['is_header_sent'] = true; + $GLOBALS['is_header_sent'] = true;

require_once './libraries/common.inc.php';

@@ -409,9 +409,12 @@ echo __('Runtime Information'); <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> <?php echo __('Refresh'); ?> </a> - <select name="trafficChartRefresh" style="display:none;"> - <?php PMA_choose_refresh_rate(); ?> - </select> + <span class="refreshList" style="display:none;"> + <label for="trafficChartRefresh"><?php echo __('Refresh rate:'); ?></label> + <select name="trafficChartRefresh" style="display:none;"> + <?php PMA_choose_refresh_rate(); ?> + </select> + </span>

<a class="tabChart livetrafficLink" href="#"> <?php echo __('Live traffic chart'); ?> @@ -432,9 +435,12 @@ echo __('Runtime Information'); <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> <?php echo __('Refresh'); ?> </a> - <select name="queryChartRefresh" style="display:none;"> - <?php PMA_choose_refresh_rate(); ?> - </select> + <span class="refreshList" style="display:none;"> + <label for="queryChartRefresh"><?php echo __('Refresh rate:'); ?></label> + <select name="queryChartRefresh" style="display:none;"> + <?php PMA_choose_refresh_rate(); ?> + </select> + </span> <a class="tabChart livequeriesLink" href="#"> <?php echo __('Live query chart'); ?> </a> diff --git a/server_variables.php b/server_variables.php index d269852..792bb99 100644 --- a/server_variables.php +++ b/server_variables.php @@ -44,7 +44,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $value = $_REQUEST['varValue']; if(!is_numeric($value)) $value="'".$value."'";

- if(PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value)) + if(PMA_DBI_query('SET GLOBAL '.PMA_backquote($_REQUEST['varName']).' = '.$value)) // Some values are rounded down etc. $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.$_REQUEST['varName'].'";','NUM');

diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index cd0a2fd..932f6b8 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -998,9 +998,10 @@ div#serverstatus table caption a.top { }

div#serverstatusquerieschart { - float:<?php echo $right; ?>; + float:<?php echo $left; ?>; width:500px; height:350px; + padding-<?php echo $left; ?>: 30px; }

div#serverstatus table#serverstatusqueriesdetails { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index bba0bcb..ba5a926 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1201,9 +1201,10 @@ div#serverstatus table caption a.top { }

div#serverstatusquerieschart { - float:<?php echo $right; ?>; + float:<?php echo $left; ?>; width:500px; height:350px; + padding-<?php echo $left; ?>: 30px; }

div#serverstatus table#serverstatusqueriesdetails {

hooks/post-receive