diff options
author | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-04-21 21:15:38 +0400 |
---|---|---|
committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-04-21 21:15:38 +0400 |
commit | f203b456b202e3181b1a72b50590357dfb7d4940 (patch) | |
tree | 6efd43055e179f6d0ffe9f8ad5556557ed35d372 /js | |
parent | f93041fc8dfdef29c34939454c2f888fff26186a (diff) | |
parent | d7ca655efa42a5f1ddb81dc004c50d7cb329fdd6 (diff) |
Merge branch 'QA_3_5'
Conflicts:
js/server_status_monitor.js
Diffstat (limited to 'js')
-rw-r--r-- | js/messages.php | 4 | ||||
-rw-r--r-- | js/server_status.js | 4 | ||||
-rw-r--r-- | js/server_status_monitor.js | 16 |
3 files changed, 15 insertions, 9 deletions
diff --git a/js/messages.php b/js/messages.php index 96e3c01bbf..ce016e8015 100644 --- a/js/messages.php +++ b/js/messages.php @@ -169,6 +169,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.'); @@ -176,6 +177,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...'); @@ -186,6 +188,8 @@ $js_messages['strTotalTime'] = __('Total time:'); $js_messages['strProfilingResults'] = __('Profiling results'); $js_messages['strTable'] = _pgettext('Display format', 'Table'); $js_messages['strChart'] = __('Chart'); +$js_messages['strChartEdit'] = __('Edit chart'); +$js_messages['strSeries'] = __('Series'); /* l10n: A collection of available filters */ $js_messages['strFiltersForLogTable'] = __('Log table filter options'); diff --git a/js/server_status.js b/js/server_status.js index 3b3f11d846..907d7f5589 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -687,7 +687,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>' + @@ -718,7 +718,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'] diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index e2eec44512..993d509e21 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -516,7 +516,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>'); @@ -858,7 +858,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 = {}; @@ -1128,8 +1128,8 @@ $(function() { return; } - var htmlStr = '<p><b>Chart title: </b> <br/> <input type="text" size="35" name="chartTitle" value="' + chart.title + '" />'; - htmlStr += '</p><p><b>Series:</b> </p><ol>'; + var htmlStr = '<p><b>' + PMA_messages['strChartTitle'] + ': </b> <br/> <input type="text" size="35" name="chartTitle" value="' + chart.title + '" />'; + htmlStr += '</p><p><b>' + PMA_messages['strSeries'] + ':</b> </p><ol>'; 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>'; } @@ -1152,10 +1152,10 @@ $(function() { dlgBtns['Cancel'] = function() { $(this).dialog('close'); }; - - $('div#emptyDialog').attr('title', 'Edit chart'); + $('div#emptyDialog').html(htmlStr + '</ol>'); $('div#emptyDialog').dialog({ + title: PMA_messages['strChartEdit'], width: 'auto', height: 'auto', buttons: dlgBtns @@ -1348,6 +1348,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="">'); @@ -1389,7 +1390,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(); @@ -1437,6 +1438,7 @@ $(function() { $('#emptyDialog').dialog( "option", "buttons", dlgBtns); } else { + $('#emptyDialog').dialog('option', 'title', PMA_messages['strNoDataFoundTitle']); $('#emptyDialog').html('<p>' + PMA_messages['strNoDataFound'] + '</p>'); var dlgBtns = {}; |