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

Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Browse Source
This commit is contained in:
Michal Čihař 2012-04-21 19:45:45 +02:00
commit fee7d94dde
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/server_status.js
View File

@ -682,7 +682,7 @@ $(function() {
$tr.click(function() {
var rule = $(this).data('rule');
$('div#emptyDialog').dialog('option', 'title', PMA_messages['strRuleDetails']);
$('div#emptyDialog').dialog({title: PMA_messages['strRuleDetails']});
$('div#emptyDialog').html(
'<p><b>' + PMA_messages['strIssuse'] + ':</b><br />' + rule.issue + '</p>' +
'<p><b>' + PMA_messages['strRecommendation'] + ':</b><br />' + rule.recommendation + '</p>' +
@ -713,7 +713,7 @@ function serverResponseError() {
btns[PMA_messages['strReloadPage']] = function() {
window.location.reload();
};
$('#emptyDialog').dialog('option', 'title', PMA_messages['strRefreshFailed']);
$('#emptyDialog').dialog({title: PMA_messages['strRefreshFailed']});
$('#emptyDialog').html(
PMA_getImage('s_attention.png') +
PMA_messages['strInvalidResponseExplanation']

10
js/server_status_monitor.js
View File

@ -507,7 +507,7 @@ $(function() {
});
$('a[href="#importMonitorConfig"]').click(function() {
$('div#emptyDialog').dialog('option', 'title', PMA_messages['strImportDialogTitle']);
$('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>');
@ -849,7 +849,7 @@ $(function() {
$('a[href="#clearMonitorConfig"]').toggle(runtime.charts != null);
if (runtime.charts != null && monitorProtocolVersion != window.localStorage['monitorVersion']) {
$('div#emptyDialog').dialog('option', 'title',PMA_messages['strIncompatibleMonitorConfig']);
$('div#emptyDialog').dialog({title: PMA_messages['strIncompatibleMonitorConfig']});
$('div#emptyDialog').html(PMA_messages['strIncompatibleMonitorConfigDescription']);
var dlgBtns = {};
@ -1337,7 +1337,7 @@ $(function() {
opts.limitTypes = false;
}
$('#emptyDialog').dialog('option', 'title', PMA_messages['strAnalysingLogsTitle']);
$('#emptyDialog').dialog({title: PMA_messages['strAnalysingLogsTitle']});
$('#emptyDialog').html(PMA_messages['strAnalysingLogs'] +
' <img class="ajaxIcon" src="' + pmaThemeImage +
'ajax_clock_small.gif" alt="">');
@ -1379,7 +1379,7 @@ $(function() {
runtime.logDataCols = buildLogTable(logData);
/* Show some stats in the dialog */
$('#emptyDialog').dialog('option', 'title', PMA_messages['strLoadingLogs']);
$('#emptyDialog').dialog({title: PMA_messages['strLoadingLogs']});
$('#emptyDialog').html('<p>' + PMA_messages['strLogDataLoaded'] + '</p>');
$.each(logData.sum, function(key, value) {
key = key.charAt(0).toUpperCase() + key.slice(1).toLowerCase();
@ -1427,7 +1427,7 @@ $(function() {
$('#emptyDialog').dialog( "option", "buttons", dlgBtns);
} else {
$('#emptyDialog').dialog('option', 'title', PMA_messages['strNoDataFoundTitle']);
$('#emptyDialog').dialog({title: PMA_messages['strNoDataFoundTitle']});
$('#emptyDialog').html('<p>' + PMA_messages['strNoDataFound'] + '</p>');
var dlgBtns = {};