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 2014-03-01 13:21:38 +01:00
commit 1ed0ef5038
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/functions.js
View File

@ -1802,7 +1802,8 @@ function PMA_createProfilingChartJqplot(target, data)
},
legend: {
show: true,
location: 'e'
location: 'e',
rendererOptions: {numberColumns: 2}
},
// from http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines#Color_Palette
seriesColors: [

1
libraries/sql.lib.php
View File

@ -506,6 +506,7 @@ function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results)
</script>
EOT;
$profiling_table .= "</div>";
$profiling_table .= "<div class='clearfloat'></div>";
//require_once 'libraries/chart.lib.php';
$profiling_table .= '<div id="profilingChartData" style="display:none;">';

2
themes/original/css/common.css.php
View File

@ -1146,7 +1146,7 @@ div#querywindowcontainer fieldset {
/* profiling */
div#profilingchart {
width: 550px;
width: 850px;
height: 370px;
float: left;
}

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

@ -1502,7 +1502,7 @@ div#querywindowcontainer fieldset {
/* profiling */
div#profilingchart {
width: 550px;
width: 850px;
height: 370px;
float: <?php echo $left; ?>;
}