Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
This commit is contained in:
Marc Delisle
commit
6314225f41
@ -14,15 +14,15 @@ $(function() {
|
||||
$('div#logAnalyseDialog .datetimefield').each(function() {
|
||||
PMA_addDatepicker($(this));
|
||||
});
|
||||
|
||||
|
||||
/**** Monitor charting implementation ****/
|
||||
/* Saves the previous ajax response for differential values */
|
||||
var oldChartData = null;
|
||||
// Holds about to created chart
|
||||
var newChart = null;
|
||||
var chartSpacing;
|
||||
|
||||
// Whenever the monitor object (runtime.charts) or the settings object (monitorSettings)
|
||||
|
||||
// Whenever the monitor object (runtime.charts) or the settings object (monitorSettings)
|
||||
// changes in a way incompatible to the previous version, increase this number
|
||||
// It will reset the users monitor and settings object in his localStorage to the default configuration
|
||||
var monitorProtocolVersion = '1.0';
|
||||
@ -47,7 +47,7 @@ $(function() {
|
||||
xmin: -1,
|
||||
xmax: -1
|
||||
};
|
||||
|
||||
|
||||
var monitorSettings = null;
|
||||
|
||||
var defaultMonitorSettings = {
|
||||
@ -61,7 +61,7 @@ $(function() {
|
||||
|
||||
// Allows drag and drop rearrange and print/edit icons on charts
|
||||
var editMode = false;
|
||||
|
||||
|
||||
/* List of preconfigured charts that the user may select */
|
||||
var presetCharts = {
|
||||
// Query cache efficiency
|
||||
@ -97,14 +97,14 @@ $(function() {
|
||||
|
||||
// chart tooltip
|
||||
var tooltipBox;
|
||||
|
||||
|
||||
/* Add OS specific system info charts to the preset chart list */
|
||||
switch(server_os) {
|
||||
case 'WINNT':
|
||||
$.extend(presetCharts, {
|
||||
case 'WINNT':
|
||||
$.extend(presetCharts, {
|
||||
'cpu': {
|
||||
title: PMA_messages['strSystemCPUUsage'],
|
||||
series: [ {
|
||||
series: [ {
|
||||
label: PMA_messages['strAverageLoad']
|
||||
} ],
|
||||
nodes: [ {
|
||||
@ -112,7 +112,7 @@ $(function() {
|
||||
} ],
|
||||
maxYLabel: []
|
||||
},
|
||||
|
||||
|
||||
'memory': {
|
||||
title: PMA_messages['strSystemMemory'],
|
||||
series: [ {
|
||||
@ -130,7 +130,7 @@ $(function() {
|
||||
],
|
||||
maxYLabel: []
|
||||
},
|
||||
|
||||
|
||||
'swap': {
|
||||
title: PMA_messages['strSystemSwap'],
|
||||
series: [ {
|
||||
@ -149,7 +149,7 @@ $(function() {
|
||||
}
|
||||
});
|
||||
break;
|
||||
|
||||
|
||||
case 'Linux':
|
||||
$.extend(presetCharts, {
|
||||
'cpu': {
|
||||
@ -192,12 +192,12 @@ $(function() {
|
||||
}
|
||||
});
|
||||
break;
|
||||
|
||||
|
||||
case 'SunOS':
|
||||
$.extend(presetCharts, {
|
||||
'cpu': {
|
||||
title: PMA_messages['strSystemCPUUsage'],
|
||||
series: [ {
|
||||
series: [ {
|
||||
label: PMA_messages['strAverageLoad']
|
||||
} ],
|
||||
nodes: [ {
|
||||
@ -409,7 +409,7 @@ $(function() {
|
||||
// To many cells in one row => put into next row
|
||||
$tr.find('td').each(function() {
|
||||
if (numColumns > monitorSettings.columns) {
|
||||
if ($tr.next().length == 0) {
|
||||
if ($tr.next().length == 0) {
|
||||
$tr.after('<tr></tr>');
|
||||
}
|
||||
$tr.next().prepend($(this));
|
||||
@ -505,14 +505,14 @@ $(function() {
|
||||
|
||||
$(this).dialog("close");
|
||||
};
|
||||
|
||||
|
||||
dlgButtons[PMA_messages['strClose']] = function() {
|
||||
newChart = null;
|
||||
$('span#clearSeriesLink').hide();
|
||||
$('#seriesPreview').html('');
|
||||
$(this).dialog("close");
|
||||
};
|
||||
|
||||
|
||||
var $presetList = $('div#addChartDialog select[name="presetCharts"]');
|
||||
if ($presetList.html().length == 0) {
|
||||
$.each(presetCharts, function(key, value) {
|
||||
@ -523,7 +523,7 @@ $(function() {
|
||||
$('input[name="chartTitle"]').attr('value', presetCharts[$(this).prop('value')].title);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
$('div#addChartDialog').dialog({
|
||||
width: 'auto',
|
||||
height: 'auto',
|
||||
@ -534,7 +534,7 @@ $(function() {
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
$('a[href="#exportMonitorConfig"]').click(function() {
|
||||
var gridCopy = {};
|
||||
|
||||
@ -544,15 +544,15 @@ $(function() {
|
||||
gridCopy[key].settings = elem.settings;
|
||||
gridCopy[key].title = elem.title;
|
||||
});
|
||||
|
||||
|
||||
var exportData = {
|
||||
monitorCharts: gridCopy,
|
||||
monitorSettings: monitorSettings
|
||||
};
|
||||
var $form;
|
||||
|
||||
|
||||
$('body').append($form = $('<form method="post" action="file_echo.php?' + url_query + '&filename=1" style="display:none;"></form>'));
|
||||
|
||||
|
||||
$form.append('<input type="hidden" name="monitorconfig" value="' + encodeURI($.toJSON(exportData)) + '">');
|
||||
$form.submit();
|
||||
$form.remove();
|
||||
@ -562,16 +562,16 @@ $(function() {
|
||||
$('div#emptyDialog').dialog({title: PMA_messages['strImportDialogTitle']});
|
||||
$('div#emptyDialog').html(PMA_messages['strImportDialogMessage'] + ':<br/><form action="file_echo.php?' + url_query + '&import=1" method="post" enctype="multipart/form-data">' +
|
||||
'<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>');
|
||||
|
||||
|
||||
var dlgBtns = {};
|
||||
|
||||
|
||||
dlgBtns[PMA_messages['strImport']] = function() {
|
||||
var $iframe, $form;
|
||||
$('body').append($iframe = $('<iframe id="monitorConfigUpload" style="display:none;"></iframe>'));
|
||||
var d = $iframe[0].contentWindow.document;
|
||||
d.open(); d.close();
|
||||
mew = d;
|
||||
|
||||
|
||||
$iframe.load(function() {
|
||||
var json;
|
||||
|
||||
@ -585,14 +585,14 @@ $(function() {
|
||||
$('div#emptyDialog').dialog('close');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Basic check, is this a monitor config json?
|
||||
if (!json || ! json.monitorCharts || ! json.monitorCharts) {
|
||||
alert(PMA_messages['strFailedParsingConfig']);
|
||||
$('div#emptyDialog').dialog('close');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// If json ok, try applying config
|
||||
try {
|
||||
window.localStorage['monitorCharts'] = $.toJSON(json.monitorCharts);
|
||||
@ -605,20 +605,20 @@ $(function() {
|
||||
window.localStorage.removeItem('monitorSettings');
|
||||
rebuildGrid();
|
||||
}
|
||||
|
||||
|
||||
$('div#emptyDialog').dialog('close');
|
||||
});
|
||||
|
||||
|
||||
$("body", d).append($form = $('div#emptyDialog').find('form'));
|
||||
$form.submit();
|
||||
$('div#emptyDialog').append('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
|
||||
};
|
||||
|
||||
|
||||
dlgBtns[PMA_messages['strCancel']] = function() {
|
||||
$(this).dialog('close');
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
$('div#emptyDialog').dialog({
|
||||
width: 'auto',
|
||||
height: 'auto',
|
||||
@ -647,7 +647,7 @@ $(function() {
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
$('a[href="#monitorInstructionsDialog"]').click(function() {
|
||||
var $dialog = $('div#monitorInstructionsDialog');
|
||||
|
||||
@ -699,7 +699,7 @@ $(function() {
|
||||
+ $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time'])
|
||||
+ '<br />';
|
||||
}
|
||||
|
||||
|
||||
if (logVars['long_query_time'] < 2) {
|
||||
str += PMA_getImage('s_success.png') + ' '
|
||||
+ $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time'])
|
||||
@ -718,7 +718,7 @@ $(function() {
|
||||
if (logVars['log_output'] == 'TABLE') {
|
||||
varValue = 'FILE';
|
||||
}
|
||||
|
||||
|
||||
str += '- <a class="set" href="#log_output-' + varValue + '">'
|
||||
+ $.sprintf(PMA_messages['strSetLogOutput'], varValue)
|
||||
+ ' </a><br />';
|
||||
@ -772,8 +772,8 @@ $(function() {
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
loadLogVars();
|
||||
|
||||
return false;
|
||||
@ -782,7 +782,7 @@ $(function() {
|
||||
$('input[name="chartType"]').change(function() {
|
||||
$('#chartVariableSettings').toggle(this.checked && this.value == 'variable');
|
||||
var title = $('input[name="chartTitle"]').attr('value');
|
||||
if (title == PMA_messages['strChartTitle']
|
||||
if (title == PMA_messages['strChartTitle']
|
||||
|| title == $('label[for="' + $('input[name="chartTitle"]').data('lastRadio') + '"]').text()
|
||||
) {
|
||||
$('input[name="chartTitle"]')
|
||||
@ -831,7 +831,7 @@ $(function() {
|
||||
if ($('input#variableInput').attr('value').length == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (newChart == null) {
|
||||
$('#seriesPreview').html('');
|
||||
|
||||
@ -905,11 +905,11 @@ $(function() {
|
||||
var dlgBtns = {};
|
||||
dlgBtns[PMA_messages['strClose']] = function() { $(this).dialog('close'); };
|
||||
|
||||
$('div#emptyDialog').dialog({
|
||||
$('div#emptyDialog').dialog({
|
||||
width: 400,
|
||||
buttons: dlgBtns
|
||||
buttons: dlgBtns
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (runtime.charts == null) {
|
||||
@ -934,13 +934,13 @@ $(function() {
|
||||
/* Calculate how much spacing there is between each chart */
|
||||
$('table#chartGrid').html('<tr><td></td><td></td></tr><tr><td></td><td></td></tr>');
|
||||
chartSpacing = {
|
||||
width: $('table#chartGrid td:nth-child(2)').offset().left
|
||||
width: $('table#chartGrid td:nth-child(2)').offset().left
|
||||
- $('table#chartGrid td:nth-child(1)').offset().left,
|
||||
height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top
|
||||
height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top
|
||||
- $('table#chartGrid tr:nth-child(1) td:nth-child(1)').offset().top
|
||||
}
|
||||
$('table#chartGrid').html('');
|
||||
|
||||
|
||||
/* Add all charts - in correct order */
|
||||
var keys = [];
|
||||
$.each(runtime.charts, function(key, value) {
|
||||
@ -959,11 +959,11 @@ $(function() {
|
||||
|
||||
// Empty cells should keep their size so you can drop onto them
|
||||
$('table#chartGrid tr td').css('width', chartSize().width + 'px');
|
||||
|
||||
|
||||
buildRequiredDataList();
|
||||
refreshChartGrid();
|
||||
}
|
||||
|
||||
|
||||
/* Destroys all monitor related resources */
|
||||
function destroyGrid() {
|
||||
if (runtime.charts) {
|
||||
@ -973,22 +973,22 @@ $(function() {
|
||||
} catch(err) {}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
runtime.refreshRequest.abort();
|
||||
} catch(err) {}
|
||||
try {
|
||||
try {
|
||||
clearTimeout(runtime.refreshTimeout);
|
||||
} catch(err) {}
|
||||
|
||||
|
||||
$('table#chartGrid').html('');
|
||||
|
||||
runtime.charts = null;
|
||||
runtime.chartAI = 0;
|
||||
monitorSettings = null;
|
||||
}
|
||||
|
||||
/* Calls destroyGrid() and initGrid(), but before doing so it saves the chart
|
||||
|
||||
/* Calls destroyGrid() and initGrid(), but before doing so it saves the chart
|
||||
* data from each chart and restores it after the monitor is initialized again */
|
||||
function rebuildGrid() {
|
||||
var oldData = null;
|
||||
@ -1002,10 +1002,10 @@ $(function() {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
destroyGrid();
|
||||
initGrid();
|
||||
|
||||
|
||||
if (oldData) {
|
||||
$.each(runtime.charts, function(key, chartObj) {
|
||||
for (var j = 0; j < chartObj.nodes.length; j++) {
|
||||
@ -1014,7 +1014,7 @@ $(function() {
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Calculactes the dynamic chart size that depends on the column width */
|
||||
@ -1030,7 +1030,10 @@ $(function() {
|
||||
function addChart(chartObj, initialize) {
|
||||
|
||||
var settings = {
|
||||
title: chartObj.title,
|
||||
title: {
|
||||
text: chartObj.title,
|
||||
escapeHtml: true
|
||||
},
|
||||
grid: {
|
||||
drawBorder: false,
|
||||
shadow: false,
|
||||
@ -1208,7 +1211,7 @@ $(function() {
|
||||
if (! htmlnode ) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
var chart = null;
|
||||
var chartKey = null;
|
||||
$.each(runtime.charts, function(key, value) {
|
||||
@ -1218,7 +1221,7 @@ $(function() {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
if (chart == null) {
|
||||
return;
|
||||
}
|
||||
@ -1228,18 +1231,18 @@ $(function() {
|
||||
for (var i = 0; i<chart.nodes.length; i++) {
|
||||
htmlStr += '<li><i>' + chart.nodes[i].dataPoints[0].name + ': </i><br/><input type="text" name="chartSerie-' + i + '" value="' + chart.nodes[i].name + '" /></li>';
|
||||
}
|
||||
|
||||
|
||||
dlgBtns = {};
|
||||
dlgBtns[PMA_messages['strSave']] = function() {
|
||||
runtime.charts[chartKey].title = $('div#emptyDialog input[name="chartTitle"]').attr('value');
|
||||
runtime.charts[chartKey].chart.setTitle({ text: runtime.charts[chartKey].title });
|
||||
|
||||
|
||||
$('div#emptyDialog input[name*="chartSerie"]').each(function() {
|
||||
var idx = $(this).attr('name').split('-')[1];
|
||||
runtime.charts[chartKey].nodes[idx].name = $(this).attr('value');
|
||||
runtime.charts[chartKey].chart.series[idx].name = $(this).attr('value');
|
||||
});
|
||||
|
||||
|
||||
$(this).dialog('close');
|
||||
saveMonitor();
|
||||
};
|
||||
@ -1268,7 +1271,7 @@ $(function() {
|
||||
loadLog('slow', min, max);
|
||||
$(this).dialog("close");
|
||||
};
|
||||
|
||||
|
||||
dlgBtns[PMA_messages['strFromGeneralLog']] = function() {
|
||||
loadLog('general', min, max);
|
||||
$(this).dialog("close");
|
||||
@ -1293,15 +1296,15 @@ $(function() {
|
||||
limitTypes: $('input#limitTypes').prop('checked')
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* Removes a chart from the grid */
|
||||
function removeChart(chartObj) {
|
||||
var htmlnode = chartObj.options.chart.renderTo;
|
||||
if (! htmlnode ) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$.each(runtime.charts, function(key, value) {
|
||||
if (value.chart.options.chart.renderTo == htmlnode) {
|
||||
delete runtime.charts[key];
|
||||
@ -1325,10 +1328,10 @@ $(function() {
|
||||
function refreshChartGrid() {
|
||||
/* Send to server */
|
||||
runtime.refreshRequest = $.post('server_status.php?' + url_query, {
|
||||
ajax_request: true,
|
||||
chart_data: 1,
|
||||
type: 'chartgrid',
|
||||
requiredData: $.toJSON(runtime.dataList)
|
||||
ajax_request: true,
|
||||
chart_data: 1,
|
||||
type: 'chartgrid',
|
||||
requiredData: $.toJSON(runtime.dataList)
|
||||
}, function(data) {
|
||||
var chartData;
|
||||
try {
|
||||
@ -1338,7 +1341,7 @@ $(function() {
|
||||
}
|
||||
var value, i = 0;
|
||||
var diff;
|
||||
|
||||
|
||||
/* Update values in each graph */
|
||||
$.each(runtime.charts, function(orderKey, elem) {
|
||||
var key = elem.chartID;
|
||||
@ -1363,7 +1366,7 @@ $(function() {
|
||||
|
||||
//elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false);
|
||||
/* Calculate y value */
|
||||
|
||||
|
||||
// If transform function given, use it
|
||||
if (elem.nodes[j].transformFn) {
|
||||
value = chartValueTransform(
|
||||
@ -1379,7 +1382,7 @@ $(function() {
|
||||
value = parseFloat(chartData[key][j][0].value);
|
||||
|
||||
if (elem.nodes[j].display == 'differential') {
|
||||
if (oldChartData == null || oldChartData[key] == null) {
|
||||
if (oldChartData == null || oldChartData[key] == null) {
|
||||
continue;
|
||||
}
|
||||
value -= oldChartData[key][j][0].value;
|
||||
@ -1389,7 +1392,7 @@ $(function() {
|
||||
value = value / elem.nodes[j].valueDivisor;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Set y value, if defined
|
||||
if (value != undefined) {
|
||||
elem.chart.series[j].data.push([chartData.x, value]);
|
||||
@ -1429,9 +1432,9 @@ $(function() {
|
||||
runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/* Function that supplies special value transform functions for chart values */
|
||||
function chartValueTransform(name, cur, prev) {
|
||||
function chartValueTransform(name, cur, prev) {
|
||||
switch(name) {
|
||||
case 'cpu-linux':
|
||||
if (prev == null) {
|
||||
@ -1471,7 +1474,7 @@ $(function() {
|
||||
*/
|
||||
function buildRequiredDataList() {
|
||||
runtime.dataList = {};
|
||||
// Store an own id, because the property name is subject of reordering,
|
||||
// Store an own id, because the property name is subject of reordering,
|
||||
// thus destroying our mapping with runtime.charts <=> runtime.dataList
|
||||
var chartID = 0;
|
||||
$.each(runtime.charts, function(key, chart) {
|
||||
@ -1495,10 +1498,10 @@ $(function() {
|
||||
if (! opts.limitTypes) {
|
||||
opts.limitTypes = false;
|
||||
}
|
||||
|
||||
|
||||
$('#emptyDialog').dialog({title: PMA_messages['strAnalysingLogsTitle']});
|
||||
$('#emptyDialog').html(PMA_messages['strAnalysingLogs'] +
|
||||
' <img class="ajaxIcon" src="' + pmaThemeImage +
|
||||
$('#emptyDialog').html(PMA_messages['strAnalysingLogs'] +
|
||||
' <img class="ajaxIcon" src="' + pmaThemeImage +
|
||||
'ajax_clock_small.gif" alt="">');
|
||||
var dlgBtns = {};
|
||||
|
||||
@ -1526,14 +1529,14 @@ $(function() {
|
||||
removeVariables: opts.removeVariables,
|
||||
limitTypes: opts.limitTypes
|
||||
},
|
||||
function(data) {
|
||||
function(data) {
|
||||
var logData;
|
||||
try {
|
||||
logData = $.parseJSON(data);
|
||||
} catch(err) {
|
||||
return serverResponseError();
|
||||
}
|
||||
|
||||
|
||||
if (logData.rows.length != 0) {
|
||||
runtime.logDataCols = buildLogTable(logData);
|
||||
|
||||
@ -1582,26 +1585,26 @@ $(function() {
|
||||
$(this).dialog("close");
|
||||
$(document).scrollTop($('div#logTable').offset().top);
|
||||
};
|
||||
|
||||
|
||||
$('#emptyDialog').dialog( "option", "buttons", dlgBtns);
|
||||
|
||||
|
||||
} else {
|
||||
$('#emptyDialog').dialog({title: PMA_messages['strNoDataFoundTitle']});
|
||||
$('#emptyDialog').html('<p>' + PMA_messages['strNoDataFound'] + '</p>');
|
||||
|
||||
|
||||
var dlgBtns = {};
|
||||
dlgBtns[PMA_messages['strClose']] = function() {
|
||||
$(this).dialog("close");
|
||||
dlgBtns[PMA_messages['strClose']] = function() {
|
||||
$(this).dialog("close");
|
||||
};
|
||||
|
||||
|
||||
$('#emptyDialog').dialog( "option", "buttons", dlgBtns );
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
/* Handles the actions performed when the user uses any of the log table filters
|
||||
/* Handles the actions performed when the user uses any of the log table filters
|
||||
* which are the filter by name and grouping with ignoring data in WHERE clauses
|
||||
*
|
||||
*
|
||||
* @param boolean Should be true when the users enabled or disabled to group queries ignoring data in WHERE clauses
|
||||
*/
|
||||
function filterQueries(varFilterChange) {
|
||||
@ -1613,7 +1616,7 @@ $(function() {
|
||||
} else {
|
||||
textFilter = new RegExp(val, 'i');
|
||||
}
|
||||
|
||||
|
||||
var rowSum = 0, totalSum = 0, i = 0, q;
|
||||
var noVars = $('div#logTable input#noWHEREData').attr('checked');
|
||||
var equalsFilter = /([^=]+)=(\d+|((\'|"|).*?[^\\])\4((\s+)|$))/gi;
|
||||
@ -1624,7 +1627,7 @@ $(function() {
|
||||
var sumColumnName = runtime.logDataCols[runtime.logDataCols.length - 1];
|
||||
var isSlowLog = opts.src == 'slow';
|
||||
var columnSums = {};
|
||||
|
||||
|
||||
// For the slow log we have to count many columns (query_time, lock_time, rows_examined, rows_sent, etc.)
|
||||
var countRow = function(query, row) {
|
||||
var cells = row.match(/<td>(.*?)<\/td>/gi);
|
||||
@ -1639,15 +1642,15 @@ $(function() {
|
||||
columnSums[query][2] += parseInt(cells[4].replace(/(<td>|<\/td>)/gi, ''));
|
||||
columnSums[query][3] += parseInt(cells[5].replace(/(<td>|<\/td>)/gi, ''));
|
||||
};
|
||||
|
||||
|
||||
// We just assume the sql text is always in the second last column, and that the total count is right of it
|
||||
$('div#logTable table tbody tr td:nth-child(' + (runtime.logDataCols.length - 1) + ')').each(function() {
|
||||
// If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we
|
||||
// If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we
|
||||
// need to re-calculate the sums of each row
|
||||
if (varFilterChange && $(this).html().match(/^SELECT/i)) {
|
||||
if (noVars) {
|
||||
// Group on => Sum up identical columns, and hide all but 1
|
||||
|
||||
|
||||
q = $(this).text().replace(equalsFilter, '$1=...$6').trim();
|
||||
q = q.replace(functionFilter, ' $1(...)');
|
||||
|
||||
@ -1709,7 +1712,7 @@ $(function() {
|
||||
hide = false;
|
||||
i++;
|
||||
});
|
||||
|
||||
|
||||
// We finished summarizing counts => Update count values of all grouped entries
|
||||
if (varFilterChange) {
|
||||
if (noVars) {
|
||||
@ -1718,11 +1721,11 @@ $(function() {
|
||||
if (filteredQueries[key] <= 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
row = $table.children('tr:nth-child(' + (value + 1) + ')');
|
||||
numCol = row.children(':nth-child(' + (runtime.logDataCols.length) + ')');
|
||||
numCol.text(filteredQueries[key]);
|
||||
|
||||
|
||||
if (isSlowLog) {
|
||||
row.children('td:nth-child(3)').text(secToTime(columnSums[key][0]));
|
||||
row.children('td:nth-child(4)').text(secToTime(columnSums[key][1]));
|
||||
@ -1731,9 +1734,9 @@ $(function() {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$('div#logTable table').trigger("update");
|
||||
setTimeout(function() {
|
||||
|
||||
$('div#logTable table').trigger("update");
|
||||
setTimeout(function() {
|
||||
$('div#logTable table').trigger('sorton', [[[runtime.logDataCols.length - 1, 1]]]);
|
||||
}, 0);
|
||||
}
|
||||
@ -1751,14 +1754,14 @@ $(function() {
|
||||
var time = timeStr.split(':');
|
||||
return parseInt(time[0]*3600) + parseInt(time[1]*60) + parseInt(time[2]);
|
||||
}
|
||||
|
||||
|
||||
/* Turns a number into a timespan (100 into 00:01:40) */
|
||||
function secToTime(timeInt) {
|
||||
hours = Math.floor(timeInt / 3600);
|
||||
timeInt -= hours*3600;
|
||||
minutes = Math.floor(timeInt / 60);
|
||||
timeInt -= minutes*60;
|
||||
|
||||
|
||||
if (hours < 10) {
|
||||
hours = '0' + hours;
|
||||
}
|
||||
@ -1768,10 +1771,10 @@ $(function() {
|
||||
if (timeInt < 10) {
|
||||
timeInt = '0' + timeInt;
|
||||
}
|
||||
|
||||
|
||||
return hours + ':' + minutes + ':' + timeInt;
|
||||
}
|
||||
|
||||
|
||||
/* Constructs the log table out of the retrieved server data */
|
||||
function buildLogTable(data) {
|
||||
var rows = data.rows;
|
||||
@ -1788,7 +1791,7 @@ $(function() {
|
||||
}
|
||||
return value;
|
||||
};
|
||||
|
||||
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
if (i == 0) {
|
||||
$.each(rows[0], function(key, value) {
|
||||
@ -1853,7 +1856,7 @@ $(function() {
|
||||
|
||||
return cols;
|
||||
}
|
||||
|
||||
|
||||
/* Opens the query analyzer dialog */
|
||||
function openQueryAnalyzer() {
|
||||
var rowData = $(this).parent().data('query');
|
||||
@ -1868,11 +1871,11 @@ $(function() {
|
||||
|
||||
var profilingChart = null;
|
||||
var dlgBtns = {};
|
||||
|
||||
dlgBtns[PMA_messages['strAnalyzeQuery']] = function() {
|
||||
loadQueryAnalysis(rowData);
|
||||
|
||||
dlgBtns[PMA_messages['strAnalyzeQuery']] = function() {
|
||||
loadQueryAnalysis(rowData);
|
||||
};
|
||||
dlgBtns[PMA_messages['strClose']] = function() {
|
||||
dlgBtns[PMA_messages['strClose']] = function() {
|
||||
if (profilingChart != null) {
|
||||
profilingChart.destroy();
|
||||
}
|
||||
@ -1888,13 +1891,13 @@ $(function() {
|
||||
buttons: dlgBtns
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/* Loads and displays the analyzed query data */
|
||||
function loadQueryAnalysis(rowData) {
|
||||
var db = rowData.db || '';
|
||||
|
||||
|
||||
$('div#queryAnalyzerDialog div.placeHolder').html(
|
||||
PMA_messages['strAnalyzing'] + ' <img class="ajaxIcon" src="' +
|
||||
PMA_messages['strAnalyzing'] + ' <img class="ajaxIcon" src="' +
|
||||
pmaThemeImage + 'ajax_clock_small.gif" alt="">');
|
||||
|
||||
$.post('server_status.php?' + url_query, {
|
||||
@ -1914,7 +1917,7 @@ $(function() {
|
||||
// Float sux, I'll use table :(
|
||||
$('div#queryAnalyzerDialog div.placeHolder')
|
||||
.html('<table width="100%" border="0"><tr><td class="explain"></td><td class="chart"></td></tr></table>');
|
||||
|
||||
|
||||
var explain = '<b>' + PMA_messages['strExplainOutput'] + '</b> ' + explain_docu;
|
||||
if (data.explain.length > 1) {
|
||||
explain += ' (';
|
||||
@ -1931,7 +1934,7 @@ $(function() {
|
||||
explain += '<div class="explain-' + i + '"' + (i>0? 'style="display:none;"' : '' ) + '>';
|
||||
$.each(data.explain[i], function(key, value) {
|
||||
value = (value == null)?'null':value;
|
||||
|
||||
|
||||
if (key == 'type' && value.toLowerCase() == 'all') {
|
||||
value = '<span class="attention">' + value + '</span>';
|
||||
}
|
||||
@ -1942,17 +1945,17 @@ $(function() {
|
||||
});
|
||||
explain += '</div>';
|
||||
}
|
||||
|
||||
|
||||
explain += '<p><b>' + PMA_messages['strAffectedRows'] + '</b> ' + data.affectedRows;
|
||||
|
||||
$('div#queryAnalyzerDialog div.placeHolder td.explain').append(explain);
|
||||
|
||||
|
||||
$('div#queryAnalyzerDialog div.placeHolder a[href*="#showExplain"]').click(function() {
|
||||
var id = $(this).attr('href').split('-')[1];
|
||||
$(this).parent().find('div[class*="explain"]').hide();
|
||||
$(this).parent().find('div[class*="explain-' + id + '"]').show();
|
||||
});
|
||||
|
||||
|
||||
if (data.profiling) {
|
||||
var chartData = [];
|
||||
var numberTable = '<table class="queryNums"><thead><tr><th>' + PMA_messages['strStatus'] + '</th><th>' + PMA_messages['strTime'] + '</th></tr></thead><tbody>';
|
||||
@ -1968,12 +1971,12 @@ $(function() {
|
||||
}
|
||||
numberTable += '<tr><td><b>' + PMA_messages['strTotalTime'] + '</b></td><td>' + PMA_prettyProfilingNum(totalTime, 2) + '</td></tr>';
|
||||
numberTable += '</tbody></table>';
|
||||
|
||||
|
||||
$('div#queryAnalyzerDialog div.placeHolder td.chart').append(
|
||||
'<b>' + PMA_messages['strProfilingResults'] + ' ' + profiling_docu + '</b> ' +
|
||||
'(<a href="#showNums">' + PMA_messages['strTable'] + '</a>, <a href="#showChart">' + PMA_messages['strChart'] + '</a>)<br/>' +
|
||||
numberTable + ' <div id="queryProfiling"></div>');
|
||||
|
||||
|
||||
$('div#queryAnalyzerDialog div.placeHolder a[href="#showNums"]').click(function() {
|
||||
$('div#queryAnalyzerDialog div#queryProfiling').hide();
|
||||
$('div#queryAnalyzerDialog table.queryNums').show();
|
||||
@ -1987,7 +1990,7 @@ $(function() {
|
||||
});
|
||||
|
||||
profilingChart = PMA_createProfilingChartJqplot(
|
||||
'queryProfiling',
|
||||
'queryProfiling',
|
||||
chartData
|
||||
);
|
||||
|
||||
|
||||
@ -52,7 +52,8 @@ $(document).ready(function() {
|
||||
}
|
||||
},
|
||||
title: {
|
||||
text: $('input[name="chartTitle"]').attr('value')
|
||||
text: $('input[name="chartTitle"]').attr('value'),
|
||||
escapeHtml: true
|
||||
//margin:20
|
||||
},
|
||||
legend: {
|
||||
@ -245,7 +246,8 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings)
|
||||
|
||||
var settings = {
|
||||
title: {
|
||||
text: ''
|
||||
text: '',
|
||||
escapeHtml: true
|
||||
//margin:20
|
||||
}
|
||||
};
|
||||
@ -279,7 +281,7 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings)
|
||||
if (passedNonJqplotSettings.chart.type == 'spline') {
|
||||
settings.seriesDefaults = {
|
||||
rendererOptions: {
|
||||
smooth: true
|
||||
smooth: true
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
6
po/cs.po
6
po/cs.po
@ -6,7 +6,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 3.5.4-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2012-10-16 14:37+0200\n"
|
||||
"PO-Revision-Date: 2012-11-14 13:43+0200\n"
|
||||
"PO-Revision-Date: 2013-01-15 09:00+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Czech <http://l10n.cihar.com/projects/phpmyadmin/3-5/cs/>\n"
|
||||
"Language: cs\n"
|
||||
@ -14,7 +14,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.3-dev\n"
|
||||
"X-Generator: Weblate 1.4-dev\n"
|
||||
|
||||
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353
|
||||
#: libraries/display_tbl.lib.php:359 server_privileges.php:1679
|
||||
@ -10600,7 +10600,7 @@ msgstr "Vynásobit"
|
||||
|
||||
#: server_status.php:1703
|
||||
msgid "Append unit to data values"
|
||||
msgstr "Přidat jednoty"
|
||||
msgstr "Zobrazit hodnoty s jednotkou"
|
||||
|
||||
#: server_status.php:1709
|
||||
msgid "Add this series"
|
||||
|
||||
12
po/ro.po
12
po/ro.po
@ -4,8 +4,8 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 3.5.4-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2012-10-16 14:37+0200\n"
|
||||
"PO-Revision-Date: 2013-01-10 13:37+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"PO-Revision-Date: 2013-01-14 20:21+0200\n"
|
||||
"Last-Translator: Pham Andrei <pham.andrei4@gmail.com>\n"
|
||||
"Language-Team: Romanian <http://l10n.cihar.com/projects/phpmyadmin/3-5/ro/>\n"
|
||||
"Language: ro\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -11761,15 +11761,15 @@ msgstr "Vizualizarea schemei tabelului"
|
||||
|
||||
#: tbl_gis_visualization.php:112
|
||||
msgid "Display GIS Visualization"
|
||||
msgstr ""
|
||||
msgstr "Afișează Vizualizarea GIS"
|
||||
|
||||
#: tbl_gis_visualization.php:128
|
||||
msgid "Width"
|
||||
msgstr ""
|
||||
msgstr "Lățime"
|
||||
|
||||
#: tbl_gis_visualization.php:132
|
||||
msgid "Height"
|
||||
msgstr ""
|
||||
msgstr "Înălțime"
|
||||
|
||||
#: tbl_gis_visualization.php:136
|
||||
#, fuzzy
|
||||
@ -11789,7 +11789,7 @@ msgstr "Număr de fișiere-jurnal"
|
||||
|
||||
#: tbl_gis_visualization.php:175
|
||||
msgid "Redraw"
|
||||
msgstr ""
|
||||
msgstr "Redesenează"
|
||||
|
||||
#: tbl_gis_visualization.php:177
|
||||
#, fuzzy
|
||||
|
||||
6
po/sv.po
6
po/sv.po
@ -4,8 +4,8 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 3.5.4-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2012-10-16 14:37+0200\n"
|
||||
"PO-Revision-Date: 2012-12-13 12:56+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"PO-Revision-Date: 2013-01-14 23:55+0200\n"
|
||||
"Last-Translator: ProUser <stefan@inkopsforum.se>\n"
|
||||
"Language-Team: Swedish <http://l10n.cihar.com/projects/phpmyadmin/3-5/sv/>\n"
|
||||
"Language: sv\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -26,7 +26,7 @@ msgstr "Visa alla"
|
||||
#: libraries/schema/User_Schema.class.php:396
|
||||
#: libraries/select_lang.lib.php:489
|
||||
msgid "Page number:"
|
||||
msgstr "Sida:"
|
||||
msgstr "Sida nummer:"
|
||||
|
||||
#: browse_foreigners.php:142
|
||||
msgid ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
