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

bug #3520107 [interface] Server status page: Incorrect dialog box title

Browse Source
This commit is contained in:
Madhura Jayaratne 2012-04-21 22:20:19 +05:30
parent 5339365217
commit faeffd3566
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
- bug #3516405 [display] Chart title is getting wrong within chart export
- bug #3517021 [interface] Header links except 'More' hide after closing dialog
- bug #3516817 [interface] "More" actions in table structure
- bug #3520107 [interface] Server status page: Incorrect dialog box title
3.5.0.0 (2012-04-07)
+ rfe #2021981 [interface] Add support for mass prefix change.

2
js/messages.php
View File

@ -173,6 +173,7 @@ $js_messages['strUnit'] = __('Unit');
$js_messages['strFromSlowLog'] = __('From slow log');
$js_messages['strFromGeneralLog'] = __('From general log');
$js_messages['strAnalysingLogsTitle'] = __('Analysing logs');
$js_messages['strAnalysingLogs'] = __('Analysing & loading logs. This may take a while.');
$js_messages['strCancelRequest'] = __('Cancel request');
$js_messages['strCountColumnExplanation'] = __('This column shows the amount of identical queries that are grouped together. However only the SQL query itself has been used as a grouping criteria, so the other attributes of queries, such as start time, may differ.');
@ -180,6 +181,7 @@ $js_messages['strMoreCountColumnExplanation'] = __('Since grouping of INSERTs qu
$js_messages['strLogDataLoaded'] = __('Log data loaded. Queries executed in this time span:');
$js_messages['strJumpToTable'] = __('Jump to Log table');
$js_messages['strNoDataFoundTitle'] = __('No data found');
$js_messages['strNoDataFound'] = __('Log analysed, but no data found in this time span.');
$js_messages['strAnalyzing'] = __('Analyzing...');

4
js/server_status.js
View File

@ -682,7 +682,7 @@ $(function() {
$tr.click(function() {
var rule = $(this).data('rule');
$('div#emptyDialog').attr('title', PMA_messages['strRuleDetails']);
$('div#emptyDialog').dialog('option', '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').attr('title', PMA_messages['strRefreshFailed']);
$('#emptyDialog').dialog('option', 'title', PMA_messages['strRefreshFailed']);
$('#emptyDialog').html(
PMA_getImage('s_attention.png') +
PMA_messages['strInvalidResponseExplanation']

12
js/server_status_monitor.js
View File

@ -507,7 +507,7 @@ $(function() {
});
$('a[href="#importMonitorConfig"]').click(function() {
$('div#emptyDialog').attr('title', PMA_messages['strImportDialogTitle']);
$('div#emptyDialog').dialog('option', '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').attr('title',PMA_messages['strIncompatibleMonitorConfig']);
$('div#emptyDialog').dialog('option', 'title',PMA_messages['strIncompatibleMonitorConfig']);
$('div#emptyDialog').html(PMA_messages['strIncompatibleMonitorConfigDescription']);
var dlgBtns = {};
@ -1142,10 +1142,10 @@ $(function() {
dlgBtns['Cancel'] = function() {
$(this).dialog('close');
};
$('div#emptyDialog').attr('title', 'Edit chart');
$('div#emptyDialog').html(htmlStr + '</ol>');
$('div#emptyDialog').dialog({
title: 'Edit chart',
width: 'auto',
height: 'auto',
buttons: dlgBtns
@ -1337,6 +1337,7 @@ $(function() {
opts.limitTypes = false;
}
$('#emptyDialog').dialog('option', 'title', PMA_messages['strAnalysingLogsTitle']);
$('#emptyDialog').html(PMA_messages['strAnalysingLogs'] +
' <img class="ajaxIcon" src="' + pmaThemeImage +
'ajax_clock_small.gif" alt="">');
@ -1378,7 +1379,7 @@ $(function() {
runtime.logDataCols = buildLogTable(logData);
/* Show some stats in the dialog */
$('#emptyDialog').attr('title', PMA_messages['strLoadingLogs']);
$('#emptyDialog').dialog('option', '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();
@ -1426,6 +1427,7 @@ $(function() {
$('#emptyDialog').dialog( "option", "buttons", dlgBtns);
} else {
$('#emptyDialog').dialog('option', 'title', PMA_messages['strNoDataFoundTitle']);
$('#emptyDialog').html('<p>' + PMA_messages['strNoDataFound'] + '</p>');
var dlgBtns = {};