gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-07-25 17:23:41 +02:00
commit 72953da3fd
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/server_status_monitor.js
View File

@ -1201,6 +1201,19 @@ AJAX.registerOnload('server_status_monitor.js', function () {
settings.axes.yaxis.tickOptions = {
formatter: $.jqplot.byteFormatter(1) // KiB
};
} else if (settings.title === PMA_messages.strQuestions
|| settings.title === PMA_messages.strConnections
) {
settings.axes.yaxis.tickOptions = {
formatter: function(format, val) {
if (Math.abs(val) >= 1000000)
return $.jqplot.sprintf("%.3g M", val/1000000);
else if (Math.abs(val) >= 1000)
return $.jqplot.sprintf("%.3g k", val/1000);
else
return $.jqplot.sprintf("%d", val);
}
};
}
settings.series = chartObj.series;

6
themes/pmahomme/css/common.css.php
View File

@ -2811,3 +2811,9 @@ body .ui-widget {
color: #235A81;
}
/* over-riding jqplot-yaxis class */
.jqplot-yaxis {
left:0px !important;
min-width:25px;
width:auto;
}